import-in-the-middle 1.2.3 → 1.3.2

package/hook.mjs

@@ -4,7 +4,9 @@
 
 const specifiers = new Map()
 
-const EXTENSION_RE = /\.(js|mjs|cjs)$/
+// 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])
 
@@ -43,12 +45,16 @@ function deleteIitm (url) {
 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
+  if (NODE_MAJOR === 17) {
+    return urlObj.protocol !== 'file:' ? 'file:' + urlObj.href :  urlObj.href
+  }
+  return urlObj.protocol !== 'file:' && urlObj.protocol !== 'node:' && NODE_MAJOR < 18
+    ? 'file:' + urlObj.href
+    : urlObj.href
 }
 
 export async function resolve (specifier, context, parentResolve) {
   const { parentURL = '' } = context
-
   const url = await parentResolve(deleteIitm(specifier), context, parentResolve)
 
   if (parentURL === '' && !EXTENSION_RE.test(url.url)) {

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,10 +1,13 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.2.3",
+  "version": "1.3.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,other}/*",
+    "test-win": "c8 --check-coverage --lines 90 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": {
@@ -26,8 +29,11 @@
   },
   "homepage": "https://github.com/DataDog/import-in-the-middle#readme",
   "devDependencies": {
+    "@types/node": "^18.0.6",
     "c8": "^7.8.0",
-    "imhotap": "^2.0.0"
+    "imhotap": "^2.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4"
   },
   "dependencies": {
     "module-details-from-path": "^1.0.3"

package/test/fixtures/say-hi.mts

@@ -0,0 +1,3 @@
+export const sayHi = (name: string) => {
+  return `Hi ${name}`
+};

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
 
@@ -15,7 +16,12 @@ const args = [
   ...process.argv.slice(2)
 ]
 if (!filename.includes('disabled')) {
-  args.unshift(`--experimental-loader=${path.join(__dirname, '..', 'hook.mjs')}`)
+  const isTypescript = path.extname(filename).slice(-2) === 'ts'
+  const loaderPath = isTypescript
+    ? path.join(__dirname, 'typescript', 'iitm-ts-node-loader.mjs')
+    : path.join(__dirname, '..', 'hook.mjs')
+
+  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 %*

package/test/typescript/iitm-ts-node-loader.mjs

@@ -0,0 +1,18 @@
+import * as iitm from '../../hook.mjs'
+import * as tsNode from 'ts-node/esm.mjs'
+
+const makeNext = (loader, fnName, parentResolveOrLoad) => {
+  return (specifierOrUrl, context) => {
+    return loader[fnName](specifierOrUrl, context, parentResolveOrLoad)
+  }
+}
+
+export async function resolve(specifier, context, defaultResolve) {
+  const next = makeNext(tsNode, 'resolve', defaultResolve)
+  return iitm.resolve(specifier, context, next)
+}
+
+export async function load(url, context, defaultLoad) {
+  let next = makeNext(tsNode, 'load', defaultLoad)
+  return iitm.load(url, context, next)
+}

package/test/typescript/ts-node.test.mts

@@ -0,0 +1,11 @@
+import assert from 'node:assert/strict'
+import { addHook } from '../../index.js'
+import { sayHi } from '../fixtures/say-hi.mjs'
+
+addHook((url, exported) => {
+  if (url.toLowerCase().endsWith('say-hi.mts')) {
+    exported.sayHi = () => 'Hooked'
+  }
+})
+
+assert.equal(sayHi('test'), 'Hooked')

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+      "target": "esnext",
+      "module": "esnext",
+      "moduleResolution": "node",
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true,
+      "allowSyntheticDefaultImports": true,
+      "noEmit": true
+    },
+    "ts-node": {
+      "esm": true
+    }
+  }