import-in-the-middle 1.12.0 → 1.13.1

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.12.0"
+  ".": "1.13.1"
 }

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.13.1](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.13.0...import-in-the-middle-v1.13.1) (2025-02-28)
+
+
+### Bug Fixes
+
+* handling of circular dependencies ([#181](https://github.com/nodejs/import-in-the-middle/issues/181)) ([b58092e](https://github.com/nodejs/import-in-the-middle/commit/b58092ec9becf4a14f541da4cf5bfb190f2a9a9b))
+* importing JSON files ([#182](https://github.com/nodejs/import-in-the-middle/issues/182)) ([8c52014](https://github.com/nodejs/import-in-the-middle/commit/8c52014658fcf698cc340d032b441d9e7a65be36))
+* warning from use of context.importAssertions ([#179](https://github.com/nodejs/import-in-the-middle/issues/179)) ([8e56cf1](https://github.com/nodejs/import-in-the-middle/commit/8e56cf1e89752e6c8768d648c10c12fb3178e2ae))
+
+## [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)
 
 

package/hook.js

@@ -253,7 +253,12 @@ async function processModule ({ srcUrl, context, parentGetSource, parentResolve,
       }
     } else {
       addSetter(n, `
-      let $${n} = _.${n}
+      let $${n}
+      try {
+        $${n} = _.${n} = namespace.${n}
+      } catch (err) {
+        if (!(err instanceof ReferenceError)) throw err
+      }
       export { $${n} as ${n} }
       set.${n} = (v) => {
         $${n} = v
@@ -362,10 +367,8 @@ function createHook (meta) {
     }
 
     // Node.js v21 renames importAssertions to importAttributes
-    if (
-      (context.importAssertions && context.importAssertions.type === 'json') ||
-      (context.importAttributes && context.importAttributes.type === 'json')
-    ) {
+    const importAttributes = context.importAttributes || context.importAssertions
+    if (importAttributes && importAttributes.type === 'json') {
       return result
     }
 
@@ -404,10 +407,7 @@ import { register } from '${iitmURL}'
 import * as namespace from ${JSON.stringify(realUrl)}
 
 // Mimic a Module object (https://tc39.es/ecma262/#sec-module-namespace-objects).
-const _ = Object.assign(
-  Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }),
-  namespace
-)
+const _ = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } })
 const set = {}
 const get = {}
 

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/lib/get-exports.js

@@ -49,7 +49,7 @@ async function getCjsExports (url, context, parentLoad, source) {
         // Resolve the re-exported module relative to the current module.
         const newUrl = pathToFileURL(require.resolve(re, { paths: [dirname(fileURLToPath(url))] })).href
 
-        if (newUrl.endsWith('.node')) {
+        if (newUrl.endsWith('.node') || newUrl.endsWith('.json')) {
           return
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "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/circular-a.mjs

@@ -0,0 +1,5 @@
+import { bar } from './circular-b.mjs'
+
+export const foo = 1
+
+export { bar }

package/test/fixtures/circular-b.mjs

@@ -0,0 +1,3 @@
+import { foo } from './circular-a.mjs'
+
+export const bar = foo + 1

package/test/fixtures/re-export-cjs-json.js

@@ -0,0 +1 @@
+module.exports = require('./something.json')

package/test/hook/re-export-cjs.mjs

@@ -1,7 +1,8 @@
 import Hook from '../../index.js'
 import foo from '../fixtures/re-export-cjs-built-in.js'
 import foo2 from '../fixtures/re-export-cjs.js'
-import { strictEqual } from 'assert'
+import foo3 from '../fixtures/re-export-cjs-json.js'
+import { deepStrictEqual, strictEqual } from 'assert'
 
 Hook((exports, name) => {
   if (name.endsWith('fixtures/re-export-cjs-built-in.js')) {
@@ -13,7 +14,13 @@ Hook((exports, name) => {
     strictEqual(exports.default, 'bar')
     exports.default = '2'
   }
+
+  if (name.endsWith('fixtures/re-export-cjs-json.js')) {
+    deepStrictEqual(exports.default, { data: 'dog' })
+    exports.default = '3'
+  }
 })
 
 strictEqual(foo, '1')
 strictEqual(foo2, '2')
+strictEqual(foo3, '3')

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-circular.mjs

@@ -0,0 +1,17 @@
+import { register } from 'module'
+import Hook from '../../index.js'
+import { strictEqual } from 'assert'
+
+register('../../hook.mjs', import.meta.url)
+
+let bar
+
+Hook((exports, name) => {
+  if (name.match(/circular-b.mjs/)) {
+    bar = exports.bar
+  }
+})
+
+await import('../fixtures/circular-b.mjs')
+
+strictEqual(bar, 2)