import-in-the-middle 1.2.0 → 1.2.3

package/hook.mjs

@@ -6,34 +6,70 @@ const specifiers = new Map()
 
 const EXTENSION_RE = /\.(js|mjs|cjs)$/
 
+const NODE_MAJOR = Number(process.versions.node.split('.')[0])
+
 let entrypoint
 
+function hasIitm (url) {
+  try {
+    return new URL(url).searchParams.has('iitm')
+  } catch {
+    return false
+  }
+}
+
+function deleteIitm (url) {
+  let resultUrl
+  try {
+    const urlObj = new URL(url)
+    if (urlObj.searchParams.has('iitm')) {
+      urlObj.searchParams.delete('iitm')
+      resultUrl = urlObj.href
+      if (resultUrl.startsWith('file:node:')) {
+        resultUrl = resultUrl.replace('file:', '')
+      }
+      if (resultUrl.startsWith('file:///node:')) {
+        resultUrl = resultUrl.replace('file:///', '')
+      }
+    } else {
+      resultUrl = urlObj.href
+    }
+  } catch {
+    resultUrl = url
+  }
+  return resultUrl
+}
+
+function addIitm (url) {
+  const urlObj = new URL(url)
+  urlObj.searchParams.set('iitm', 'true')
+  return urlObj.protocol !== 'file:' && NODE_MAJOR < 18 ? 'file:' + urlObj.href :  urlObj.href
+}
+
 export async function resolve (specifier, context, parentResolve) {
   const { parentURL = '' } = context
 
-  if (specifier.startsWith('iitm:')) {
-    specifier = specifier.replace('iitm:', '')
-  }
-  const url = await parentResolve(specifier, context, parentResolve)
+  const url = await parentResolve(deleteIitm(specifier), context, parentResolve)
 
   if (parentURL === '' && !EXTENSION_RE.test(url.url)) {
     entrypoint = url.url
     return { url: url.url, format: 'commonjs' }
   }
 
-  if (parentURL === import.meta.url || parentURL.startsWith('iitm:')) {
+  if (parentURL === import.meta.url || hasIitm(parentURL)) {
     return url
   }
 
   specifiers.set(url.url, specifier)
 
   return {
-    url: `iitm:${url.url}`
+    url: addIitm(url.url),
+    shortCircuit: true
   }
 }
 
 export function getFormat (url, context, parentGetFormat) {
-  if (url.startsWith('iitm:')) {
+  if (hasIitm(url)) {
     return {
       format: 'module'
     }
@@ -49,8 +85,8 @@ export function getFormat (url, context, parentGetFormat) {
 
 const iitmURL = new URL('lib/register.js', import.meta.url).toString()
 export async function getSource (url, context, parentGetSource) {
-  if (url.startsWith('iitm:')) {
-    const realUrl = url.replace('iitm:', '')
+  if (hasIitm(url)) {
+    const realUrl = deleteIitm(url)
     const realModule = await import(realUrl)
     const exportNames = Object.keys(realModule)
     return {
@@ -76,10 +112,11 @@ register('${realUrl}', namespace, set, '${specifiers.get(realUrl)}')
 
 // For Node.js 16.12.0 and higher.
 export async function load (url, context, parentLoad) {
-  if (url.startsWith('iitm:')) {
+  if (hasIitm(url)) {
     const { source } = await getSource(url, context)
     return {
       source,
+      shortCircuit: true,
       format: 'module'
     }
   }

package/package.json

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

package/fuck.mjs

@@ -1,12 +0,0 @@
-import vm from 'vm'
-
-const context = vm.createContext()
-console.log(vm)
-const mod = new vm.SourceTextModule(`
-export const bar = 5
-`, { context })
-await mod.link(async () => {
-  return new vm.SyntheticModule([], function () {
-  }, { context })
-})
-console.log(Reflect.ownKeys(mod.namespace))