create detectImports

ShMcK · ShMcK · commit 0e4c4394636d · 2016-08-10T20:26:46.000-07:00
diff --git a/lib/detectImports.js b/lib/detectImports.js
@@ -1,9 +1,38 @@
-const import = /\bimport\s+(?:.+\s+from\s+)?[\'"]([^"\']+)["\']/;
+const importRegex = /\bimport\s+(?:\s?(.+)\}?\s+from\s+)?[\'"]([^"\']+)["\']/;
+const namedRegex = /^{.+}$/;
+
+let imports = {};
 
 // detects imports
 // adds imports to global scope of rewired object
-function detectImports(file) {
+function detectImports(src) {
+  src.split('\n').forEach(line => {
+    const match = line.match(importRegex);
+    let vars = null;
+    let path = null;
+    if (match) {
+      vars = match[1];
+      vars = vars.match(namedRegex) ? vars.slice(1, -1) : vars;
+      vars = vars.split(',').map(x => x.trim());
+      path = match[2];
+    }
+    // add to array of imports
+    if (vars && vars.length) {
+      vars.forEach(i => imports[i] = path);
+    }
+  });
+
+  for (key in imports) { /* jshint forin: false */
+      let value = imports[key];
+
+      // key may be an invalid variable name (e.g. 'a-b')
+      try {
+        // eval(`var ${key};`);
+        src += `var ${key}`;
+      } catch(e) {}
+  }
 
+  return src;
 }
 
 module.exports = detectImports;
diff --git a/lib/fileExists.js b/lib/fileExists.js
@@ -2,9 +2,8 @@ var fs = require('fs');
 
 function fileExists(path) {
   try {
-      fs.accessSync(path, fs.F_OK);
-  }
-  catch (e) {
+    fs.accessSync(path, fs.F_OK);
+  } catch (e) {
     if (e) {
       console.log(e);
     }
diff --git a/lib/getImportGlobalsSrc.js b/lib/getImportGlobalsSrc.js
@@ -1,3 +1,4 @@
+const detectImports = require('./detectImports');
 /**
  * Declares all globals with a var and assigns the global object. Thus you're able to
  * override globals without changing the global object itself.
@@ -25,7 +26,7 @@ function getImportGlobalsSrc(ignore) {
         if (ignore.indexOf(key) !== -1) {
             continue;
         }
-        value = globalObj[key];
+        // value = globalObj[key];
 
         // key may be an invalid variable name (e.g. 'a-b')
         try {
@@ -34,7 +35,7 @@ function getImportGlobalsSrc(ignore) {
         } catch(e) {}
     }
 
-    return src;
+    return detectImports(src);
 }
 
 module.exports = getImportGlobalsSrc;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+const detectImports = require('./detectImports');`
`1`	`2`	`/**`
`2`	`3`	`* Declares all globals with a var and assigns the global object. Thus you're able to`
`3`	`4`	`* override globals without changing the global object itself.`
`@@ -25,7 +26,7 @@ function getImportGlobalsSrc(ignore) {`
`25`	`26`	`if (ignore.indexOf(key) !== -1) {`
`26`	`27`	`continue;`
`27`	`28`	`}`
`28`		`- value = globalObj[key];`
	`29`	`+ // value = globalObj[key];`
`29`	`30`
`30`	`31`	`// key may be an invalid variable name (e.g. 'a-b')`
`31`	`32`	`try {`
`@@ -34,7 +35,7 @@ function getImportGlobalsSrc(ignore) {`
`34`	`35`	`} catch(e) {}`
`35`	`36`	`}`
`36`	`37`
`37`		`- return src;`
	`38`	`+ return detectImports(src);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`module.exports = getImportGlobalsSrc;`