Skip to content

module: implement "exports" proposal for CommonJS #28759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hybrist wants to merge 6 commits into from
Closed

module: implement "exports" proposal for CommonJS #28759

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
817d5c8
module: implement "exports" proposal for CommonJS
hybrist Jul 19, 2019
8b29deb
fixup! module: implement "exports" proposal for CommonJS
hybrist Jul 23, 2019
3316fea
fixup! module: implement "exports" proposal for CommonJS
hybrist Jul 23, 2019
b7258f9
fixup! module: implement "exports" proposal for CommonJS
hybrist Jul 23, 2019
bd68eaf
fixup! module: implement "exports" proposal for CommonJS
hybrist Jul 23, 2019
104af34
fixup! module: implement "exports" proposal for CommonJS
hybrist Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! module: implement "exports" proposal for CommonJS
  • Loading branch information
@hybrist
hybrist committed Jul 23, 2019
commit 8b29deb7ebddb4752287f58eee71d818b0527c8f
19 changes: 13 additions & 6 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@

'use strict';

const { JSON, Object, Reflect } = primordials;
const {
ArrayPrototype,
JSON,
Object,
Reflect,
SafeMap,
StringPrototype,
} = primordials;

const { NativeModule } = require('internal/bootstrap/loaders');
const { pathToFileURL, fileURLToPath, URL } = require('internal/url');
Expand Down Expand Up @@ -185,7 +192,7 @@ Module._debug = deprecate(debug, 'Module._debug is deprecated.', 'DEP0077');
// Check if the directory is a package.json dir.
const packageMainCache = Object.create(null);
// Explicit exports from package.json files
const packageExportsCache = new Map();
const packageExportsCache = new SafeMap();

function readPackageRaw(requestPath) {
const jsonPath = path.resolve(requestPath, 'package.json');
Expand Down Expand Up @@ -335,7 +342,7 @@ function resolveExports(nmPath, request, absoluteRequest) {
// The implementation's behavior is meant to mirror resolution in ESM.
if (experimentalExports && !absoluteRequest) {
const [, name, expansion] =
request.match(EXPORTS_PATTERN) || [];
StringPrototype.match(request, EXPORTS_PATTERN) || [];
if (!name) {
return path.resolve(nmPath, request);
}
Expand All @@ -355,17 +362,17 @@ function resolveExports(nmPath, request, absoluteRequest) {
if (candidateKey[candidateKey.length - 1] !== '/') continue;
if (candidateValue[candidateValue.length - 1] !== '/') continue;
if (candidateKey.length > dirMatch.length &&
mappingKey.startsWith(candidateKey)) {
StringPrototype.startsWith(mappingKey, candidateKey)) {
dirMatch = candidateKey;
}
}

if (dirMatch !== '') {
const dirMapping = pkgExports[dirMatch];
const remainder = mappingKey.slice(dirMatch.length);
const remainder = ArrayPrototype.slice(mappingKey, dirMatch.length);
const expectedPrefix = path.resolve(basePath, dirMapping);
Comment thread
hybrist marked this conversation as resolved.
Outdated
const resolved = path.resolve(expectedPrefix, remainder);
if (resolved.startsWith(expectedPrefix)) {
if (StringPrototype.startsWith(resolved, expectedPrefix)) {
return resolved;
}
}
Expand Down