Skip to content
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

Jump to bottom

[v18.x] Backport most ESM and customization hook changes #50669

Closed
wants to merge 75 commits into from
Closed

[v18.x] Backport most ESM and customization hook changes #50669

Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift click to select a range
5a0ae4d
esm: move hook execution to separate thread
JakobJingleheimer Nov 10, 2023
7c878ef
esm: avoid try/catch when validating urls
anonrig Apr 15, 2023
4990269
esm: propagate `process.exit` from the loader thread to the main thread
aduh95 Apr 19, 2023
40fa6e4
esm: initialize `import.meta` on eval
aduh95 Apr 19, 2023
d8687c4
esm: remove support for deprecated hooks
aduh95 Apr 19, 2023
ee9cef2
loader: use default loader as cascaded loader in the in loader worker
joyeecheung Apr 21, 2023
d63f4c4
esm: rename `URLCanParse` to be consistent
aduh95 Apr 22, 2023
a31ca4e
esm: do not use `'beforeExit'` on the main thread
aduh95 May 14, 2023
2bb6dfb
esm: handle more error types thrown from the loader thread
aduh95 Jun 1, 2023
09c986e
esm: handle `globalPreload` hook returning a nullish value
aduh95 May 30, 2023
96edd85
esm: remove support for arrays in `import` internal method
aduh95 Jun 5, 2023
a0c10aa
typings: fix JSDoc in ESM loader modules
aduh95 Jun 11, 2023
1964e25
module: implement `register` utility
jlenon7 Jun 12, 2023
002a084
esm: add back `globalPreload` tests and fix failing ones
aduh95 Jul 17, 2023
afa2562
esm: unflag `Module.register` and allow nested loader `import()`
izaakschroeder Jul 19, 2023
5de6683
module: ensure successful import returns the same result
aduh95 Jul 26, 2023
0a9e81e
test: fix `es-module/test-esm-initialization`
aduh95 Jul 29, 2023
4ffa98f
fs: make `mkdtemp` accept buffers and URL
LiviaMedeiros Jul 18, 2023
17ba928
test: fix some assumptions in tests
aduh95 Jul 31, 2023
9d44275
test: order `common.mjs` in ASCII order
aduh95 Jul 31, 2023
ce1d396
test: fix snapshot tests when cwd contains spaces or backslashes
aduh95 Jul 31, 2023
f5661b0
esm: fix typo `parentUrl` -> `parentURL`
aduh95 Aug 2, 2023
c34870e
esm: add `initialize` hook, integrate with `register`
izaakschroeder Aug 3, 2023
3d58e49
test: use `fixtures.fileURL` when appropriate
aduh95 Aug 3, 2023
61aa405
esm: protect `ERR_UNSUPPORTED_DIR_IMPORT` against prototype pollution
aduh95 Aug 11, 2023
0bfcddc
test: reduce flakiness of `test-esm-loader-hooks`
aduh95 Aug 12, 2023
a256f11
esm: import.meta.resolve exact module not found errors should return
guybedford Aug 13, 2023
73809e2
esm: unflag import.meta.resolve
guybedford Aug 13, 2023
8ec3953
esm: fix `globalPreload` warning
aduh95 Aug 13, 2023
586bb8f
doc: fix name of the flag in `initialize()` docs
aduh95 Aug 14, 2023
1c020cc
test: refactor `test-esm-loader-hooks` for easier debugging
aduh95 Aug 15, 2023
222a378
doc: caveat unavailability of `import.meta.resolve` in custom loaders
JakobJingleheimer Aug 19, 2023
cf02160
test: reduce flakiness of `test-esm-loader-hooks`
aduh95 Aug 20, 2023
0b72534
doc: add signature for `module.register`
GeoffreyBooth Aug 20, 2023
3c9111e
esm: refactor mocking test
GeoffreyBooth Sep 5, 2023
f86933b
doc: move and rename loaders section
GeoffreyBooth Aug 22, 2023
dcf909c
doc: update module hooks docs
GeoffreyBooth Aug 24, 2023
16580a4
doc: edit `import.meta.resolve` documentation
aduh95 Sep 5, 2023
abedad7
test: add `tmpdir.fileURL()`
LiviaMedeiros Aug 10, 2023
d785f83
esm: refactor test-esm-named-exports
GeoffreyBooth Sep 4, 2023
9a7a8c5
esm: refactor test-esm-loader-resolve-type
GeoffreyBooth Sep 4, 2023
fbc7c3e
esm: remove return value for `Module.register`
aduh95 Sep 9, 2023
71c4ae3
typings: fix missing property in `ExportedHooks`
aduh95 Sep 9, 2023
a23a4c9
test: isolate `globalPreload` tests
GeoffreyBooth Sep 9, 2023
89dce06
test: increase coverage of `Module.register` and `initialize` hook
aduh95 Sep 10, 2023
40ffd28
esm: clarify ERR_REQUIRE_ESM errors
danielcompton Sep 15, 2023
1a2443a
esm: fix support for `URL` instances in `register`
aduh95 Sep 17, 2023
a29ddb3
esm: update loaders warning
GeoffreyBooth Sep 19, 2023
44b345c
esm: fix return type of `import.meta.resolve`
aduh95 Sep 20, 2023
aadc39f
doc: add missing history info for `import.meta.resolve`
aduh95 Sep 20, 2023
efd4e8c
esm: identify parent importing a url with invalid host
JakobJingleheimer Sep 23, 2023
f85e62f
esm: fix cache collision on JSON files using file: URL
aduh95 Sep 29, 2023
a600822
lib: merge cjs and esm package json reader caches
anonrig Jun 29, 2023
c262d3b
esm: require braces for modules code
GeoffreyBooth Sep 15, 2023
bd4eda0
module, esm: jsdoc for modules files
GeoffreyBooth Sep 19, 2023
7c5b7f3
module: move helpers out of cjs loader
GeoffreyBooth Sep 30, 2023
2f26771
esm: improve JSDoc annotation of internal functions
aduh95 Oct 1, 2023
ce76ac2
esm: --experimental-default-type flag to flip module defaults
GeoffreyBooth Sep 29, 2023
823adc8
esm: unflag extensionless javascript and wasm in module scope
GeoffreyBooth Sep 30, 2023
08201aa
util: add `getCwdSafe` internal util fn
jlenon7 Sep 22, 2023
151e812
esm: bypass CommonJS loader under --default-type
GeoffreyBooth Oct 5, 2023
9ed022b
tools: update eslint to 8.45.0
nodejs-github-bot Jul 18, 2023
5c4057a
tools: update eslint to 8.46.0
nodejs-github-bot Aug 1, 2023
9509884
tools: update eslint to 8.47.0
nodejs-github-bot Aug 15, 2023
2208832
tools: update eslint to 8.48.0
nodejs-github-bot Aug 29, 2023
96dea39
tools: update eslint to 8.49.0
nodejs-github-bot Sep 12, 2023
669e3d7
tools: update eslint to 8.50.0
nodejs-github-bot Oct 3, 2023
83f680f
tools: update eslint to 8.51.0
nodejs-github-bot Oct 8, 2023
5699370
esm: use import attributes instead of import assertions
aduh95 Oct 14, 2023
52901a7
test: deflake `test-esm-loader-resolve-type`
aduh95 Oct 21, 2023
bd6512e
test: deflake `test-loaders-workers-spawned`
aduh95 Oct 18, 2023
b0829b7
vm: use import attributes instead of import assertions
aduh95 Oct 23, 2023
8f9645d
test: refactor `test-node-output-errors`
aduh95 Aug 3, 2023
85b21a8
test: fix edge snapshot stack traces
GeoffreyBooth Sep 17, 2023
3bf8c02
tools: skip ruff on tools/node_modules
MoLow Sep 24, 2023
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
test: increase coverage of Module.register and initialize hook 
PR-URL: #49532
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
  • Loading branch information
@aduh95 @targos
aduh95 authored and targos committed Nov 11, 2023
commit 89dce060bace1687bb3eb7c285bf4934a224080c
246 changes: 157 additions & 89 deletions test/es-module/test-esm-loader-hooks.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,28 399,29 @@ describe('Loader hooks', { concurrency: true }, () => {
assert.strictEqual(signal, null);
});

it('should invoke `initialize` correctly', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--experimental-loader',
fixtures.fileURL('es-module-loaders/hooks-initialize.mjs'),
'--input-type=module',
'--eval',
'import os from "node:os";',
]);
describe('`initialize`/`register`', () => {
it('should invoke `initialize` correctly', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--experimental-loader',
fixtures.fileURL('es-module-loaders/hooks-initialize.mjs'),
'--input-type=module',
'--eval',
'import os from "node:os";',
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['hooks initialize 1', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['hooks initialize 1', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('should allow communicating with loader via `register` ports', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
it('should allow communicating with loader via `register` ports', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {MessageChannel} from 'node:worker_threads';
import {register} from 'node:module';
import {once} from 'node:events';
Expand All @@ -441,25 442,25 @@ describe('Loader hooks', { concurrency: true }, () => {
]);
clearTimeout(timeout);
port1.close();
`,
]);
`,
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), [ 'register undefined',
'message initialize',
'message resolve node:os',
'' ]);
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), [ 'register undefined',
'message initialize',
'message resolve node:os',
'' ]);

assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('should have `register` work with cjs', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=commonjs',
'--eval',
`
it('should have `register` work with cjs', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=commonjs',
'--eval',
`
'use strict';
const {register} = require('node:module');
register(
Expand All @@ -472,56 473,54 @@ describe('Loader hooks', { concurrency: true }, () => {
import('node:os').then((result) => {
console.log(JSON.stringify(result));
});
`,
]);
`,
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n').sort(), ['hooks initialize 1', '{"default":"foo"}', ''].sort());
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n').sort(), ['hooks initialize 1', '{"default":"foo"}', ''].sort());

assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('`register` should work with `require`', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--require',
fixtures.path('es-module-loaders/register-loader.cjs'),
'--input-type=module',
'--eval',
'import "node:os";',
]);
it('`register` should work with `require`', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--require',
fixtures.path('es-module-loaders/register-loader.cjs'),
'--input-type=module',
'--eval',
'import "node:os";',
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['resolve passthru', 'resolve passthru', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['resolve passthru', 'resolve passthru', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('`register` should work with `import`', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--import',
fixtures.fileURL('es-module-loaders/register-loader.mjs'),
'--input-type=module',
'--eval',
`
import 'node:os';
`,
]);
it('`register` should work with `import`', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--import',
fixtures.fileURL('es-module-loaders/register-loader.mjs'),
'--input-type=module',
'--eval',
'import "node:os"',
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['resolve passthru', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), ['resolve passthru', '']);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('should execute `initialize` in sequence', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
it('should execute `initialize` in sequence', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {register} from 'node:module';
console.log('result 1', register(
${JSON.stringify(fixtures.fileURL('es-module-loaders/hooks-initialize.mjs'))}
Expand All @@ -531,16 530,85 @@ describe('Loader hooks', { concurrency: true }, () => {
));

await import('node:os');
`,
]);
`,
]);

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), [ 'hooks initialize 1',
'result 1 undefined',
'hooks initialize 2',
'result 2 undefined',
'' ]);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout.split('\n'), [ 'hooks initialize 1',
'result 1 undefined',
'hooks initialize 2',
'result 2 undefined',
'' ]);
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
});

it('should handle `initialize` returning never-settling promise', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {register} from 'node:module';
register('data:text/javascript,export function initialize(){return new Promise(()=>{})}');
`,
]);

assert.strictEqual(stderr, '');
assert.strictEqual(stdout, '');
assert.strictEqual(code, 13);
assert.strictEqual(signal, null);
});

it('should handle `initialize` returning rejecting promise', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {register} from 'node:module';
register('data:text/javascript,export function initialize(){return Promise.reject()}');
`,
]);

assert.match(stderr, /undefined\r?\n/);
assert.strictEqual(stdout, '');
assert.strictEqual(code, 1);
assert.strictEqual(signal, null);
});

it('should handle `initialize` throwing null', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {register} from 'node:module';
register('data:text/javascript,export function initialize(){throw null}');
`,
]);

assert.match(stderr, /null\r?\n/);
assert.strictEqual(stdout, '');
assert.strictEqual(code, 1);
assert.strictEqual(signal, null);
});

it('should be fine to call `process.exit` from a initialize hook', async () => {
const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
'--no-warnings',
'--input-type=module',
'--eval',
`
import {register} from 'node:module';
register('data:text/javascript,export function initialize(){process.exit(42);}');
`,
]);

assert.strictEqual(stderr, '');
assert.strictEqual(stdout, '');
assert.strictEqual(code, 42);
assert.strictEqual(signal, null);
});
});
});