Skip to content

Commit 3c71e8e

Browse files
committed
test(esm): assert the export form when a require() cycle breaks too
Without a cycle a module's getters come before its values in its keys, so the order shows a getter kept stale after the cycle broke, which the case did not check. It now starts with the cycle, breaks it, then forms it again.
1 parent 8b8905f commit 3c71e8e

8 files changed

Lines changed: 24 additions & 17 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import b from "./b.js";
22

3-
export const value = 1;
3+
export const alpha = 1;
44
export function keys() {
55
return b.keys;
66
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
exports.keys = null;
1+
// read while a.js is still evaluating, so only bindings defined up front show
2+
exports.keys = Object.keys(require("./a.js"));
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
exports.keys = null;
1+
// read while c.js is still evaluating, so only bindings defined up front show
2+
exports.keys = Object.keys(require("./c.js"));
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
// `export const` in a.js, `export default` in c.js
2-
for (const [file, load, names] of [
3-
["a.js", () => require("./a.js"), ["keys", "value"]],
4-
["c.js", () => require("./c.js"), ["default", "keys"]]
1+
// a.js has an `export const`, c.js an `export default`; the cycle is formed at
2+
// steps 0 and 2 and broken at step 1
3+
const cycle = WATCH_STEP !== "1";
4+
5+
for (const [file, load, value] of [
6+
["a.js", () => require("./a.js"), "alpha"],
7+
["c.js", () => require("./c.js"), "default"]
58
]) {
6-
it(`should define ${file}'s exports up front once a require() cycle reaches it`, () => {
9+
it(`should define ${file}'s exports as the cycles around it ask`, () => {
710
const module = load();
8-
// every export used as a whole object, so none is inlined or renamed
9-
expect(Object.keys(module).sort()).toEqual(names);
10-
expect(module.keys()).toEqual(WATCH_STEP === "1" ? names : null);
11+
// getters are defined up front by name, values after the module ran
12+
expect(Object.keys(module)).toEqual(
13+
cycle ? [value, "keys"].sort() : ["keys", value]
14+
);
15+
expect(module.keys()).toEqual(cycle ? [value, "keys"].sort() : null);
1116
});
1217
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
// read while a.js is still evaluating, so only bindings defined up front show
2-
exports.keys = Object.keys(require("./a.js")).sort();
1+
exports.keys = null;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
// read while c.js is still evaluating, so only bindings defined up front show
2-
exports.keys = Object.keys(require("./c.js")).sort();
1+
exports.keys = null;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
exports.keys = null;
1+
// read while a.js is still evaluating, so only bindings defined up front show
2+
exports.keys = Object.keys(require("./a.js"));
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
exports.keys = null;
1+
// read while c.js is still evaluating, so only bindings defined up front show
2+
exports.keys = Object.keys(require("./c.js"));

0 commit comments

Comments
 (0)