import-in-the-middle 2.0.3 → 2.0.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.0.5](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v2.0.4...import-in-the-middle-v2.0.5) (2026-01-20)
+
+
+### Bug Fixes
+
+* handle lazy initialization and circular dependencies ([#229](https://github.com/nodejs/import-in-the-middle/issues/229)) ([d1421dc](https://github.com/nodejs/import-in-the-middle/commit/d1421dc0ae65ce6da5de5cb58f41af99f9d87371))
+
+## [2.0.4](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v2.0.3...import-in-the-middle-v2.0.4) (2026-01-14)
+
+
+### Bug Fixes
+
+* do not instrument the top level module ([#225](https://github.com/nodejs/import-in-the-middle/issues/225)) ([b563b35](https://github.com/nodejs/import-in-the-middle/commit/b563b35c74b96554b5112905391ec3842162b7ee))
+
 ## [2.0.3](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v2.0.2...import-in-the-middle-v2.0.3) (2026-01-13)
 
 

package/create-hook.mjs

@@ -24,7 +24,7 @@ const HANDLED_FORMATS = new Set(['builtin', 'module', 'commonjs'])
 const TRACE_WARNINGS = process.execArgv.includes('--trace-warnings')
 
 let getExports
-if (NODE_MAJOR >= 20 || (NODE_MAJOR === 18 && NODE_MINOR >= 19)) {
+if (NODE_MAJOR > 16 || (NODE_MAJOR === 16 && NODE_MINOR >= 16)) {
   getExports = getExportsImpl
 } else {
   getExports = (url) => import(url).then(Object.keys)
@@ -295,13 +295,25 @@ async function processModule ({ srcUrl, context, parentGetSource, parentResolve,
 
       addSetter(n, `
       let ${variableName}
+      __overridden[${objectKey}] = false
+      let ${variableName}Defer = false
       try {
         ${variableName} = _[${objectKey}] = namespace[${objectKey}]
       } catch (err) {
         if (!(err instanceof ReferenceError)) throw err
+        ${variableName}Defer = true
+      }
+
+      if (${variableName}Defer || ${variableName} === undefined) {
+        __pending.push(__makeUpdater(
+          ${objectKey},
+          () => namespace[${objectKey}],
+          (v) => { ${variableName} = _[${objectKey}] = v }
+        ))
       }
       export { ${variableName} as ${reExportedName} }
       set[${objectKey}] = (v) => {
+        __overridden[${objectKey}] = true
         ${variableName} = v
         return true
       }
@@ -375,10 +387,20 @@ export function createHook (meta) {
     if (isWin && parentURL.indexOf('file:node') === 0) {
       context.parentURL = ''
     }
-    const result = await parentResolve(newSpecifier, context, parentResolve)
-    if (parentURL === '' && !EXTENSION_RE.test(result.url)) {
-      entrypoint = result.url
-      return { url: result.url, format: 'commonjs' }
+    const result = await parentResolve(newSpecifier, context)
+
+    // Do not wrap the entrypoint module. Many CLIs check whether they are the
+    // "main" module (e.g. require.main === module). Wrapping changes how they
+    // are evaluated, and can make them exit without doing anything.
+    if (parentURL === '') {
+      if (!EXTENSION_RE.test(result.url) && !hasIitm(result.url)) {
+        entrypoint = result.url
+        return { url: result.url, format: 'commonjs' }
+      }
+      if (NODE_MAJOR > 16 || (NODE_MAJOR === 16 && NODE_MINOR >= 16)) {
+        entrypoint = result.url
+        return result
+      }
     }
 
     // For included/excluded modules, we check the specifier to match libraries
@@ -472,9 +494,65 @@ ${experimentalPatchInternals ? `import { setExperimentalPatchInternals } from '$
 const _ = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } })
 const set = {}
 const get = {}
+const __overridden = Object.create(null)
+let __pending = []
+
+function __makeUpdater (key, read, assign) {
+  return () => {
+    if (__overridden[key] === true) return true
+    try {
+      const v = read()
+      if (v !== undefined) {
+        assign(v)
+        return true
+      }
+      return false
+    } catch (err) {
+      if (err instanceof ReferenceError) return false
+      throw err
+    }
+  }
+}
+
+function __flushPendingOnce () {
+  if (__pending.length === 0) return
+  const next = []
+  for (const fn of __pending) {
+    // If it still throws ReferenceError, keep it for the (single) next attempt.
+    if (fn() !== true) next.push(fn)
+  }
+  __pending = next
+}
 
 ${Array.from(setters.values()).join('\n')}
 
+if (__pending.length > 0) {
+  queueMicrotask(() => {
+    __flushPendingOnce()
+
+    if (__pending.length > 0) {
+      const __retryDelays = [0, 10, 50]
+      const __schedulePending = (i) => {
+        if (__pending.length === 0) return
+        if (i >= __retryDelays.length) {
+          // Give up: leave exports as-is to avoid unbounded retries.
+          __pending = []
+          return
+        }
+
+        const t = setTimeout(() => {
+          __flushPendingOnce()
+          __schedulePending(i + 1)
+        }, __retryDelays[i])
+        // Don't keep the process alive just for best-effort retries.
+        if (t && typeof t.unref === 'function') t.unref()
+      }
+
+      __schedulePending(0)
+    }
+  })
+}
+
 register(${JSON.stringify(realUrl)}, _, set, get, ${JSON.stringify(originalSpecifier)})
 `
         }
@@ -502,21 +580,28 @@ register(${JSON.stringify(realUrl)}, _, set, get, ${JSON.stringify(originalSpeci
       }
     }
 
-    return parentGetSource(url, context, parentGetSource)
+    return parentGetSource(url, context)
   }
 
   // For Node.js 16.12.0 and higher.
   async function load (url, context, parentLoad) {
     if (hasIitm(url)) {
-      const { source } = await getSource(url, context, parentLoad)
-      return {
-        source,
-        shortCircuit: true,
-        format: 'module'
+      const result = await getSource(url, context, parentLoad)
+      // If wrapping failed, `getSource()` may have fallen back to `parentLoad`,
+      // which can legally return `source: null` (e.g. for non-JS formats).
+      if (result && typeof result === 'object' && result.source != null) {
+        return {
+          source: result.source,
+          shortCircuit: true,
+          format: 'module'
+        }
       }
+
+      // Fall back to the parent loader with the original (non-iitm) URL.
+      return parentLoad(deleteIitm(url), context)
     }
 
-    return parentLoad(url, context, parentLoad)
+    return parentLoad(url, context)
   }
 
   if (NODE_MAJOR >= 17 || (NODE_MAJOR === 16 && NODE_MINOR >= 12)) {
@@ -539,7 +624,7 @@ register(${JSON.stringify(realUrl)}, _, set, get, ${JSON.stringify(originalSpeci
           }
         }
 
-        return parentGetFormat(url, context, parentGetFormat)
+        return parentGetFormat(url, context)
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import-in-the-middle",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {