Skip to content

Commit 2d35d3f

Browse files
GeoffreyBoothjoyeecheung
authored andcommitted
module: eliminate performance cost of detection for cjs entry
PR-URL: nodejs#52093 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Jacob Smith <jacob@frende.me> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 1c8b474 commit 2d35d3f

File tree

6 files changed

+193
-97
lines changed

6 files changed

+193
-97
lines changed

benchmark/misc/startup-core.js

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const bench = common.createBenchmark(main, {
99
script: [
1010
'benchmark/fixtures/require-builtins',
1111
'test/fixtures/semicolon',
12+
'test/fixtures/snapshot/typescript',
1213
],
1314
mode: ['process', 'worker'],
1415
n: [30],

lib/internal/modules/cjs/loader.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ module.exports = {
106106
kModuleExportNames,
107107
kModuleCircularVisited,
108108
initializeCJS,
109+
entryPointSource: undefined, // Set below.
109110
Module,
110111
wrapSafe,
111112
kIsMainSymbol,
@@ -1392,8 +1393,15 @@ function wrapSafe(filename, content, cjsModuleInstance, codeCache) {
13921393
return result;
13931394
} catch (err) {
13941395
if (process.mainModule === cjsModuleInstance) {
1395-
const { enrichCJSError } = require('internal/modules/esm/translators');
1396-
enrichCJSError(err, content, filename);
1396+
if (getOptionValue('--experimental-detect-module')) {
1397+
// For the main entry point, cache the source to potentially retry as ESM.
1398+
module.exports.entryPointSource = content;
1399+
} else {
1400+
// We only enrich the error (print a warning) if we're sure we're going to for-sure throw it; so if we're
1401+
// retrying as ESM, wait until we know whether we're going to retry before calling `enrichCJSError`.
1402+
const { enrichCJSError } = require('internal/modules/esm/translators');
1403+
enrichCJSError(err, content, filename);
1404+
}
13971405
}
13981406
throw err;
13991407
}

lib/internal/modules/helpers.js

+35
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ const {
1919
} = require('internal/errors').codes;
2020
const { BuiltinModule } = require('internal/bootstrap/realm');
2121

22+
const {
23+
shouldRetryAsESM: contextifyShouldRetryAsESM,
24+
constants: {
25+
syntaxDetectionErrors: {
26+
esmSyntaxErrorMessages,
27+
throwsOnlyInCommonJSErrorMessages,
28+
},
29+
},
30+
} = internalBinding('contextify');
2231
const { validateString } = require('internal/validators');
2332
const fs = require('fs'); // Import all of `fs` so that it can be monkey-patched.
2433
const internalFS = require('internal/fs/utils');
@@ -329,6 +338,31 @@ function urlToFilename(url) {
329338
return url;
330339
}
331340

341+
let esmSyntaxErrorMessagesSet; // Declared lazily in shouldRetryAsESM
342+
let throwsOnlyInCommonJSErrorMessagesSet; // Declared lazily in shouldRetryAsESM
343+
/**
344+
* After an attempt to parse a module as CommonJS throws an error, should we try again as ESM?
345+
* We only want to try again as ESM if the error is due to syntax that is only valid in ESM; and if the CommonJS parse
346+
* throws on an error that would not have been a syntax error in ESM (like via top-level `await` or a lexical
347+
* redeclaration of one of the CommonJS variables) then we need to parse again to see if it would have thrown in ESM.
348+
* @param {string} errorMessage The string message thrown by V8 when attempting to parse as CommonJS
349+
* @param {string} source Module contents
350+
*/
351+
function shouldRetryAsESM(errorMessage, source) {
352+
esmSyntaxErrorMessagesSet ??= new SafeSet(esmSyntaxErrorMessages);
353+
if (esmSyntaxErrorMessagesSet.has(errorMessage)) {
354+
return true;
355+
}
356+
357+
throwsOnlyInCommonJSErrorMessagesSet ??= new SafeSet(throwsOnlyInCommonJSErrorMessages);
358+
if (throwsOnlyInCommonJSErrorMessagesSet.has(errorMessage)) {
359+
return /** @type {boolean} */(contextifyShouldRetryAsESM(source));
360+
}
361+
362+
return false;
363+
}
364+
365+
332366
// Whether we have started executing any user-provided CJS code.
333367
// This is set right before we call the wrapped CJS code (not after,
334368
// in case we are half-way in the execution when internals check this).
@@ -362,6 +396,7 @@ module.exports = {
362396
loadBuiltinModule,
363397
makeRequireFunction,
364398
normalizeReferrerURL,
399+
shouldRetryAsESM,
365400
stripBOM,
366401
toRealPath,
367402
hasStartedUserCJSExecution() {

lib/internal/modules/run_main.js

+33-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const {
44
StringPrototypeEndsWith,
55
} = primordials;
66

7-
const { containsModuleSyntax } = internalBinding('contextify');
87
const { getOptionValue } = require('internal/options');
98
const path = require('path');
109
const { pathToFileURL } = require('internal/url');
@@ -44,6 +43,7 @@ function resolveMainPath(main) {
4443
} catch (err) {
4544
if (defaultType === 'module' && err?.code === 'ENOENT') {
4645
const { decorateErrorWithCommonJSHints } = require('internal/modules/esm/resolve');
46+
const { getCWDURL } = require('internal/util');
4747
decorateErrorWithCommonJSHints(err, mainPath, getCWDURL());
4848
}
4949
throw err;
@@ -85,10 +85,6 @@ function shouldUseESMLoader(mainPath) {
8585
case 'commonjs':
8686
return false;
8787
default: { // No package.json or no `type` field.
88-
if (getOptionValue('--experimental-detect-module')) {
89-
// If the first argument of `containsModuleSyntax` is undefined, it will read `mainPath` from the file system.
90-
return containsModuleSyntax(undefined, mainPath);
91-
}
9288
return false;
9389
}
9490
}
@@ -153,12 +149,43 @@ function runEntryPointWithESMLoader(callback) {
153149
* by `require('module')`) even when the entry point is ESM.
154150
* This monkey-patchable code is bypassed under `--experimental-default-type=module`.
155151
* Because of backwards compatibility, this function is exposed publicly via `import { runMain } from 'node:module'`.
152+
* When `--experimental-detect-module` is passed, this function will attempt to run ambiguous (no explicit extension, no
153+
* `package.json` type field) entry points as CommonJS first; under certain conditions, it will retry running as ESM.
156154
* @param {string} main - First positional CLI argument, such as `'entry.js'` from `node entry.js`
157155
*/
158156
function executeUserEntryPoint(main = process.argv[1]) {
159157
const resolvedMain = resolveMainPath(main);
160158
const useESMLoader = shouldUseESMLoader(resolvedMain);
161-
if (useESMLoader) {
159+
160+
// Unless we know we should use the ESM loader to handle the entry point per the checks in `shouldUseESMLoader`, first
161+
// try to run the entry point via the CommonJS loader; and if that fails under certain conditions, retry as ESM.
162+
let retryAsESM = false;
163+
if (!useESMLoader) {
164+
const cjsLoader = require('internal/modules/cjs/loader');
165+
const { Module } = cjsLoader;
166+
if (getOptionValue('--experimental-detect-module')) {
167+
try {
168+
// Module._load is the monkey-patchable CJS module loader.
169+
Module._load(main, null, true);
170+
} catch (error) {
171+
const source = cjsLoader.entryPointSource;
172+
const { shouldRetryAsESM } = require('internal/modules/helpers');
173+
retryAsESM = shouldRetryAsESM(error.message, source);
174+
// In case the entry point is a large file, such as a bundle,
175+
// ensure no further references can prevent it being garbage-collected.
176+
cjsLoader.entryPointSource = undefined;
177+
if (!retryAsESM) {
178+
const { enrichCJSError } = require('internal/modules/esm/translators');
179+
enrichCJSError(error, source, resolvedMain);
180+
throw error;
181+
}
182+
}
183+
} else { // `--experimental-detect-module` is not passed
184+
Module._load(main, null, true);
185+
}
186+
}
187+
188+
if (useESMLoader || retryAsESM) {
162189
const mainPath = resolvedMain || main;
163190
const mainURL = pathToFileURL(mainPath).href;
164191

@@ -167,10 +194,6 @@ function executeUserEntryPoint(main = process.argv[1]) {
167194
// even after the event loop stops running.
168195
return cascadedLoader.import(mainURL, undefined, { __proto__: null }, true);
169196
});
170-
} else {
171-
// Module._load is the monkey-patchable CJS module loader.
172-
const { Module } = require('internal/modules/cjs/loader');
173-
Module._load(main, null, true);
174197
}
175198
}
176199

0 commit comments

Comments
 (0)