module: handle relative paths in resolve paths

This commit adds support for relative paths in require.resolve()'s paths option. PR-URL: #27598 Fixes: #27583 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
nodejs · May 10, 2019 · 2f512e3 · 2f512e3
1 parent a23e86f
commit 2f512e3
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 10 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -575,18 +575,25 @@ Module._resolveFilename = function(request, parent, isMain, options) {
 
   if (typeof options === 'object' && options !== null &&
       Array.isArray(options.paths)) {
-    const fakeParent = new Module('', null);
+    const isRelative = request.startsWith('./') || request.startsWith('../') ||
+        (isWindows && request.startsWith('.\\') || request.startsWith('..\\'));
 
-    paths = [];
+    if (isRelative) {
+      paths = options.paths;
+    } else {
+      const fakeParent = new Module('', null);
 
-    for (var i = 0; i < options.paths.length; i++) {
-      const path = options.paths[i];
-      fakeParent.paths = Module._nodeModulePaths(path);
-      const lookupPaths = Module._resolveLookupPaths(request, fakeParent);
+      paths = [];
 
-      for (var j = 0; j < lookupPaths.length; j++) {
-        if (!paths.includes(lookupPaths[j]))
-          paths.push(lookupPaths[j]);
+      for (var i = 0; i < options.paths.length; i++) {
+        const path = options.paths[i];
+        fakeParent.paths = Module._nodeModulePaths(path);
+        const lookupPaths = Module._resolveLookupPaths(request, fakeParent);
+
+        for (var j = 0; j < lookupPaths.length; j++) {
+          if (!paths.includes(lookupPaths[j]))
+            paths.push(lookupPaths[j]);
+        }
       }
     }
   } else {

diff --git a/test/fixtures/require-resolve.js b/test/fixtures/require-resolve.js
@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const path = require('path');
 const nodeModules = path.join(__dirname, 'node_modules');
@@ -54,3 +54,33 @@ assert.throws(() => {
     path.join(nodeModules, 'bar.js')
   );
 }
+
+// Verify that relative request paths work properly.
+{
+  const searchIn = './' + path.relative(process.cwd(), nestedIndex);
+
+  // Search in relative paths.
+  assert.strictEqual(
+    require.resolve('./three.js', { paths: [searchIn] }),
+    path.join(nestedIndex, 'three.js')
+  );
+
+  // Search in absolute paths.
+  assert.strictEqual(
+    require.resolve('./three.js', { paths: [nestedIndex] }),
+    path.join(nestedIndex, 'three.js')
+  );
+
+  // Repeat the same tests with Windows slashes in the request path.
+  if (common.isWindows) {
+    assert.strictEqual(
+      require.resolve('.\\three.js', { paths: [searchIn] }),
+      path.join(nestedIndex, 'three.js')
+    );
+
+    assert.strictEqual(
+      require.resolve('.\\three.js', { paths: [nestedIndex] }),
+      path.join(nestedIndex, 'three.js')
+    );
+  }
+}