Skip to content

module: package "imports" field #34117

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
guybedford wants to merge 10 commits into from
Closed

module: package "imports" field #34117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9f7c01
module: package "imports" field
guybedford Jun 28, 2020
5875d53
docs feedback
guybedford Jul 1, 2020
105b7f2
Apply suggestions from code review
guybedford Jul 1, 2020
8fe68f7
Apply suggestions from code review
guybedford Jul 2, 2020
1dc83f5
percent-encoded target test
guybedford Jul 4, 2020
ceffe4c
fixup cycle bug
guybedford Jul 4, 2020
2570191
unify invalid specifier check
guybedford Jul 9, 2020
ec4b7a4
Update lib/internal/modules/cjs/loader.js
guybedford Jul 9, 2020
eb34788
Update lib/internal/modules/esm/resolve.js
guybedford Jul 9, 2020
6a69697
add RegExpPrototypeTest
guybedford Jul 9, 2020
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
unify invalid specifier check
  • Loading branch information
@guybedford
guybedford committed Jul 9, 2020
commit 25701919cad359c91a58fe52bec038eb4cebbc4e
21 changes: 9 additions & 12 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const {
SafeWeakMap,
SafeSet,
String,
StringPrototypeIncludes,
StringPrototypeIndexOf,
StringPrototypeLastIndexOf,
StringPrototypeMatch,
Expand Down Expand Up @@ -116,7 +115,10 @@ const {
const asyncESM = require('internal/process/esm_loader');
const ModuleJob = require('internal/modules/esm/module_job');
const { ModuleWrap, kInstantiated } = internalBinding('module_wrap');
const { packageInternalResolve } = require('internal/modules/esm/resolve');
const {
encodedSepRegEx,
packageInternalResolve
} = require('internal/modules/esm/resolve');

const isWindows = process.platform === 'win32';

Expand Down Expand Up @@ -574,16 +576,11 @@ function resolveExportsTarget(baseUrl, target, subpath, mappingKey) {
if (StringPrototypeStartsWith(resolvedPath, resolvedTargetPath) &&
StringPrototypeIndexOf(resolvedPath, '/node_modules/',
pkgPathPath.length - 1) === -1) {
try {
return fileURLToPath(resolved);
} catch (err) {
if (err.code === 'ERR_INVALID_FILE_URL_PATH' && StringPrototypeIncludes(
err.message, 'must not include encoded "/" characters')) {
throw new ERR_INVALID_MODULE_SPECIFIER(
resolved.pathname, 'must not include encoded "/" characters',
fileURLToPath(baseUrl));
}
}
if (resolvedPath.match(encodedSepRegEx))
throw new ERR_INVALID_MODULE_SPECIFIER(
resolvedPath, 'must not include encoded "/" or "\\" characters',
fileURLToPath(baseUrl));
return fileURLToPath(resolved);
}
const reason = 'request is not a valid subpath for the "exports" ' +
`resolution of ${baseUrl.pathname}package.json`;
Expand Down
20 changes: 8 additions & 12 deletions lib/internal/modules/esm/resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ function resolveIndex(search) {
return resolveExtensions(new URL('index', search));
}

const encodedSepRegEx = /%2F|%2C/i;
function finalizeResolution(resolved, base) {
if (getOptionValue('--experimental-specifier-resolution') === 'node') {
let file = resolveExtensionsWithTryExactName(resolved);
Expand All @@ -255,18 +256,12 @@ function finalizeResolution(resolved, base) {
resolved.pathname, fileURLToPath(base), 'module');
}

let path;
try {
path = fileURLToPath(resolved);
} catch (err) {
if (err.code === 'ERR_INVALID_FILE_URL_PATH' &&
err.message.includes('must not include encoded "/" characters')) {
throw new ERR_INVALID_MODULE_SPECIFIER(
resolved.pathname, 'must not include encoded "/" characters',
fileURLToPath(base));
}
throw err;
}
if (encodedSepRegEx.test(resolved.pathname))
throw new ERR_INVALID_MODULE_SPECIFIER(
resolved.pathname, 'must not include encoded "/" or "\\" characters',
fileURLToPath(base));

const path = fileURLToPath(resolved);
const stats = tryStatSync(path);

if (stats.isDirectory()) {
Expand Down Expand Up @@ -850,6 +845,7 @@ function defaultResolve(specifier, context = {}, defaultResolveUnused) {
module.exports = {
DEFAULT_CONDITIONS,
defaultResolve,
encodedSepRegEx,
getPackageType,
packageInternalResolve
};
4 changes: 2 additions & 2 deletions lib/internal/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ function getPathFromURLWin32(url) {
if ((pathname[n + 1] === '2' && third === 102) || // 2f 2F /
(pathname[n + 1] === '5' && third === 99)) { // 5c 5C \
throw new ERR_INVALID_FILE_URL_PATH(
'must not include encoded "\\" or "/" characters'
'must not include encoded \\ or / characters'
);
}
}
Expand Down Expand Up @@ -1331,7 +1331,7 @@ function getPathFromURLPosix(url) {
const third = pathname.codePointAt(n + 2) | 0x20;
if (pathname[n + 1] === '2' && third === 102) {
throw new ERR_INVALID_FILE_URL_PATH(
'must not include encoded "/" characters'
'must not include encoded / characters'
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-fs-whatwg-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (common.isWindows) {
{
code: 'ERR_INVALID_FILE_URL_PATH',
name: 'TypeError',
message: 'File URL path must not include encoded "\\" or "/" characters'
message: 'File URL path must not include encoded \\ or / characters'
}
);
});
Expand All @@ -76,7 +76,7 @@ if (common.isWindows) {
{
code: 'ERR_INVALID_FILE_URL_PATH',
name: 'TypeError',
message: 'File URL path must not include encoded "/" characters'
message: 'File URL path must not include encoded / characters'
});
});
assert.throws(
Expand Down