Skip to content

esm: fix loader hooks accepting too many arguments #44109

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

Merged
nodejs-github-bot merged 7 commits into from
Aug 4, 2022
Merged

esm: fix loader hooks accepting too many arguments #44109

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f1d595
esm: fix loader hooks accepting too many arguments
JakobJingleheimer Aug 2, 2022
e14ce33
fixup! esm: fix loader hooks accepting too many arguments
JakobJingleheimer Aug 3, 2022
b3d1461
fixup! fixup! esm: fix loader hooks accepting too many arguments
JakobJingleheimer Aug 3, 2022
380c9a5
fixup! fixup! fixup! esm: fix loader hooks accepting too many arguments
JakobJingleheimer Aug 3, 2022
2254fb8
fixup! fixup! fixup! fixup! esm: fix loader hooks accepting too many …
JakobJingleheimer Aug 3, 2022
1eff091
improve substring match
JakobJingleheimer Aug 3, 2022
fad4ccf
correct context arg passed to nextHook fn
JakobJingleheimer Aug 3, 2022
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! fixup! fixup! fixup! esm: fix loader hooks accepting too many … 
…arguments

ReflectApply → direct invocation w separate args
  • Loading branch information
@JakobJingleheimer
JakobJingleheimer committed Aug 3, 2022
commit 2254fb8b6909c5a3a7473494503bc8538d376f31
8 changes: 1 addition & 7 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const {
ObjectDefineProperty,
ObjectSetPrototypeOf,
PromiseAll,
ReflectApply,
RegExpPrototypeExec,
SafeArrayIterator,
SafeWeakMap,
Expand Down Expand Up @@ -159,16 +158,11 @@ function nextHookFactory(chain, meta, { validateArgs, validateOutput }) {
// Set when next<HookName> is actually called, not just generated.
if (generatedHookIndex === 0) { meta.chainFinished = true; }

const argsToApply = [arg0];

if (context) { // `context` has already been validated, so no fancy check needed.
ObjectAssign(meta.context, context);
}
Comment thread
JakobJingleheimer marked this conversation as resolved.

argsToApply[1] = meta.context;
argsToApply[2] = nextNextHook;

const output = await ReflectApply(hook, undefined, argsToApply);
const output = await hook(arg0, context, nextNextHook);
Comment thread
aduh95 marked this conversation as resolved.
Outdated

validateOutput(outputErrIdentifier, output);

Expand Down