Skip to content

Commit

Permalink
module: fixing url change in load sync hook chain
Browse files Browse the repository at this point in the history
Fixes: #56376
  • Loading branch information
awto committed Dec 29, 2024
1 parent 0dbbaba commit 4b2b413
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/internal/modules/cjs/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ function getDefaultLoad(url, filename) {
return function defaultLoad(urlFromHook, context) {
// If the url is the same as the original one, save the conversion.
const isLoadingOriginalModule = (urlFromHook === url);
const filenameFromHook = isLoadingOriginalModule ? filename : convertURLToCJSFilename(url);
const filenameFromHook = isLoadingOriginalModule ? filename : convertURLToCJSFilename(urlFromHook);
const source = defaultLoadImpl(filenameFromHook, context.format);
// Format from context is directly returned, because format detection should only be
// done after the entire load chain is completed.
Expand Down
29 changes: 29 additions & 0 deletions test/module-hooks/test-module-hooks-load-url-change.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const { registerHooks } = require('module');
const fixtures = require('../common/fixtures');

// This tests shows the url parameter in `load` can be changed in the `nextLoad` call

const hook = registerHooks({
resolve(specifier, context, nextLoad) {
assert.strictEqual(specifier, 'rfs');
return {
url: 'file:///rfs',
shortCircuit: true,
};
},
load: common.mustCall(function load(url, context, nextLoad) {
assert.strictEqual(url, 'file:///rfs');
return nextLoad(
fixtures.fileURL('module-hooks', `redirected-fs.js`).href,
context
);
}),
});

assert.strictEqual(require('rfs').exports_for_test, 'redirected fs');

hook.deregister();

0 comments on commit 4b2b413

Please sign in to comment.