import-in-the-middle 1.1.2 → 1.2.2

package/hook.mjs

@@ -4,39 +4,79 @@
 
 const specifiers = new Map()
 
+const EXTENSION_RE = /\.(js|mjs|cjs)$/
+
+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
+  } catch {
+    resultUrl = url
+  }
+  return resultUrl
+}
+
+function addIitm (url) {
+  const urlObj = new URL(url)
+  urlObj.searchParams.set('iitm', 'true')
+  return urlObj.href
+}
+
 export async function resolve (specifier, context, parentResolve) {
   const { parentURL = '' } = context
 
-  if (specifier.startsWith('iitm:')) {
-    specifier = specifier.replace('iitm:', '')
+  const url = await parentResolve(deleteIitm(specifier), context, parentResolve)
+
+  if (parentURL === '' && !EXTENSION_RE.test(url.url)) {
+    entrypoint = url.url
+    return { url: url.url, format: 'commonjs' }
   }
-  const url = await parentResolve(specifier, context, parentResolve)
 
-  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'
     }
   }
+  if (url === entrypoint) {
+    return {
+      format: 'commonjs'
+    }
+  }
 
   return parentGetFormat(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 {
@@ -62,10 +102,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,11 +1,11 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {
-    "test": "c8 --check-coverage --lines 90 imhotap --runner test/runtest --files test/{hook,low-level}/*.*js",
-    "coverage": "c8 --reporter html imhotap --runner test/runtest --files test/{hook,low-level}/*.*js && echo '\nNow open coverage/index.html\n'"
+    "test": "c8 --check-coverage --lines 90 imhotap --runner test/runtest --files test/{hook,low-level,other}/*",
+    "coverage": "c8 --reporter html imhotap --runner test/runtest --files test/{hook,low-level,other}/* && echo '\nNow open coverage/index.html\n'"
   },
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/DataDog/import-in-the-middle#readme",
   "devDependencies": {
     "c8": "^7.8.0",
-    "imhotap": "^1.1.0"
+    "imhotap": "^2.0.0"
   },
   "dependencies": {
     "module-details-from-path": "^1.0.3"

package/test/other/executable

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
+//
+// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
+
+// This script doesn't actually have to do anything.

package/test/other/import-executable.mjs

@@ -0,0 +1,11 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
+//
+// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
+
+import { rejects } from 'assert'
+(async () => {
+  await rejects(() => import('./executable'), {
+    name: 'TypeError',
+    code: 'ERR_UNKNOWN_FILE_EXTENSION'
+  })
+})()

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))