Add more cyclical namespace tests.

test/cycle/namespace/immutable/b.mjs → test/cycle/namespace/immutable/cjs/b.mjs

@@ -6,6 +6,6 @@ const ns = getNS()
 
 assert.strictEqual(inspect(ns), "[Module] { default: <uninitialized> }")
 assert.strictEqual(Reflect.isExtensible(ns), true)
-assert.strictEqual(Reflect.defineProperty(ns, "b", { value: "b" }), false)
+assert.strictEqual(Reflect.defineProperty(ns, "ADDED", { value: 1 }), false)
 assert.strictEqual(inspect(ns), "[Module] { default: <uninitialized> }")
 assert.strictEqual(Reflect.preventExtensions(ns), false)

test/cycle/namespace/immutable/cjs/c.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.c = "c"

test/cycle/namespace/immutable/re-export/a.mjs

@@ -0,0 +1,6 @@
+import "./b.mjs"
+import * as ns from "./c.mjs"
+
+export function getNS() {
+  return ns
+}

test/cycle/namespace/immutable/re-export/b.mjs

@@ -0,0 +1,11 @@
+import assert from "assert"
+import { inspect } from "util"
+import { getNS } from "./a.mjs"
+
+const ns = getNS()
+
+assert.strictEqual(inspect(ns), "[Module] {}")
+assert.strictEqual(Reflect.isExtensible(ns), true)
+assert.strictEqual(Reflect.defineProperty(ns, "ADDED", { value: 1 }), false)
+assert.strictEqual(inspect(ns), "[Module] {}")
+assert.strictEqual(Reflect.preventExtensions(ns), false)

test/cycle/namespace/immutable/re-export/c.mjs

@@ -0,0 +1,3 @@
+export * from "./d.js"
+export * from "./e.mjs"
+export * from "./f.js"

test/cycle/namespace/immutable/re-export/d.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.d = "d"

test/cycle/namespace/immutable/re-export/e.mjs

@@ -0,0 +1 @@
+export const e = "e"

test/cycle/namespace/immutable/re-export/f.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.f = "f"

test/cycle/namespace/mutable/b.js → test/cycle/namespace/mutable/cjs/b.js

@@ -6,6 +6,6 @@ const ns = getNS()
 
 assert.strictEqual(inspect(ns), "[Module] {}")
 assert.strictEqual(Reflect.isExtensible(ns), true)
-assert.strictEqual(Reflect.defineProperty(ns, "b", { value: "b" }), false)
+assert.strictEqual(Reflect.defineProperty(ns, "ADDED", { value: 1 }), false)
 assert.strictEqual(inspect(ns), "[Module] {}")
 assert.strictEqual(Reflect.preventExtensions(ns), false)

test/cycle/namespace/mutable/cjs/c.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.c = "c"

test/cycle/namespace/mutable/re-export/a.js

@@ -0,0 +1,6 @@
+import "./b.js"
+import * as ns from "./c.js"
+
+export function getNS() {
+  return ns
+}

test/cycle/namespace/mutable/re-export/b.js

@@ -0,0 +1,11 @@
+import assert from "assert"
+import { inspect } from "util"
+import { getNS } from "./a.js"
+
+const ns = getNS()
+
+assert.strictEqual(inspect(ns), "[Module] {}")
+assert.strictEqual(Reflect.isExtensible(ns), true)
+assert.strictEqual(Reflect.defineProperty(ns, "ADDED", { value: 1 }), false)
+assert.strictEqual(inspect(ns), "[Module] {}")
+assert.strictEqual(Reflect.preventExtensions(ns), false)

test/cycle/namespace/mutable/re-export/c.js

@@ -0,0 +1,3 @@
+export * from "./d.js"
+export * from "./e.js"
+export * from "./f.js"

test/cycle/namespace/mutable/re-export/d.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.d = "d"

test/cycle/namespace/mutable/re-export/e.js

@@ -0,0 +1 @@
+export const e = "e"

test/cycle/namespace/mutable/re-export/f.js

@@ -0,0 +1,3 @@
+"use strict"
+
+exports.f = "f"

test/misc-tests.js

@@ -1083,8 +1083,17 @@ describe("miscellaneous tests", () => {
     it("should support namespace objects of cyclical CJS modules", () =>
       Promise
         .all([
-          "./cycle/namespace/immutable/a.mjs",
-          "./cycle/namespace/mutable/a.js"
+          "./cycle/namespace/immutable/cjs/a.mjs",
+          "./cycle/namespace/mutable/cjs/a.js"
+        ]
+        .map((request) => import(request)))
+    )
+
+    it("should defer finalization of ESM namespace objects containing re-exports of CJS modules", () =>
+      Promise
+        .all([
+          "./cycle/namespace/immutable/re-export/a.mjs",
+          "./cycle/namespace/mutable/re-export/a.js"
         ]
         .map((request) => import(request)))
     )