Skip to content

esm: remove proxy for builtin exports #29737

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

Closed
bmeck wants to merge 5 commits into from
Closed

esm: remove proxy for builtin exports #29737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41b5cc9
esm: remove proxy for builtin exports
bfarias-godaddy Sep 27, 2019
a961763
reviews
bfarias-godaddy Sep 27, 2019
6c49aa3
docs
bfarias-godaddy Sep 27, 2019
ada2f6e
Update doc/api/modules.md
bmeck Oct 1, 2019
089de0b
fixup replaceme
guybedford Oct 5, 2019
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
reviews
  • Loading branch information
@bfarias-godaddy
bfarias-godaddy committed Sep 27, 2019
commit a961763a2bf2f90231d77701deb5a0819ee177d4
2 changes: 1 addition & 1 deletion lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ Module._preloadModules = function(requests) {
parent.require(requests[n]);
};

Module.syncESMExports = function syncESMExports() {
Module.syncBuiltinESMExports = function syncBuiltinESMExports() {
for (const mod of NativeModule.map.values()) {
if (mod.canBeRequiredByUsers) {
mod.syncExports();
Expand Down
4 changes: 1 addition & 3 deletions lib/internal/modules/esm/translators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@ translators.set('builtin', async function builtinStrategy(url) {
throw new ERR_UNKNOWN_BUILTIN_MODULE(id);
}
debug(`Loading BuiltinModule ${url}`);
const facade = module.getESMFacade();
module.syncExports();
return facade;
return module.getESMFacade();
});

// Strategy for loading a JSON file
Expand Down
30 changes: 15 additions & 15 deletions test/es-module/test-esm-live-binding.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Flags: --experimental-modules
import '../common/index.mjs';
import assert from 'assert';
import { syncESMExports } from 'module';
import { syncBuiltinESMExports } from 'module';

import fs, { readFile, readFileSync } from 'fs';
import events, { defaultMaxListeners } from 'events';
Expand All @@ -15,12 +15,12 @@ const s = Symbol();
const fn = () => s;

Reflect.deleteProperty(fs, 'readFile');
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([fs.readFile, readFile], [undefined, undefined]);

fs.readFile = fn;
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([fs.readFile(), readFile()], [s, s]);

Expand All @@ -29,12 +29,12 @@ Reflect.defineProperty(fs, 'readFile', {
configurable: true,
writable: true,
});
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([fs.readFile(), readFile()], [s, s]);

Reflect.deleteProperty(fs, 'readFile');
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([fs.readFile, readFile], [undefined, undefined]);

Expand All @@ -44,12 +44,12 @@ Reflect.defineProperty(fs, 'readFile', {
get() { return count; },
configurable: true,
});
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([readFile, fs.readFile], [0, 0]);

count++;
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([fs.readFile, readFile], [1, 1]);

Expand All @@ -71,7 +71,7 @@ Reflect.defineProperty(fs, 'readFileSync', {
});

fs.readFile = 2;
syncESMExports();
syncBuiltinESMExports();

assert.deepStrictEqual([readFile, readFileSync], [undefined, 2]);

Expand All @@ -96,7 +96,7 @@ Reflect.defineProperty(Function.prototype, 'defaultMaxListeners', {
});
},
});
syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(defaultMaxListeners, originDefaultMaxListeners);
assert.strictEqual(events.defaultMaxListeners, originDefaultMaxListeners);
Expand All @@ -106,13 +106,13 @@ events.defaultMaxListeners += 1;
assert.strictEqual(events.defaultMaxListeners,
originDefaultMaxListeners + 1);

syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(defaultMaxListeners, originDefaultMaxListeners + 1);
assert.strictEqual(Function.prototype.defaultMaxListeners, 1);

Function.prototype.defaultMaxListeners = 'foo';
syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(Function.prototype.defaultMaxListeners, 'foo');
assert.strictEqual(events.defaultMaxListeners, originDefaultMaxListeners + 1);
Expand All @@ -133,19 +133,19 @@ const p = {
};

util.__proto__ = p; // eslint-disable-line no-proto
syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(util.foo, 1);

util.foo = 'bar';
syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(count, 1);
assert.strictEqual(util.foo, 'bar');
assert.strictEqual(p.foo, 2);

p.foo = 'foo';
syncESMExports();
syncBuiltinESMExports();

assert.strictEqual(p.foo, 'foo');

Expand All @@ -154,7 +154,7 @@ util.__proto__ = utilProto; // eslint-disable-line no-proto

Reflect.deleteProperty(util, 'foo');
Reflect.deleteProperty(Function.prototype, 'defaultMaxListeners');
syncESMExports();
syncBuiltinESMExports();

assert.throws(
() => Object.defineProperty(events, 'defaultMaxListeners', { value: 3 }),
Expand Down