fix: Fix the root resolver when both a file and directory have the same name

When both a file and a directory share the same name, the resolver was wrongly
resolving the path to the folder instead of the file.
In Node, the resolver mechanism resolves the path to a .js file before trying to
resolve the directory/index.js

Author: Tommy Leunen

.babelrc

@@ -1,5 +1,8 @@
 {
   "presets": ["es2015"],
+  "plugins": [
+    "transform-object-rest-spread"
+  ],
   "env": {
     "test": {
       "plugins": ["istanbul"]

.eslintrc

@@ -1,5 +1,10 @@
 {
   "extends": "airbnb-base",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
+  },
   "rules": {
     "comma-dangle": 0,
     "indent": [2, 4, {"SwitchCase": 1}],

package.json

@@ -34,6 +34,7 @@
     "babel-cli": "^6.10.1",
     "babel-core": "^6.10.4",
     "babel-plugin-istanbul": "^2.0.0",
+    "babel-plugin-transform-object-rest-spread": "^6.8.0",
     "babel-preset-es2015": "^6.6.0",
     "babel-register": "^6.8.0",
     "cross-env": "^2.0.0",

src/index.js

@@ -2,6 +2,7 @@ import path from 'path';
 import resolve from 'resolve';
 import glob from 'glob';
 import mapToRelative from './mapToRelative';
+import { toLocalPath } from './utils';
 
 function createAliasFileMap(pluginOpts) {
     const alias = pluginOpts.alias || {};
@@ -36,7 +37,7 @@ export function mapModule(source, file, pluginOpts) {
             const sourceFileExt = path.extname(source);
             // map the source and keep its extension if the import/require had one
             const ext = realFileExt === sourceFileExt ? realFileExt : '';
-            return mapToRelative(file, replaceExt(fileAbsPath, ext));
+            return toLocalPath(replaceExt(mapToRelative(file, fileAbsPath), ext));
         } catch (e) {
             // empty...
         }
@@ -70,7 +71,7 @@ export function mapModule(source, file, pluginOpts) {
         return newPath;
     }
     // relative alias
-    return mapToRelative(file, newPath);
+    return toLocalPath(mapToRelative(file, newPath));
 }
 
 

src/mapToRelative.js

@@ -1,26 +1,18 @@
 import path from 'path';
+import { toPosixPath } from './utils';
 
 function resolve(filename) {
     if (path.isAbsolute(filename)) return filename;
     return path.resolve(process.cwd(), filename);
 }
 
-function toPosixPath(modulePath) {
-    return modulePath.replace(/\\/g, '/');
-}
-
 export default function mapToRelative(currentFile, module) {
     let from = path.dirname(currentFile);
     let to = path.normalize(module);
 
     from = resolve(from);
     to = resolve(to);
 
-    let moduleMapped = path.relative(from, to);
-
-    moduleMapped = toPosixPath(moduleMapped);
-
-    if (moduleMapped[0] !== '.') moduleMapped = `./${moduleMapped}`;
-
-    return moduleMapped;
+    const moduleMapped = path.relative(from, to);
+    return toPosixPath(moduleMapped);
 }

src/utils.js

@@ -0,0 +1,9 @@
+export function toPosixPath(modulePath) {
+    return modulePath.replace(/\\/g, '/');
+}
+
+export function toLocalPath(p) {
+    return (p[0] !== '.')
+        ? `./${p}`
+        : p;
+}