import-in-the-middle 1.11.3 → 1.13.0

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.11.3"
+  ".": "1.13.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.13.0](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.12.0...import-in-the-middle-v1.13.0) (2025-02-06)
+
+
+### Features
+
+* Support import attributes  ([#176](https://github.com/nodejs/import-in-the-middle/issues/176)) ([916af26](https://github.com/nodejs/import-in-the-middle/commit/916af2627e0e8cb6d50a3b54c1a280dc16e20925))
+
+## [1.12.0](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.11.3...import-in-the-middle-v1.12.0) (2024-12-13)
+
+
+### Features
+
+* Support absolute paths for `include` ([#168](https://github.com/nodejs/import-in-the-middle/issues/168)) ([d0d9bc3](https://github.com/nodejs/import-in-the-middle/commit/d0d9bc3d1e0bcef1094af58c15cf997507777067))
+* Warn on multiple hook initialization ([#165](https://github.com/nodejs/import-in-the-middle/issues/165)) ([9bd539e](https://github.com/nodejs/import-in-the-middle/commit/9bd539ea6ff1684c8807bc30c8b68882cc9e057f))
+
 ## [1.11.3](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.11.2...import-in-the-middle-v1.11.3) (2024-12-04)
 
 

package/hook.js

@@ -2,7 +2,7 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-const { URL } = require('url')
+const { URL, fileURLToPath } = require('url')
 const { inspect } = require('util')
 const { builtinModules } = require('module')
 const specifiers = new Map()
@@ -279,6 +279,12 @@ function createHook (meta) {
   let includeModules, excludeModules
 
   async function initialize (data) {
+    if (global.__import_in_the_middle_initialized__) {
+      process.emitWarning("The 'import-in-the-middle' hook has already been initialized")
+    }
+
+    global.__import_in_the_middle_initialized__ = true
+
     if (data) {
       includeModules = ensureArrayWithBareSpecifiersFileUrlsAndRegex(data.include, 'include')
       excludeModules = ensureArrayWithBareSpecifiersFileUrlsAndRegex(data.exclude, 'exclude')
@@ -335,7 +341,7 @@ function createHook (meta) {
         return each.test(result.url)
       }
 
-      return each === specifier || each === result.url
+      return each === specifier || each === result.url || (result.url.startsWith('file:') && each === fileURLToPath(result.url))
     }
 
     if (includeModules && !includeModules.some(match)) {

package/lib/get-esm-exports.js

@@ -1,14 +1,14 @@
 'use strict'
 
 const { Parser } = require('acorn')
-const { importAssertions } = require('acorn-import-attributes')
+const { importAttributesOrAssertions } = require('acorn-import-attributes')
 
 const acornOpts = {
   ecmaVersion: 'latest',
   sourceType: 'module'
 }
 
-const parser = Parser.extend(importAssertions)
+const parser = Parser.extend(importAttributesOrAssertions)
 
 function warn (txt) {
   process.emitWarning(txt, 'get-esm-exports')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.11.3",
+  "version": "1.13.0",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {
@@ -56,7 +56,7 @@
     "vue": "^3.4.31"
   },
   "dependencies": {
-    "acorn": "^8.8.2",
+    "acorn": "^8.14.0",
     "acorn-import-attributes": "^1.9.5",
     "cjs-module-lexer": "^1.2.2",
     "module-details-from-path": "^1.0.3"

package/test/fixtures/import-absolute-after.mjs

@@ -0,0 +1,10 @@
+import { strictEqual } from 'assert'
+import * as foo from './foo.mjs'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
+const fooPath = join(dirname(fileURLToPath(import.meta.url)), 'foo.mjs')
+
+strictEqual(typeof foo.foo, 'function')
+strictEqual(global.hooked.length, 1)
+strictEqual(global.hooked[0], fooPath)

package/test/fixtures/import-absolute.mjs

@@ -0,0 +1,18 @@
+import { register } from 'module'
+import { Hook, createAddHookMessageChannel } from '../../index.js'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
+const fooPath = join(dirname(fileURLToPath(import.meta.url)), 'foo.mjs')
+
+const { registerOptions, waitForAllMessagesAcknowledged } = createAddHookMessageChannel()
+
+register('../../hook.mjs', import.meta.url, registerOptions)
+
+global.hooked = []
+
+Hook([fooPath], (_, name) => {
+  global.hooked.push(name)
+})
+
+await waitForAllMessagesAcknowledged()

package/test/fixtures/native-modules/aix-ppc64.js

@@ -0,0 +1,2 @@
+console.log(`skipping ${process.env.IITM_TEST_FILE} as no native module is available for ${process.platform}-${process.arch}`)
+process.exit(0)

package/test/fixtures/native-modules/linux-ppc64.js

@@ -0,0 +1,2 @@
+console.log(`skipping ${process.env.IITM_TEST_FILE} as no native module is available for ${process.platform}-${process.arch}`)
+process.exit(0)

package/test/fixtures/native-modules/linux-s390x.js

@@ -0,0 +1,2 @@
+console.log(`skipping ${process.env.IITM_TEST_FILE} as no native module is available for ${process.platform}-${process.arch}`)
+process.exit(0)

package/test/hook/v20.10-static-import-attributes.mjs

@@ -2,16 +2,14 @@
 //
 // 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-attributes.mjs'
 import { strictEqual } from 'assert'
 
-// Acorn does not support import attributes so an error is logged but the import
-// still works!
-//
-// Hook((exports, name) => {
-//   if (name.match(/json\.mjs/)) {
-//     exports.default.data += '-dawg'
-//   }
-// })
+Hook((exports, name) => {
+  if (name.match(/json-attributes\.mjs/)) {
+    exports.default.data += '-dawg'
+  }
+})
 
-strictEqual(jsonMjs.data, 'dog')
+strictEqual(jsonMjs.data, 'dog-dawg')

package/test/register/v18.19-include-message-port-absolute-path.mjs

@@ -0,0 +1,14 @@
+import { spawnSync } from 'child_process'
+
+const out = spawnSync(process.execPath,
+  ['--import', './test/fixtures/import-absolute.mjs', './test/fixtures/import-absolute-after.mjs'],
+  { stdio: 'inherit', env: {} }
+)
+
+if (out.error) {
+  console.error(out.error)
+}
+if (out.status !== 0) {
+  console.error(`Expected exit code 0, got ${out.status}`)
+}
+process.exit(out.status)