Merge pull request jhnns#36 from claydotio/you-dont-even-want-to-know-how-long-this-took-to-find

jhnns · jhnns · commit a23473b537cb · 2015-01-17T16:08:45.000+01:00
Ignore invalid variable names during injection of global params
diff --git a/lib/getImportGlobalsSrc.js b/lib/getImportGlobalsSrc.js
@@ -26,10 +26,15 @@ function getImportGlobalsSrc(ignore) {
             continue;
         }
         value = globalObj[key];
-        src += "var " + key + " = global." + key + "; ";
+
+        // key may be an invalid variable name (e.g. 'a-b')
+        try {
+          eval("var " + key + ";");
+          src += "var " + key + " = global." + key + "; ";
+        } catch(e) {}
     }
 
     return src;
 }
 
-module.exports = getImportGlobalsSrc;
+module.exports = getImportGlobalsSrc;
diff --git a/test/getImportGlobalsSrc.test.js b/test/getImportGlobalsSrc.test.js
@@ -17,11 +17,15 @@ describe("getImportGlobalsSrc", function () {
         global.exports = exports;
         global.require = require;
 
+        // Also make sure it ignores invalid variable names
+        global['a-b'] = true;
+
         src = getImportGlobalsSrc();
 
         delete global.module;
         delete global.exports;
         delete global.require;
+        delete global['a-b'];
 
         expectedGlobals = Object.keys(global);
 
@@ -63,4 +67,4 @@ describe("getImportGlobalsSrc", function () {
         expect(actualGlobals).to.eql(expectedGlobals);
         expect(actualGlobals.length).to.be.above(1);
     });
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,15 @@ function getImportGlobalsSrc(ignore) {`
`26`	`26`	`continue;`
`27`	`27`	`}`
`28`	`28`	`value = globalObj[key];`
`29`		`- src += "var " + key + " = global." + key + "; ";`
	`29`	`+`
	`30`	`+ // key may be an invalid variable name (e.g. 'a-b')`
	`31`	`+ try {`
	`32`	`+ eval("var " + key + ";");`
	`33`	`+ src += "var " + key + " = global." + key + "; ";`
	`34`	`+ } catch(e) {}`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`return src;`
`33`	`38`	`}`
`34`	`39`
`35`		`-module.exports = getImportGlobalsSrc;`
	`40`	`+module.exports = getImportGlobalsSrc;`