Merge pull request #2 from fearthecowboy/master

fixes path issues on windows for non-unixified paths

Author: streamich

index.js

@@ -1 +1 @@
-module.exports = require('lib/index');
+module.exports = require('./lib/index');

lib/correctPath.js

@@ -0,0 +1,49 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unixify = unixify;
+exports.correctPath = correctPath;
+var isWin = process.platform === 'win32';
+
+function removeTrailingSeparator(str) {
+  var i = str.length - 1;
+  if (i < 2) {
+    return str;
+  }
+  while (isSeparator(str, i)) {
+    i--;
+  }
+  return str.substr(0, i + 1);
+};
+
+function isSeparator(str, i) {
+  var char = str[i];
+  return i > 0 && (char === '/' || isWin && char === '\\');
+}
+
+function normalizePath(str, stripTrailing) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
+  str = str.replace(/[\\\/]+/g, '/');
+  if (stripTrailing !== false) {
+    str = removeTrailingSeparator(str);
+  }
+  return str;
+};
+
+function unixify(filepath) {
+  var stripTrailing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+  if (isWin) {
+    filepath = normalizePath(filepath, stripTrailing);
+    return filepath.replace(/^([a-zA-Z]+:|\.\/)/, '');
+  }
+  return filepath;
+};
+
+function correctPath(filepath) {
+  return unixify(filepath.replace(/^\\\\\?\\.:\\/, '\\'));
+}

lib/patchRequire.js

@@ -11,6 +11,10 @@ var path = _interopRequireWildcard(_path);
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
+var correctPath = process.platform === 'win32' ? require('./correctPath').correctPath : function (p) {
+    return p;
+};
+
 function stripBOM(content) {
     if (content.charCodeAt(0) === 0xFEFF) {
         content = content.slice(1);
@@ -21,6 +25,23 @@ function stripBOM(content) {
 function patchRequire(vol) {
     var Module = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : require('module');
 
+    if (process.platform === 'win32') {
+        var original = vol;
+        vol = {
+            readFileSync: function readFileSync(path, options) {
+                return original.readFileSync(correctPath(path), options);
+            },
+
+            realpathSync: function realpathSync(path) {
+                return original.realpathSync(correctPath(path));
+            },
+
+            statSync: function statSync(path) {
+                return original.statSync(correctPath(path));
+            }
+        };
+    };
+
     function internalModuleReadFile(path) {
         try {
             return vol.readFileSync(path, 'utf8');
@@ -138,7 +159,7 @@ function patchRequire(vol) {
         for (var i = 0; i < paths.length; i++) {
             var curPath = paths[i];
             if (curPath && stat(curPath) < 1) continue;
-            var basePath = path.resolve(curPath, request);
+            var basePath = correctPath(path.resolve(curPath, request));
             var filename;
 
             var rc = stat(basePath);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fs-monkey",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Monkey patches for file system related things.",
   "main": "lib/index.js",
   "keywords": [

src/correctPath.js

@@ -0,0 +1,63 @@
+const isWin = process.platform === 'win32';
+/*!
+ * removeTrailingSeparator <https://github.com/darsain/remove-trailing-separator>
+ *
+ * Inlined from:
+ * Copyright (c) darsain.
+ * Released under the ISC License.
+ */
+function removeTrailingSeparator(str) {
+	var i = str.length - 1;
+	if (i < 2) {
+		return str;
+	}
+	while (isSeparator(str, i)) {
+		i--;
+	}
+	return str.substr(0, i + 1);
+};
+
+function isSeparator(str, i) {
+    var char = str[i];
+    return i > 0 && (char === '/' || (isWin && char === '\\'));
+}
+
+/*!
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Inlined from:
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+function normalizePath(str, stripTrailing) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
+  str = str.replace(/[\\\/]+/g, '/');
+  if (stripTrailing !== false) {
+    str = removeTrailingSeparator(str);
+  }
+  return str;
+};
+
+/*!
+ * unixify <https://github.com/jonschlinkert/unixify>
+ * 
+ * Inlined from:
+ * Copyright (c) 2014, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+export function unixify(filepath, stripTrailing = true) {
+  if(isWin) {
+    filepath = normalizePath(filepath, stripTrailing);
+    return filepath.replace(/^([a-zA-Z]+:|\.\/)/, '');
+  }
+  return filepath;
+};
+
+/*
+* Corrects a windows path to unix format (including \\?\c:...)
+*/
+export function correctPath(filepath) {
+    return unixify( filepath.replace(/^\\\\\?\\.:\\/,'\\'));
+}

src/patchRequire.js

@@ -1,5 +1,6 @@
 import * as path from 'path';
 
+const correctPath = process.platform === 'win32' ? require('./correctPath').correctPath : (p)=>p;
 
 /**
  * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
@@ -13,7 +14,6 @@ function stripBOM(content) {
     return content;
 }
 
-
 /**
  * Rewrites `modules.js`, which is the factory for the `require` function.
  * You give this function your custom file system object and this function
@@ -34,6 +34,24 @@ function stripBOM(content) {
  */
 export default function patchRequire(vol, Module = require('module')) {
 
+    // ensure all paths are corrected before use.
+    if( process.platform === 'win32') {
+        const original = vol;
+        vol = {
+            readFileSync: (path,options) => {
+                return original.readFileSync(correctPath( path ),options);
+            },
+        
+            realpathSync: (path) => {
+                return original.realpathSync(correctPath( path ));
+            },
+        
+            statSync: (path) => {
+                return original.statSync(correctPath( path ));
+            }
+        };
+    };
+
     // Used to speed up module loading.  Returns the contents of the file as
     // a string or undefined when the file cannot be opened.  The speedup
     // comes from not creating Error objects on failure.
@@ -177,7 +195,7 @@ export default function patchRequire(vol, Module = require('module')) {
             // Don't search further if path doesn't exist
             const curPath = paths[i];
             if (curPath && stat(curPath) < 1) continue;
-            var basePath = path.resolve(curPath, request);
+            var basePath = correctPath( path.resolve(curPath, request) );
             var filename;
 
             var rc = stat(basePath);