module: handle empty require.resolve() options

cjihrig · BridgeAR · commit 60144295802e · 2019-06-17T21:12:22.000+02:00
If require.resolve() is passed an options object, but the paths option is not present, then use the default require.resolve() paths. PR-URL: #28078 Fixes: #28077 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -599,7 +599,9 @@ Module._resolveFilename = function(request, parent, isMain, options) {
           }
         }
       }
-    } else if (options.paths !== undefined) {
+    } else if (options.paths === undefined) {
+      paths = Module._resolveLookupPaths(request, parent);
+    } else {
       throw new ERR_INVALID_OPT_VALUE('options.paths', options.paths);
     }
   } else {
diff --git a/test/fixtures/require-resolve.js b/test/fixtures/require-resolve.js
@@ -92,3 +92,9 @@ common.expectsError(() => {
   code: 'ERR_INVALID_OPT_VALUE',
   type: TypeError,
 });
+
+// Verify that the default require.resolve() is used for empty options.
+assert.strictEqual(
+  require.resolve('./printA.js', {}),
+  require.resolve('./printA.js')
+);

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,9 @@ Module._resolveFilename = function(request, parent, isMain, options) {`
`599`	`599`	`}`
`600`	`600`	`}`
`601`	`601`	`}`
`602`		`- } else if (options.paths !== undefined) {`
	`602`	`+ } else if (options.paths === undefined) {`
	`603`	`+ paths = Module._resolveLookupPaths(request, parent);`
	`604`	`+ } else {`
`603`	`605`	`throw new ERR_INVALID_OPT_VALUE('options.paths', options.paths);`
`604`	`606`	`}`
`605`	`607`	`} else {`