import-in-the-middle 1.3.0 → 1.3.3

package/hook.mjs

@@ -3,12 +3,15 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
 const specifiers = new Map()
+const isWin = process.platform === "win32"
+
 
 // FIXME: Typescript extensions are added temporarily until we find a better
 // way of supporting arbitrary extensions
 const EXTENSION_RE = /\.(js|mjs|cjs|ts|mts|cts)$/
-
-const NODE_MAJOR = Number(process.versions.node.split('.')[0])
+const NODE_VERSION = process.versions.node.split('.')
+const NODE_MAJOR = Number(NODE_VERSION[0])
+const NODE_MINOR = Number(NODE_VERSION[1])
 
 let entrypoint
 
@@ -42,17 +45,42 @@ function deleteIitm (url) {
   return resultUrl
 }
 
+function isNode16AndBiggerOrEqualsThan16_17_0() {
+  return NODE_MAJOR === 16 && NODE_MINOR >= 17
+}
+
+function isFileProtocol (urlObj) {
+  return urlObj.protocol === 'file:'
+}
+
+function isNodeProtocol (urlObj) {
+  return urlObj.protocol === 'node:'
+}
+
+function needsToAddFileProtocol(urlObj) {
+  if (NODE_MAJOR === 17) {
+    return !isFileProtocol(urlObj)
+  }
+  if (isNode16AndBiggerOrEqualsThan16_17_0()) {
+    return !isFileProtocol(urlObj) && !isNodeProtocol(urlObj)
+  }
+  return !isFileProtocol(urlObj) && NODE_MAJOR < 18
+}
+
+
 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
+  return needsToAddFileProtocol(urlObj) ? 'file:' + urlObj.href : urlObj.href
 }
 
 export async function resolve (specifier, context, parentResolve) {
   const { parentURL = '' } = context
-
-  const url = await parentResolve(deleteIitm(specifier), context, parentResolve)
-
+  const newSpecifier = deleteIitm(specifier)
+  if (isWin && parentURL.indexOf('file:node') === 0) {
+    context.parentURL = ''
+  }
+  const url = await parentResolve(newSpecifier, context, parentResolve)
   if (parentURL === '' && !EXTENSION_RE.test(url.url)) {
     entrypoint = url.url
     return { url: url.url, format: 'commonjs' }

package/index.js

@@ -51,7 +51,11 @@ function Hook(modules, options, hookFn) {
     if (isBuiltin) {
       name = name.replace(/^node:/, '')
     } else {
-      name = name.replace(/^file:\/\//, '')
+      if (name.startsWith('file://')) {
+        try {
+          name = fileURLToPath(name)
+        } catch (e) {}
+      }
       const details = parse(name)
       if (details) {
         name = details.name

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "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,other}/*",
+    "test": "c8 --check-coverage --lines 88 imhotap --runner test/runtest --files test/{hook,low-level,other}/*",
+    "test-win": "c8 --check-coverage --lines 88 imhotap --runner test\\runtest.bat --files test/{hook,low-level,other}/*",
     "test:ts": "c8 imhotap --runner test/runtest --files test/typescript/*.test.mts",
+    "test-win:ts": "c8 imhotap --runner test\\runtest.bat --files test/typescript/*.test.mts",
     "coverage": "c8 --reporter html imhotap --runner test/runtest --files test/{hook,low-level,other}/* && echo '\nNow open coverage/index.html\n'"
   },
   "repository": {

package/test/hook/static-import-package-internals-enabled.mjs

@@ -7,7 +7,7 @@ import { strictEqual } from 'assert'
 const c8Dir = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', '..', 'node_modules', 'c8')
 
 Hook(['c8'], { internals: true }, (exports, name, baseDir) => {
-  strictEqual(name, 'c8/index.js')
+  strictEqual(name, path.join('c8','index.js'))
   strictEqual(baseDir, c8Dir)
   exports.Report = () => 42
 })

package/test/runtest

@@ -6,6 +6,7 @@
 
 const { spawn } = require('child_process')
 const path = require('path')
+const url = require('url')
 
 process.env.NODE_NO_WARNINGS = 1
 
@@ -20,7 +21,7 @@ if (!filename.includes('disabled')) {
     ? path.join(__dirname, 'typescript', 'iitm-ts-node-loader.mjs')
     : path.join(__dirname, '..', 'hook.mjs')
 
-  args.unshift(`--experimental-loader=${loaderPath}`)
+  args.unshift(`--experimental-loader=${url.pathToFileURL(loaderPath)}`)
 }
 
 spawn('node', args, { stdio: 'inherit' }).on('close', code => {

package/test/runtest.bat

@@ -0,0 +1 @@
+node test/runtest %*