Merge pull request #15 from va4ok/v_0_1_6

V 0 1 6

Author: va4ok

builder/build.js

@@ -5,6 +5,7 @@ const os = require('os');
 const minimist = require('minimist');
 
 const inlineCss = require('./inline-css');
+const fileHelper = require('./file-helper');
 const getMeta = require('./get-meta');
 const config = require('./config');
 const version = require('./version');
@@ -45,23 +46,40 @@ Version: \x1b[36m${newversion}\x1b[0m`);
   }
 }
 
+function getExistingFilePath(filePath, normalizedFilePath, parentPath) {
+  if (fs.existsSync(filePath)) {
+    return filePath;
+  }
+
+  if (fs.existsSync(normalizedFilePath)) {
+    return normalizedFilePath;
+  }
+
+  throw new Error(`${parentPath} tries to import unreachable file ${filePath}`);
+}
+
 function buildTree(filePath, parentPath) {
-  // Get file name
+  // Get full file name
   if (parentPath) {
     filePath = path.join(parentPath, '..', filePath);
   }
 
-  if (visited.includes(filePath)) {
+  const normalizedFilePath = fileHelper.normalizeFileName(filePath);
+
+  if (visited.includes(filePath) || visited.includes(normalizedFilePath)) {
+    // file processed
     return;
   }
 
-  // Put file name into visited
-  visited.push(filePath);
+  filePath = getExistingFilePath(filePath, normalizedFilePath, parentPath);
 
   // Open file
-  const file = fs.readFileSync(filePath).toString();
   const importRegex = /^[\t\r ]*import.+['"];$/gm;
   const imports = [];
+  const file = fs.readFileSync(filePath).toString();
+
+  // Put file name into visited
+  visited.push(filePath);
 
   // Get all imports
   let matches;
@@ -75,7 +93,7 @@ function buildTree(filePath, parentPath) {
   });
 
   if (/\.css$/g.test(filePath)) {
-    css.push({ file, filePath: filePath.split('\\').join('/') });
+    css.push({file, filePath: filePath.split('\\').join('/')});
   } else {
     files.push({
       file: file
@@ -99,11 +117,13 @@ function getOutFile(addFilePathComments) {
   console.log('\x1b[33m%s\x1b[0m', 'Concat js files');
 
   files.forEach(file => {
-    console.log(`${file.filePath.replace(/^\.\//g, '')}`);
+    const filePath = file.filePath.replace(/^\.\//g, '');
+
+    console.log(`${filePath}`);
     out += os.EOL + os.EOL;
 
     if (addFilePathComments) {
-      out += `// ${file.filePath.replace(/^\.\//g, '')}${os.EOL}`;
+      out += `// ${filePath}${os.EOL}`;
     }
 
     out += file.file;

builder/file-helper.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const extensions = [
+  'js',
+  'css'
+];
+
+function isContainsExtension(filename, ext) {
+  // we need check if extension with dot are last characters in filename
+  // not sure if it is a good solution but it doesn't create any regexp
+  const dotExt = '.' + ext;
+  const extLength = dotExt.length;
+  const offset = filename.length - extLength;
+
+  return filename.indexOf(dotExt, offset) !== -1;
+}
+
+function isContainsExtensions(filename, extArr) {
+  const filenameLowCase = filename.toLowerCase();
+  let result = false;
+
+  if (Array.isArray(extArr)) {
+    extArr.forEach(ext => {
+      // if result true - we already found extension
+      if (!result) {
+        result = isContainsExtension(filenameLowCase, ext);
+      }
+    });
+  } else {
+    result = isContainsExtension(filenameLowCase, extArr.toString());
+  }
+
+  return result;
+}
+
+function normalizeFileName(filePath) {
+  if (isContainsExtensions(filePath, extensions)) {
+    return filePath;
+  }
+
+  return filePath + '.js';
+}
+
+module.exports = {normalizeFileName};

example/index.js

@@ -1,5 +1,5 @@
 import { Notificator } from "./notificator/notificator.js";
-import { SayHello } from "./say-hello/say-hello.js";
+import { SayHello } from "./say-hello/say-hello";
 
 (function () {
   Notificator.notify('creating John and Mark');
@@ -11,4 +11,4 @@ import { SayHello } from "./say-hello/say-hello.js";
 
   greetJohn.now();
   greetMark.now();
-})();
+})();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "userscript-builder",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Tool for building userscript for teampermonkey.",
   "main": "builder/build.js",
   "bin": "./bin/builder.js",
@@ -45,4 +45,4 @@
       "grant": "none"
     }
   }
-}
+}