fix: handling of circular dependencies (#181)

mohd-akram · web-flow · commit b58092ec9bec · 2025-02-28T14:54:35.000+01:00
diff --git a/hook.js b/hook.js
@@ -253,7 +253,12 @@ async function processModule ({ srcUrl, context, parentGetSource, parentResolve,
       }
     } else {
       addSetter(n, `
-      let $${n} = _.${n}
+      let $${n}
+      try {
+        $${n} = _.${n} = namespace.${n}
+      } catch (err) {
+        if (!(err instanceof ReferenceError)) throw err
+      }
       export { $${n} as ${n} }
       set.${n} = (v) => {
         $${n} = v
@@ -404,10 +409,7 @@ import { register } from '${iitmURL}'
 import * as namespace from ${JSON.stringify(realUrl)}
 
 // Mimic a Module object (https://tc39.es/ecma262/#sec-module-namespace-objects).
-const _ = Object.assign(
-  Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }),
-  namespace
-)
+const _ = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } })
 const set = {}
 const get = {}
 
diff --git a/test/fixtures/circular-a.mjs b/test/fixtures/circular-a.mjs
@@ -0,0 +1,5 @@
+import { bar } from './circular-b.mjs'
+
+export const foo = 1
+
+export { bar }
diff --git a/test/fixtures/circular-b.mjs b/test/fixtures/circular-b.mjs
@@ -0,0 +1,3 @@
+import { foo } from './circular-a.mjs'
+
+export const bar = foo + 1
diff --git a/test/register/v18.19-circular.mjs b/test/register/v18.19-circular.mjs
@@ -0,0 +1,17 @@
+import { register } from 'module'
+import Hook from '../../index.js'
+import { strictEqual } from 'assert'
+
+register('../../hook.mjs', import.meta.url)
+
+let bar
+
+Hook((exports, name) => {
+  if (name.match(/circular-b.mjs/)) {
+    bar = exports.bar
+  }
+})
+
+await import('../fixtures/circular-b.mjs')
+
+strictEqual(bar, 2)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { foo } from './circular-a.mjs'`
	`2`	`+`
	`3`	`+export const bar = foo + 1`