OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 12:20:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

esm: fix hook name in error message

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/50466
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Jacob Smith <jacob@frende.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
This commit is contained in:
Bruce MacNaughton 2023-12-05 10:54:01 -08:00 committed by GitHub
parent c59fe11038
commit ab857e138f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/errors.js
View File

@ -1475,11 +1475,11 @@ E('ERR_INVALID_REPL_EVAL_CONFIG',
E('ERR_INVALID_REPL_INPUT', '%s', TypeError); E('ERR_INVALID_REPL_INPUT', '%s', TypeError);
E('ERR_INVALID_RETURN_PROPERTY', (input, name, prop, value) => { E('ERR_INVALID_RETURN_PROPERTY', (input, name, prop, value) => {
return `Expected a valid ${input} to be returned for the "${prop}" from the` + return `Expected a valid ${input} to be returned for the "${prop}" from the` +
` "${name}" function but got ${determineSpecificType(value)}.`; ` "${name}" hook but got ${determineSpecificType(value)}.`;
}, TypeError); }, TypeError);
E('ERR_INVALID_RETURN_PROPERTY_VALUE', (input, name, prop, value) => { E('ERR_INVALID_RETURN_PROPERTY_VALUE', (input, name, prop, value) => {
return `Expected ${input} to be returned for the "${prop}" from the` + return `Expected ${input} to be returned for the "${prop}" from the` +
` "${name}" function but got ${determineSpecificType(value)}.`; ` "${name}" hook but got ${determineSpecificType(value)}.`;
}, TypeError); }, TypeError);
E('ERR_INVALID_RETURN_VALUE', (input, name, value) => { E('ERR_INVALID_RETURN_VALUE', (input, name, value) => {
const type = determineSpecificType(value); const type = determineSpecificType(value);

2
lib/internal/modules/esm/translators.js
View File

@ -128,7 +128,7 @@ function assertBufferSource(body, allowString, hookName) {
*/ */
function stringify(body) { function stringify(body) {
if (typeof body === 'string') { return body; } if (typeof body === 'string') { return body; }
assertBufferSource(body, false, 'transformSource'); assertBufferSource(body, false, 'load');
const { TextDecoder } = require('internal/encoding'); const { TextDecoder } = require('internal/encoding');
DECODER = DECODER === null ? new TextDecoder() : DECODER; DECODER = DECODER === null ? new TextDecoder() : DECODER;
return DECODER.decode(body); return DECODER.decode(body);

5
test/es-module/test-esm-loader.mjs
View File

@ -43,6 +43,11 @@ await assert.rejects(
{ code: 'ERR_INVALID_RETURN_PROPERTY_VALUE' }, { code: 'ERR_INVALID_RETURN_PROPERTY_VALUE' },
); );
await assert.rejects(import('esmHook/commonJsNullSource.mjs'), {
code: 'ERR_INVALID_RETURN_PROPERTY_VALUE',
message: /"source".*'load'.*got type bigint/,
});
await import('../fixtures/es-module-loaders/js-as-esm.js') await import('../fixtures/es-module-loaders/js-as-esm.js')
.then((parsedModule) => { .then((parsedModule) => {
assert.strictEqual(typeof parsedModule, 'object'); assert.strictEqual(typeof parsedModule, 'object');

8
test/fixtures/es-module-loaders/hooks-custom.mjs vendored
View File

@ -97,5 +97,13 @@ export function load(url, context, next) {
}; };
} }
if (url.endsWith('esmHook/commonJsNullSource.mjs')) {
return {
format: 'commonjs',
shortCircuit: true,
source: 1n,
};
}
return next(url); return next(url);
} }