import-in-the-middle 1.3.2 → 1.3.4

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,21 +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')
-  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
+  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' }
@@ -66,6 +90,11 @@ export async function resolve (specifier, context, parentResolve) {
     return url
   }
 
+  if (context.importAssertions && context.importAssertions.type === 'json') {
+    return url
+  }
+
+
   specifiers.set(url.url, specifier)
 
   return {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "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": "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'"

package/test/fixtures/json.mjs

@@ -0,0 +1,9 @@
+// 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 coolFile from './something.json' assert { type: 'json' };
+
+export default {
+  data: coolFile.data
+};

package/test/fixtures/something.json

@@ -0,0 +1,3 @@
+{
+  "data": "dog"
+}

package/test/hook/v18-static-import-assert.mjs

@@ -0,0 +1,15 @@
+// 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 Hook from '../../index.js'
+import jsonMjs from '../fixtures/json.mjs'
+import { strictEqual } from 'assert'
+
+Hook((exports, name) => {
+  if (name.match(/json\.mjs/)) {
+    exports.default.data += '-dawg'
+  }
+})
+
+strictEqual(jsonMjs.data, 'dog-dawg')

package/test/runtest

@@ -15,6 +15,18 @@ const args = [
   '--unhandled-rejections=strict',
   ...process.argv.slice(2)
 ]
+
+const [processMajor] = process.versions.node.split('.').map(Number)
+
+const match = filename.match(/v([0-9]+)/)
+
+const versionRequirement = match ? match[1] : 0;
+
+if (processMajor < versionRequirement) {
+  console.log(`skipping ${filename} as this is Node.js v${processMajor} and test wants v${versionRequirement}`);
+  process.exit(0);
+}
+
 if (!filename.includes('disabled')) {
   const isTypescript = path.extname(filename).slice(-2) === 'ts'
   const loaderPath = isTypescript