code refactoring, resolve paths with join

Author: ShMcK

lib/__get__.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * This function will be stringified and then injected into every rewired module.
  * Then you can leak private variables by calling myModule.__get__("myPrivateVar");

lib/addImportsAsVars.js

@@ -1,4 +1,6 @@
-const importRegex = /^import\s+(?:\s?(.+)\}?\s+from\s+)?[\'"]([^"\']+)["\']/;
+'use strict';
+
+const importRegex = /^import\s+(?:\s?(.+)\}?\s+from\s+)?[\'"]([^"\']+)["\']/m;
 const namedRegex = /^{.+}$/;
 
 let imports = {};
@@ -11,7 +13,8 @@ function detectImports(src) {
     let vars = null;
     let path = null;
     let importType = 'default';
-    if (match) {
+
+    if (match && match[1]) {
       vars = match[1];
       // named export
       if (vars.match(namedRegex)) {
@@ -39,9 +42,9 @@ function detectImports(src) {
         const { path, importType } = imports[key];
         // eval(`var ${key};`);
         if (importType === 'named') {
-          output += `global.${key} = require('${path}').${key};\n`;
+          output += `global.${key} = require('${path}').${key};` + '\n';
         } else {
-          output += `global.${key} = require('${path}');\n`;
+          output += `global.${key} = require('${path}').default;` + '\n';
         }
 
       } catch(e) {}

lib/fileExists.js

@@ -1,8 +1,10 @@
-var fs = require('fs');
+'use strict';
+
+const { accessSync, F_OK} = require('fs');
 
 function fileExists(path) {
   try {
-    fs.accessSync(path, fs.F_OK);
+    accessSync(path, F_OK);
   } catch (e) {
     if (e) {
       console.log(e);

lib/getDefinePropertySrc.js

@@ -6,7 +6,7 @@ function getDefinePropertySrc(src) {
 
   const getMethods = src => ({
     '__get__': __get__.toString(),
-    '__text__': '`' + src.toString() + "`",
+    // '__text__': src.toString(),
   });
 
   const methods = getMethods(src);
@@ -15,10 +15,8 @@ function getDefinePropertySrc(src) {
 if (typeof(module.exports) === 'function' ||
 (typeof(module.exports) === 'object' && module.exports !== null && Object.isExtensible(module.exports))) {
   ${Object.keys(methods).reduce((preValue, value) => {
-    return preValue += `Object.defineProperty(module.exports, '${value}', {enumerable: false, value: ${methods[value]}, writable: true});`;
-    }, '')
-  }
-}`;
+    return preValue += `Object.defineProperty(module.exports, '` + value + `', {enumerable: false, value: ` + methods[value] + `, writable: true});`;
+  }, '')}}`;
 }
 
 module.exports = getDefinePropertySrc;

lib/getImportGlobalsSrc.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Declares all globals with a var and assigns the global object. Thus you're able to
  * override globals without changing the global object itself.
@@ -7,20 +8,14 @@
  *
  * @return {String}
  */
+const ignore = ['global', 'root', 'process', 'Buffer', 'clearImmediate', 'clearInterval', 'setTimeout', 'module', 'exports', 'require'];
+
 function getImportGlobalsSrc(ignore) {
     var key,
         value,
         src = '',
         globalObj = typeof global === 'undefined' ? window : global;
 
-    ignore = ignore || [];
-    // global itself can't be overridden because it's the only reference to our real global objects
-    ignore.push('global');
-    // ignore 'module', 'exports' and 'require' on the global scope, because otherwise our code would
-    // shadow the module-internal variables
-    // @see https://github.com/jhnns/rewire-webpack/pull/6
-    ignore.push('module', 'exports', 'require');
-
     for (key in globalObj) { /* jshint forin: false */
         if (ignore.indexOf(key) !== -1) {
             continue;
@@ -29,8 +24,8 @@ function getImportGlobalsSrc(ignore) {
 
         // key may be an invalid variable name (e.g. 'a-b')
         try {
-          eval(`var ${key};`);
-          src += `var ${key} = global.${key};`;
+          // eval('var ' + key);
+          src += `var ${key} = global.${key}`;
         } catch(e) {}
     }
 

lib/index.js

@@ -1,3 +1,4 @@
+'use strict';
 var rewireModule = require('./rewire.js');
 var fileExists = require('./fileExists');
 
@@ -9,19 +10,21 @@ var fileExists = require('./fileExists');
  * @return {*} the rewired module
  */
 function rewire(filename) {
-  // is not a package path
-  if (!filename.match(/^[a-zA-Z]/)) {
-    // if the file doesn't exist yet,
-    // create a __get__ mock to prevent tests breaking
+  // is not a node_module path
+  if (!filename.match(/^[a-zA-Z\_]/)) {
     if (!fileExists(filename)) {
+      // create a __get__ mock to prevent tests breaking
+      // when file does not exist
       return {
         __get__: () => {},
         __text__: undefined,
       };
     }
+    // proceed with rewiring
+    return rewireModule(module.parent, filename);
   }
-  // proceed with rewiring
-  return rewireModule(module.parent, filename);
+  // is a node_module path, use normal require
+  return require(filename);
 }
 
 module.exports = rewire;

lib/rewire.js

@@ -1,9 +1,10 @@
-var Module = require('module'),
-    fs = require('fs'),
-    getImportGlobalsSrc = require('./getImportGlobalsSrc.js'),
-    getDefinePropertySrc = require('./getDefinePropertySrc.js'),
-    moduleEnv = require('./moduleEnv.js'),
-    addImportsAsVars = require('./addImportsAsVars');
+'use strict';
+const Module = require('module');
+const { readFileSync, join } = require('fs');
+const getImportGlobalsSrc = require('./getImportGlobalsSrc'),
+const getDefinePropertySrc = require('./getDefinePropertySrc'),
+const moduleEnv = require('./moduleEnv'),
+const addImportsAsVars = require('./addImportsAsVars');
 
 /**
  * Does actual rewiring the module. For further documentation @see index.js
@@ -20,36 +21,18 @@ function internalRewire(parentModulePath, targetPath) {
     }
 
     // Resolve full filename relative to the parent module
-    targetPath = Module._resolveFilename(targetPath, parentModulePath);
-
-    // Special support for older node versions that returned an array on Module._resolveFilename
-    // @see https://github.com/joyent/node/blob/865b077819a9271a29f982faaef99dc635b57fbc/lib/module.js#L319
-    // TODO Remove this switch on the next major release
-    /* istanbul ignore next because it will be removed soon */
-    if (Array.isArray(targetPath)) {
-        targetPath = targetPath[1];
-    }
+    targetPath = join(targetPath, parentModulePath);
 
-    // Check if the module uses the strict mode.
-    // If so we must ensure that "use strict"; stays at the beginning of the module.
-    src = fs.readFileSync(targetPath, 'utf8');
+    src = readFileSync(targetPath, 'utf8');
 
-    // Create testModule as it would be created by require()
+    // create testModule as it would be created by require()
     targetModule = new Module(targetPath, parentModulePath);
 
-    // We prepend a list of all globals declared with var so they can be overridden (without changing original globals)
+    // prepend a list of all globals declared with var so they can be overridden (without changing original globals)
     prelude = getImportGlobalsSrc();
-
-    // Wrap module src inside IIFE so that function declarations do not clash with global variables
-    // @see https://github.com/jhnns/rewire/issues/56
     prelude += '(function () { ';
-
-    // We append our special setter and getter.
     appendix = '\n' + getDefinePropertySrc(src);
-
     appendix += '\n' + addImportsAsVars(src);
-
-    // End of IIFE
     appendix += '})();';
 
     moduleEnv.inject(prelude, appendix);

package.json

@@ -1,18 +1,11 @@
 {
   "name": "rewire-coderoad",
-  "version": "3.1.1",
-  "description": "CodeRoad implementation to override 'require' in order to monkey-patch test globals",
+  "version": "3.1.2",
+  "description": "CodeRoad implementation to override 'require' in order to test globals",
   "keywords": [
+    "coderoad",
     "dependency",
     "injection",
-    "mock",
-    "shim",
-    "module",
-    "unit",
-    "test",
-    "leak",
-    "inspect",
-    "fake",
     "require"
   ],
   "author": {