fixup! module: implement "exports" proposal for CommonJS

Co-Authored-By: Guy Bedford <[email protected]>
nodejs · Jul 23, 2019 · bd68eaf · bd68eaf
1 parent b7258f9
commit bd68eaf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -348,12 +348,13 @@ function resolveExports(nmPath, request, absoluteRequest) {
 
     const basePath = path.resolve(nmPath, name);
     const pkgExports = readExports(basePath);
+    const baseURL = `${pathToFileURL(basePath)}/`;
 
     if (pkgExports != null) {
       const mappingKey = `.${expansion}`;
       const mapping = pkgExports[mappingKey];
       if (typeof mapping === 'string') {
-        return path.resolve(basePath, mapping);
+        return fileURLToPath(new URL(mapping, baseURL));
       }
 
       let dirMatch = '';
@@ -369,10 +370,10 @@ function resolveExports(nmPath, request, absoluteRequest) {
       if (dirMatch !== '') {
         const dirMapping = pkgExports[dirMatch];
         const remainder = StringPrototype.slice(mappingKey, dirMatch.length);
-        const expectedPrefix = path.resolve(basePath, dirMapping);
-        const resolved = path.resolve(expectedPrefix, remainder);
+        const expectedPrefix = new URL(dirMapping, baseURL).href;
+        const resolved = new URL(remainder, expectedPrefix).href;
         if (StringPrototype.startsWith(resolved, expectedPrefix)) {
-          return resolved;
+          return fileURLToPath(resolved);
         }
       }
       throw new ERR_PATH_NOT_EXPORTED(basePath, mappingKey);

diff --git a/test/es-module/test-esm-exports.mjs b/test/es-module/test-esm-exports.mjs
@@ -3,7 +3,7 @@
 import { mustCall } from '../common/index.mjs';
 import { ok, strictEqual } from 'assert';
 
-import { asdf, asdf2 } from '../fixtures/pkgexports.mjs';
+import { asdf, asdf2, space } from '../fixtures/pkgexports.mjs';
 import {
   loadMissing,
   loadFromNumber,
@@ -12,6 +12,7 @@ import {
 
 strictEqual(asdf, 'asdf');
 strictEqual(asdf2, 'asdf');
+strictEqual(space, 'encoded path');
 
 loadMissing().catch(mustCall((err) => {
   ok(err.message.toString().startsWith('Package exports'));

diff --git a/test/fixtures/node_modules/pkgexports/package.json b/test/fixtures/node_modules/pkgexports/package.json
diff --git a/test/fixtures/node_modules/pkgexports/sp ce.js b/test/fixtures/node_modules/pkgexports/sp ce.js
diff --git a/test/fixtures/pkgexports.mjs b/test/fixtures/pkgexports.mjs
@@ -1,2 +1,3 @@
 export { default as asdf } from 'pkgexports/asdf';
 export { default as asdf2 } from 'pkgexports/sub/asdf.js';
+export { default as space } from 'pkgexports/space';
diff --git a/test/parallel/test-module-package-exports.js b/test/parallel/test-module-package-exports.js
@@ -16,6 +16,8 @@ assert.strictEqual(fixtureRequire('baz/index'), 'eye catcher');
 
 assert.strictEqual(fixtureRequire('pkgexports/sub/asdf.js'), 'asdf');
 
+assert.strictEqual(fixtureRequire('pkgexports/space'), 'encoded path');
+
 assert.throws(
   () => fixtureRequire('pkgexports/not-a-known-entry'),
   (e) => {