fixes for windows

Author: ShMcK

lib/importPaths.js

@@ -5,24 +5,22 @@ var importPathRegex = /require\(["'](BASE.+)["']\)([a-zA-Z0-9\-\_]+)?|^import.+?
 var relativePathRegex = /^BASE/;
 function fixImportPaths(_a) {
     var dir = _a.dir, content = _a.content;
-    var entries = new Set([]);
     return content.split('\n').map(function (line) {
         var isMatch = line.match(importPathRegex);
         if (!isMatch) {
             return line;
         }
         var importPath = isMatch[1] || isMatch[2] || isMatch[3];
         if (importPath.match(relativePathRegex)) {
-            var newPath = path_1.join(dir, importPath.replace('BASE', ''));
+            var newPath = void 0;
             if (system_1.isWindows) {
-                newPath = system_1.fixPathForWindows(newPath);
+                newPath = path_1.join(dir, importPath.replace('BASE', ''))
+                    .split('\\').join('\\\\');
             }
-            var newLine = line.replace(importPath, newPath);
-            if (!entries.has(newLine)) {
-                entries.add(newLine);
-                return newLine;
+            else {
+                newPath = path_1.join(dir, importPath.replace('BASE', ''));
             }
-            return '';
+            return line.replace(importPath, newPath);
         }
         return line;
     }).join('\n');

lib/index.js

@@ -4,9 +4,9 @@ var system_1 = require('./system');
 var jsCodeRoad = function (_a) {
     var dir = _a.dir, content = _a.content;
     if (system_1.isWindows) {
-        dir = system_1.fixPathForWindows(dir);
+        dir = dir.split('\\').join('\\\\');
     }
-    return "\n(function(){'use strict';\nrequire('babel-register')({plugins:[['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'" + dir + "'}]]});\n" + require('process-console-log').logger + "\nconst _fileExists = require('node-file-exists').default;\nconst _path = require('path');\nfunction exists(p) { return _fileExists(_path.join('" + dir + "',p)); }\nrequire = require('rewire-coderoad');\n\n// unit tests\n\n" + importPaths_1.default({ dir: dir, content: content }) + "\n\n}());";
+    return "(function(){'use strict';\nrequire('babel-register')({plugins:[\n  ['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'" + dir + "'}]\n]});\n" + require('process-console-log').logger + "\nconst _f_e = require('node-file-exists').default;\nconst _join = require('path').join;\nfunction exists(p) { return _f_e(_join('" + dir + "',p)); }\nrequire = require('rewire-coderoad');\n\n" + importPaths_1.default({ dir: dir, content: content }) + "\n\n}());";
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = jsCodeRoad;

lib/system.js

@@ -1,8 +1,3 @@
 "use strict";
+var window = window || ({ navigator: { appVersion: '' } });
 exports.isWindows = window.navigator.appVersion.indexOf('Win') > -1;
-exports.fixPathForWindows = function (p) {
-    p.split('\\\\').join('\\');
-    p.split('\\').join('\\\\');
-    p.split('/').join('\\\\');
-    return p;
-};

package.json

@@ -29,12 +29,11 @@
     "watch:test": "ava test/*.js --watch"
   },
   "dependencies": {
-    "babel-plugin-transform-es2015-modules-commonjs": "6.11.5",
-    "babel-preset-es2015": "^6.13.2",
-    "babel-register": "^6.11.6",
-    "node-file-exists": "1.1.0",
-    "process-console-log": "0.2.3",
-    "rewire-coderoad": "^3.1.1"
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.14.0",
+    "babel-register": "^6.14.0",
+    "node-file-exists": "^1.1.0",
+    "process-console-log": "^0.2.5",
+    "rewire-coderoad": "^3.1.3"
   },
   "devDependencies": {
     "ava": "^0.16.0",

src/importPaths.ts

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { isWindows, fixPathForWindows } from './system';
+import { isWindows } from './system';
 
 /*
   import paths won't match the context of the test runner
@@ -12,9 +12,6 @@ const importPathRegex =
 const relativePathRegex = /^BASE/;
 
 export default function fixImportPaths({dir, content}): string {
-  // collect import lines
-  let entries = new Set([]);
-
   return content.split('\n').map(line => {
     // line has an import or require ?
     const isMatch = line.match(importPathRegex);
@@ -27,20 +24,19 @@ export default function fixImportPaths({dir, content}): string {
 
     // is a relative path
     if (importPath.match(relativePathRegex)) {
-      let newPath = join(dir, importPath.replace('BASE', ''));
+      let newPath;
 
-      // fix buggy Windows paths
       if (isWindows) {
-        newPath = fixPathForWindows(newPath);
+        // fix buggy Windows paths
+        // note: necessary to split and join before newPath is set to
+        // a variable or backslashes are interpreted as escaped characters
+        newPath = join(dir, importPath.replace('BASE', ''))
+          .split('\\').join('\\\\');
+      } else {
+         newPath = join(dir, importPath.replace('BASE', ''));
       }
 
-      const newLine = line.replace(importPath, newPath);
-      // add to map of entry files
-      if (!entries.has(newLine)) {
-        entries.add(newLine);
-        return newLine;
-      }
-      return '';
+      return line.replace(importPath, newPath);
     }
 		// no match, return line
     return line;

src/index.ts

@@ -1,24 +1,23 @@
 import fixImportPaths from './importPaths';
-import { isWindows, fixPathForWindows } from './system';
+import { isWindows } from './system';
 
 const jsCodeRoad = ({dir, content}) => {
 
   // fix Windows paths
   if (isWindows) {
-    dir = fixPathForWindows(dir);
+    dir = dir.split('\\').join('\\\\');
   }
 
-  return `
-(function(){'use strict';
-require('babel-register')({plugins:[['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'${dir}'}]]});
+  return `(function(){'use strict';
+require('babel-register')({plugins:[
+  ['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'${dir}'}]
+]});
 ${require('process-console-log').logger}
-const _fileExists = require('node-file-exists').default;
-const _path = require('path');
-function exists(p) { return _fileExists(_path.join('${dir}',p)); }
+const _f_e = require('node-file-exists').default;
+const _join = require('path').join;
+function exists(p) { return _f_e(_join('${dir}',p)); }
 require = require('rewire-coderoad');
 
-// unit tests
-
 ${fixImportPaths({dir, content})}
 
 }());`;

src/system.ts

@@ -1,8 +1,3 @@
-export const isWindows = window.navigator.appVersion.indexOf('Win') > -1;
+let window = window || ({ navigator: { appVersion: '' } });
 
-export const fixPathForWindows = (p: string) => {
-  p.split('\\\\').join('\\');
-  p.split('\\').join('\\\\');
-  p.split('/').join('\\\\');
-  return p;
-};
+export const isWindows = window.navigator.appVersion.indexOf('Win') > -1;

test/importPaths.js

@@ -4,6 +4,8 @@ const fixImportPaths = require('../lib/importPaths').default;
 const macDir = '/usr/name/desktop/folder';
 const winDir = `C:\\usr\\name\\desktop\\folder`;
 
+// window.navigator.appVersion = 'Mac';
+
 test('does nothing if no imports', t => {
   const content = 'var a = 42;';
   const result = fixImportPaths({
@@ -59,7 +61,7 @@ test('handles named imports beginning with BASE', t => {
 
 // Windows
 
-test('handles test paths on Windows', t => {
+test.skip('handles test paths on Windows', t => {
   const content = `var example = require('BASE/example');`;
   const result = fixImportPaths({
     dir: winDir,

test/system.js

@@ -0,0 +1,10 @@
+const test = require('ava');
+const fixPathForWindows = require('../lib/system').fixPathForWindows;
+
+const winPath = 'C:\path\to\file';
+
+test('adds double slashes to a regular path', t => {
+  const result = fixPathForWindows(winPath);
+  const expected = 'C:\\path\\to\\file';
+  t.is(result, expected);
+});