Merge pull request #505 from NapkinHQ/fix-conditional-export-resolve

Support conditional export resolution with custom resolver

.eslintignore

@@ -1,3 +1,4 @@
 /test.js
 /node-*
-/lib/events.js
+/lib/events.js
+/test/additional-modules/my-es-module/index.js

index.d.ts

@@ -82,7 +82,7 @@ export interface VMRequire {
   /** Collection of mock modules (both external or built-in). */
   mock?: any;
   /* An additional lookup function in case a module wasn't found in one of the traditional node lookup paths. */
-  resolve?: (moduleName: string, parentDirname: string) => string | undefined;
+  resolve?: (moduleName: string, parentDirname: string) => string | { path: string, module?: string } | undefined;
   /** Custom require to require host and built-in modules. */
   customRequire?: (id: string) => any;
   /** Load modules in strict mode. (default: true) */

lib/resolver-compat.js

@@ -322,8 +322,13 @@ function resolverFromOptions(vm, options, override, compiler) {
 			}
 			const resolved = customResolver(x, path);
 			if (!resolved) return undefined;
-			if (externals) externals.push(new RegExp('^' + escapeRegExp(resolved)));
-			return resolver.loadAsFileOrDirecotry(resolved, extList);
+			if (typeof resolved === 'string') {
+				if (externals) externals.push(new RegExp('^' + escapeRegExp(resolved)));
+				return resolver.loadAsFileOrDirecotry(resolved, extList);
+			}
+			const {module=x, path: resolvedPath} = resolved;
+			if (externals) externals.push(new RegExp('^' + escapeRegExp(resolvedPath)));
+			return resolver.loadNodeModules(module, [resolvedPath], extList);
 		};
 	}
 

test/additional-modules/my-es-module/index.cjs

@@ -0,0 +1 @@
+module.exports = {additional_cjs_module: true};

test/additional-modules/my-es-module/index.js

@@ -0,0 +1 @@
+export default {additional_es_module: true};

test/additional-modules/my-es-module/package.json

@@ -0,0 +1,12 @@
+{
+    "main": "index.js",
+    "type": "module",
+    "exports": {
+        ".": {
+          "default": {
+            "require": "./index.cjs",
+            "default": "./index.js"
+          }
+        }
+    }
+}

test/nodevm.js

@@ -239,6 +239,17 @@ describe('modules', () => {
 		assert.ok(vm.run("require('my-module')", __filename));
 	});
 
+	it('can resolve conditional exports with a custom resolver', () => {
+		const vm = new NodeVM({
+			require: {
+				external: ['my-es-module'],
+				resolve: () => ({ path: path.resolve(__dirname, 'additional-modules') })
+			}
+		});
+
+		assert.ok(vm.run("require('my-es-module')", __filename));
+	});
+
 	it('allows for multiple root folders', () => {
 		const vm = new NodeVM({
 			require: {