import-in-the-middle 1.0.1 → 1.2.0

package/LICENSE-3rdparty.csv

@@ -1,3 +1,4 @@
 Component,Origin,License,Copyright
+require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
 dev,c8,ISC,"Copyright (c) 2017, Contributors"
 dev,imhotap,MIT,Copyright (c) 2019 Bryan English.

package/README.md

@@ -7,23 +7,25 @@ time.
 
 ## Usage
 
-See the Typescript definition file for API docs.
+The API for
+`require-in-the-middle` is followed as closely as possible as the default
+export. There are lower-level `addHook` and `removeHook` exports available which
+don't do any filtering of modules, and present the full file URL as a parameter
+to the hook. See the Typescript definition file for detailed API docs.
 
 You can modify anything exported from any given ESM or CJS module that's
 imported in ESM files, regardless of whether they're imported statically or
 dynamically.
 
 ```js
-import { addHook } from 'import-in-the-middle'
-import { foo } from './module-i-want-to-modify.mjs'
+import Hook from 'import-in-the-middle'
+import { foo } from 'package-i-want-to-modify'
 
 console.log(foo) // whatever that module exported
 
-addHook((url, exported) => {
+Hook(['package-i-want-to-modify'], (exported, name, baseDir) => {
   // `exported` is effectively `import * as exported from ${url}`
-  if (url.match(/module-i-want-to-modify.mjs$/)) {
-    exported.foo += 1
-  }
+  exported.foo += 1
 })
 
 console.log(foo) // 1 more than whatever that module exported
@@ -33,7 +35,7 @@ This requires the use of an ESM loader hook, which can be added with the followi
 command-line option.
 
 ```
---loader=/path/to/import-in-the-middle/hook.mjs
+--loader=import-in-the-middle/hook.mjs
 ```
 
 ## Limitations

package/fuck.mjs

@@ -0,0 +1,12 @@
+import vm from 'vm'
+
+const context = vm.createContext()
+console.log(vm)
+const mod = new vm.SourceTextModule(`
+export const bar = 5
+`, { context })
+await mod.link(async () => {
+  return new vm.SyntheticModule([], function () {
+  }, { context })
+})
+console.log(Reflect.ownKeys(mod.namespace))

package/hook.mjs

@@ -2,6 +2,12 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
+const specifiers = new Map()
+
+const EXTENSION_RE = /\.(js|mjs|cjs)$/
+
+let entrypoint
+
 export async function resolve (specifier, context, parentResolve) {
   const { parentURL = '' } = context
 
@@ -10,11 +16,17 @@ export async function resolve (specifier, context, parentResolve) {
   }
   const url = await parentResolve(specifier, context, parentResolve)
 
-  if (parentURL === import.meta.url ||
-      parentURL.startsWith('iitm:')) {
+  if (parentURL === '' && !EXTENSION_RE.test(url.url)) {
+    entrypoint = url.url
+    return { url: url.url, format: 'commonjs' }
+  }
+
+  if (parentURL === import.meta.url || parentURL.startsWith('iitm:')) {
     return url
   }
 
+  specifiers.set(url.url, specifier)
+
   return {
     url: `iitm:${url.url}`
   }
@@ -26,22 +38,27 @@ export function getFormat (url, context, parentGetFormat) {
       format: 'module'
     }
   }
+  if (url === entrypoint) {
+    return {
+      format: 'commonjs'
+    }
+  }
 
   return parentGetFormat(url, context, parentGetFormat)
 }
 
-const iitmURL = new URL('index.js', import.meta.url).toString()
+const iitmURL = new URL('lib/register.js', import.meta.url).toString()
 export async function getSource (url, context, parentGetSource) {
   if (url.startsWith('iitm:')) {
-    const realName = url.replace('iitm:', '')
-    const real = await import(realName)
-    const names = Object.keys(real)
+    const realUrl = url.replace('iitm:', '')
+    const realModule = await import(realUrl)
+    const exportNames = Object.keys(realModule)
     return {
       source: `
-import { _register } from '${iitmURL}'
+import { register } from '${iitmURL}'
 import * as namespace from '${url}'
 const set = {}
-${names.map((n) => `
+${exportNames.map((n) => `
 let $${n} = namespace.${n}
 export { $${n} as ${n} }
 set.${n} = (v) => {
@@ -49,10 +66,24 @@ set.${n} = (v) => {
   return true
 }
 `).join('\n')}
-_register('${realName}', namespace, set)
+register('${realUrl}', namespace, set, '${specifiers.get(realUrl)}')
 `
     }
   }
 
   return parentGetSource(url, context, parentGetSource)
 }
+
+// For Node.js 16.12.0 and higher.
+export async function load (url, context, parentLoad) {
+  if (url.startsWith('iitm:')) {
+    const { source } = await getSource(url, context)
+    return {
+      source,
+      format: 'module'
+    }
+  }
+
+  return parentLoad(url, context, parentLoad)
+}
+

package/index.d.ts

@@ -2,24 +2,85 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
+/**
+ * Property bag representing a module's exports, including the `default` if
+ * present.
+ */
+export type Namespace = { [key: string]: any }
+
 /**
  * A hook function to be run against loaded modules.
+ * Not to be confused with `HookFunction`, used by the lower-level API.
+ * @param {exported} { [string]: any } An object representing the exported
+ * items of a module.
+ * @param {name} string The name of the module. If it is (or is part of) a
+ * package in a node_modules directory, this will be the path of the file
+ * starting from the package name.
+ * @param {baseDir} string The absolute path of the module, if not provided in
+ * `name`.
+ * @return any A value that can will be assigned to `exports.default`. This is
+ * equivalent to doing that assignment in the body of this function.
+ */
+export type HookFn = (exported: Namespace, name: string, baseDir: string|void) => any
+
+export type Options = {
+  internals?: boolean
+}
+
+declare class Hook {
+  /**
+   * Creates a hook to be run on any already loaded modules and any that will
+   * be loaded in the future. It will be run once per loaded module. If
+   * statically imported, any variables bound directly to exported items will
+   * be re-bound if those items are re-assigned in the hook function.
+   * @param {Array<string>} [modules] A list of modules to run this hook on. If
+   * omitted, it will run on every import everywhere.
+   * @param {Options} [options] An options object. If omitted, the default is
+   * `{ internals: false }`. If internals is true, then the hook will operate
+   * on internal modules of packages in node_modules. Otherwise it will not,
+   * unless they are mentioned specifically in the modules array.
+   * @param {HookFunction} hookFn The function to be run on each module.
+   */
+  constructor (modules: Array<string>, options: Options, hookFn: HookFn)
+  constructor (modules: Array<string>, hookFn: HookFn)
+  constructor (hookFn: HookFn)
+
+  /**
+   * Disables this hook. It will no longer be run against any subsequently
+   * loaded modules.
+   */
+  unhook(): void
+}
+
+export default Hook
+
+/**
+ * A hook function to be run against loaded modules. To be used with the
+ * lower-level APIs `addHook` and `removeHook`.
  * @param {url} string The absolute path of the module, as a `file:` URL string.
- * @param {exported} { [string]: any } An object representing the exported items of a module.
+ * @param {exported} { [string]: any } An object representing the exported
+ * items of a module.
  */
-export type HookFunction = (url: string, exported: { [string]: any }) => void
+export type HookFunction = (url: string, exported: Namespace) => void
 
 /**
- * Adds a hook to be run on any already loaded modules and any that will be loaded in the future.
- * It will be run once per loaded module. If statically imported, any variables bound directly to
- * exported items will be re-bound if those items are re-assigned in the hook.
+ * Adds a hook to be run on any already loaded modules and any that will be
+ * loaded in the future.  It will be run once per loaded module. If statically
+ * imported, any variables bound directly to exported items will be re-bound if
+ * those items are re-assigned in the hook.
+ *
+ * This is the lower-level API for hook creation. It will be run on every
+ * single imported module, rather than with any filtering.
  * @param {HookFunction} hookFn The function to be run on each module.
  */
 export declare function addHook(hookFn: HookFunction): void
 
 /**
- * Removes a hook that has been previously added with `addHook`. It will no longer be run against
- * any subsequently loaded modules.
+ * Removes a hook that has been previously added with `addHook`. It will no
+ * longer be run against any subsequently loaded modules.
+ *
+ * This is the lower-level API for hook removal, and cannot be used with the
+ * `Hook` class.
  * @param {HookFunction} hookFn The function to be removed.
  */
 export declare function removeHook(hookFn: HookFunction): void

package/index.js

@@ -2,33 +2,88 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-const importHooks = [] // TODO should this be a Set?
+const path = require('path')
+const parse = require('module-details-from-path')
+const { fileURLToPath } = require('url')
 
-const setters = new WeakMap()
+const {
+  importHooks,
+  specifiers,
+  toHook
+} = require('./lib/register')
 
-const toHook = []
-
-const proxyHandler = {
-  set(target, name, value) {
-    return setters.get(target)[name](value)
-  }
-}
-
-exports._register =  function _register(name, namespace, set) {
-  setters.set(namespace, set)
-  const proxy = new Proxy(namespace, proxyHandler)
-  importHooks.forEach(hook => hook(name, proxy))
-  toHook.push([name, proxy])
-}
-
-exports.addHook = function addHook(hook) {
+function addHook(hook) {
   importHooks.push(hook)
   toHook.forEach(([name, namespace]) => hook(name, namespace))
 }
 
-exports.removeHook = function removeHook(hook) {
+function removeHook(hook) {
   const index = importHooks.indexOf(hook)
   if (index > -1) {
     importHooks.splice(index, 1)
   }
 }
+
+function callHookFn(hookFn, namespace, name, baseDir) {
+  const newDefault = hookFn(namespace, name, baseDir)
+  if (newDefault && newDefault !== namespace) {
+    namespace.default = newDefault
+  }
+}
+
+function Hook(modules, options, hookFn) {
+  if ((this instanceof Hook) === false) return new Hook(modules, options, hookFn)
+  if (typeof modules === 'function') {
+    hookFn = modules
+    modules = null
+    options = null
+  } else if (typeof options === 'function') {
+    hookFn = options
+    options = null
+  }
+  const internals = options ? options.internals === true : false
+
+  this._iitmHook = (name, namespace) => {
+    const filename = name
+    const isBuiltin = name.startsWith('node:')
+    let baseDir
+
+    if (isBuiltin) {
+      name = name.replace(/^node:/, '')
+    } else {
+      name = name.replace(/^file:\/\//, '')
+      const details = parse(name)
+      if (details) {
+        name = details.name
+        baseDir = details.basedir
+      }
+    }
+
+    if (modules) {
+      for (const moduleName of modules) {
+        if (moduleName === name) {
+          if (baseDir) {
+            if (internals) {
+              name = name + path.sep + path.relative(baseDir, fileURLToPath(filename))
+            } else {
+              if (!baseDir.endsWith(specifiers.get(filename))) continue
+            }
+          }
+          callHookFn(hookFn, namespace, name, baseDir)
+        }
+      }
+    } else {
+      callHookFn(hookFn, namespace, name, baseDir)
+    }
+  }
+
+  addHook(this._iitmHook)
+}
+
+Hook.prototype.unhook = function () {
+  removeHook(this._iitmHook)
+}
+
+module.exports = Hook
+module.exports.addHook = addHook
+module.exports.removeHook = removeHook

package/lib/register.js

@@ -0,0 +1,36 @@
+// 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.
+
+
+const importHooks = [] // TODO should this be a Set?
+const setters = new WeakMap()
+const specifiers = new Map()
+const toHook = []
+
+const proxyHandler = {
+  set(target, name, value) {
+    return setters.get(target)[name](value)
+  },
+
+  defineProperty(target, property, descriptor) {
+    if ((!('value' in descriptor))) {
+      throw new Error('Getters/setters are not supported for exports property descriptors.')
+    }
+
+    return setters.get(target)[property](descriptor.value)
+  }
+}
+
+function register(name, namespace, set, specifier) {
+  specifiers.set(name, specifier)
+  setters.set(namespace, set)
+  const proxy = new Proxy(namespace, proxyHandler)
+  importHooks.forEach(hook => hook(name, proxy))
+  toHook.push([name, proxy])
+}
+
+exports.register = register
+exports.importHooks = importHooks
+exports.specifiers = specifiers
+exports.toHook = toHook

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {
-    "test": "c8 --check-coverage --lines 100 imhotap --runner test/runtest --files test/*.*js"
+    "test": "c8 --check-coverage --lines 90 imhotap --runner test/runtest --files test/{hook,low-level,other}/*",
+    "coverage": "c8 --reporter html imhotap --runner test/runtest --files test/{hook,low-level,other}/* && echo '\nNow open coverage/index.html\n'"
   },
   "repository": {
     "type": "git",
@@ -26,6 +27,9 @@
   "homepage": "https://github.com/DataDog/import-in-the-middle#readme",
   "devDependencies": {
     "c8": "^7.8.0",
-    "imhotap": "^1.1.0"
+    "imhotap": "^2.0.0"
+  },
+  "dependencies": {
+    "module-details-from-path": "^1.0.3"
   }
 }

package/test/README.md

@@ -0,0 +1,13 @@
+These tests are organized as follows:
+
+* Located in the `hook` directory if they use the `Hook` class.
+* Located in the `low-level` directory if they use the "low-level" API,
+  `addHook` and `removeHook`.
+
+The tests should be run with the `runtest` command found in this directory. If
+the command exits with a non-zero code, then it's a test failure.
+
+Running of all the tests can be done with `npm test`.
+
+Coverage must be 100% according to `c8`. If you don't have 100% coverage, you
+can run `npm run coverage` to get coverage data in HTML form.

package/test/hook/define-property.js

@@ -0,0 +1,20 @@
+// 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.
+
+const Hook = require('../../index.js')
+const { rejects } = require('assert')
+
+Hook((exports, name) => {
+  if (name === 'os') {
+    Object.defineProperty(exports, 'freemem', {
+      get: () => () => 47
+    })
+  }
+})
+
+;(async () => {
+  rejects(async () => {
+    await import('os')
+  })
+})()

package/test/hook/dynamic-import-default.js

@@ -0,0 +1,29 @@
+// 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.
+
+const Hook = require('../../index.js')
+const { strictEqual } = require('assert')
+
+Hook((exports, name) => {
+  if (name.match(/something.js/)) {
+    const orig = exports.default
+    exports.default = function bar() {
+      return orig() + 15
+    }
+  }
+  if (name.match(/something.mjs/)) {
+    const orig = exports.default
+    return function bar() {
+      return orig() + 15
+    }
+  }
+})
+
+;(async () => {
+  const { default: barMjs } = await import('../fixtures/something.mjs')
+  const { default: barJs } = await import('../fixtures/something.js')
+
+  strictEqual(barMjs(), 57)
+  strictEqual(barJs(), 57)
+})()

package/test/hook/dynamic-import-default.mjs

@@ -0,0 +1,23 @@
+// 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 { strictEqual } from 'assert'
+
+Hook((exports, name) => {
+  if (name.match(/something\.m?js/)) {
+    const orig = exports.default
+    exports.default = function bar() {
+      return orig() + 15
+    }
+  }
+})
+
+;(async () => {
+  const { default: barMjs } = await import('../fixtures/something.mjs')
+  const { default: barJs } = await import('../fixtures/something.js')
+
+  strictEqual(barMjs(), 57)
+  strictEqual(barJs(), 57)
+})()

package/test/hook/dynamic-import.js

@@ -0,0 +1,27 @@
+// 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.
+
+const Hook = require('../../index.js')
+const { strictEqual } = require('assert')
+
+Hook((exports, name) => {
+  if (name.match(/something\.m?js/)) {
+    exports.foo += 15
+  }
+  if (name === 'os') {
+    Object.defineProperty(exports, 'freemem', {
+      value: () => 47
+    })
+  }
+})
+
+;(async () => {
+  const { foo: fooMjs } = await import('../fixtures/something.mjs')
+  const { foo: fooJs } = await import('../fixtures/something.js')
+  const { freemem } = await import('os')
+
+  strictEqual(fooMjs, 57)
+  strictEqual(fooJs, 57)
+  strictEqual(freemem(), 47)
+})()

package/test/{dynamic-import.mjs → hook/dynamic-import.mjs}

@@ -2,21 +2,23 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook } from '../index.js'
+import Hook from '../../index.js'
 import { strictEqual } from 'assert'
 
-addHook((name, exports) => {
+Hook((exports, name) => {
   if (name.match(/something\.m?js/)) {
     exports.foo += 15
   }
-  if (name.match('os')) {
-    exports.freemem = () => 47
+  if (name === 'os') {
+    Object.defineProperty(exports, 'freemem', {
+      value: () => 47
+    })
   }
 })
 
 ;(async () => {
-  const { foo: fooMjs } = await import('./fixtures/something.mjs')
-  const { foo: fooJs } = await import('./fixtures/something.js')
+  const { foo: fooMjs } = await import('../fixtures/something.mjs')
+  const { foo: fooJs } = await import('../fixtures/something.js')
   const { freemem } = await import('os')
 
   strictEqual(fooMjs, 57)

package/test/hook/remove.mjs

@@ -0,0 +1,23 @@
+// 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 { strictEqual } from 'assert'
+
+const hook = new Hook((exports, name) => {
+  if (name.match(/something\.m?js/)) {
+    exports.foo += 15
+  }
+})
+
+;(async () => {
+  const { foo: fooMjs } = await import('../fixtures/something.mjs')
+
+  hook.unhook()
+
+  const { foo: fooJs } = await import('../fixtures/something.js')
+
+  strictEqual(fooMjs, 57)
+  strictEqual(fooJs, 42)
+})()

package/test/hook/static-import-default.mjs

@@ -0,0 +1,26 @@
+// 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 barMjs from '../fixtures/something.mjs'
+import barJs from '../fixtures/something.js'
+import { strictEqual } from 'assert'
+
+Hook((exports, name) => {
+  if (name.match(/something.mjs/)) {
+    const orig = exports.default
+    exports.default = function bar() {
+      return orig() + 15
+    }
+  }
+  if (name.match(/something.js/)) {
+    const orig = exports.default
+    return function bar() {
+      return orig() + 15
+    }
+  }
+})
+
+strictEqual(barMjs(), 57)
+strictEqual(barJs(), 57)

package/test/hook/static-import-disabled.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 { foo as fooMjs } from '../fixtures/something.mjs'
+import { foo as fooJs } from '../fixtures/something.js'
+import { strictEqual, fail } from 'assert'
+
+Hook(() => {
+  fail('should not have been called at all')
+})
+
+strictEqual(fooMjs, 42)
+strictEqual(fooJs, 42)

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

@@ -0,0 +1,15 @@
+import Hook from '../../index.js'
+import { Report } from 'c8/index.js'
+import path from 'path'
+import { fileURLToPath } from 'url'
+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(baseDir, c8Dir)
+  exports.Report = () => 42
+})
+
+strictEqual(Report({}), 42)

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

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

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

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

package/test/hook/static-import.mjs

@@ -0,0 +1,24 @@
+// 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 { foo as fooMjs } from '../fixtures/something.mjs'
+import { foo as fooJs } from '../fixtures/something.js'
+import { freemem } from 'os'
+import { strictEqual } from 'assert'
+
+Hook((exports, name) => {
+  if (name.match(/something\.m?js/)) {
+    exports.foo += 15
+  }
+  if (name === 'os') {
+    Object.defineProperty(exports, 'freemem', {
+      value: () => 47
+    })
+  }
+})
+
+strictEqual(fooMjs, 57)
+strictEqual(fooJs, 57)
+strictEqual(freemem(), 47)

package/test/{dynamic-import-default.js → low-level/dynamic-import-default.js}

@@ -2,7 +2,7 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-const { addHook } = require('../index.js')
+const { addHook } = require('../../index.js')
 const { strictEqual } = require('assert')
 
 addHook((name, exports) => {
@@ -15,8 +15,8 @@ addHook((name, exports) => {
 })
 
 ;(async () => {
-  const { default: barMjs } = await import('./fixtures/something.mjs')
-  const { default: barJs } = await import('./fixtures/something.js')
+  const { default: barMjs } = await import('../fixtures/something.mjs')
+  const { default: barJs } = await import('../fixtures/something.js')
 
   strictEqual(barMjs(), 57)
   strictEqual(barJs(), 57)

package/test/{dynamic-import-default.mjs → low-level/dynamic-import-default.mjs}

@@ -2,7 +2,7 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook } from '../index.js'
+import { addHook } from '../../index.js'
 import { strictEqual } from 'assert'
 
 addHook((name, exports) => {
@@ -15,8 +15,8 @@ addHook((name, exports) => {
 })
 
 ;(async () => {
-  const { default: barMjs } = await import('./fixtures/something.mjs')
-  const { default: barJs } = await import('./fixtures/something.js')
+  const { default: barMjs } = await import('../fixtures/something.mjs')
+  const { default: barJs } = await import('../fixtures/something.js')
 
   strictEqual(barMjs(), 57)
   strictEqual(barJs(), 57)

package/test/{dynamic-import.js → low-level/dynamic-import.js}

@@ -2,21 +2,23 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-const { addHook } = require('../index.js')
+const { addHook } = require('../../index.js')
 const { strictEqual } = require('assert')
 
 addHook((name, exports) => {
   if (name.match(/something\.m?js/)) {
     exports.foo += 15
   }
-  if (name.match('os')) {
-    exports.freemem = () => 47
+  if (name === 'node:os') {
+    Object.defineProperty(exports, 'freemem', {
+      value: () => 47
+    })
   }
 })
 
 ;(async () => {
-  const { foo: fooMjs } = await import('./fixtures/something.mjs')
-  const { foo: fooJs } = await import('./fixtures/something.js')
+  const { foo: fooMjs } = await import('../fixtures/something.mjs')
+  const { foo: fooJs } = await import('../fixtures/something.js')
   const { freemem } = await import('os')
 
   strictEqual(fooMjs, 57)

package/test/{remove.mjs → low-level/remove.mjs}

@@ -2,8 +2,8 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook, removeHook } from '../index.js'
-import { strictEqual, ok } from 'assert'
+import { addHook, removeHook } from '../../index.js'
+import { strictEqual } from 'assert'
 
 const hook = (name, exports) => {
   if (name.match(/something\.m?js/)) {
@@ -14,11 +14,11 @@ const hook = (name, exports) => {
 addHook(hook)
 
 ;(async () => {
-  const { foo: fooMjs } = await import('./fixtures/something.mjs')
+  const { foo: fooMjs } = await import('../fixtures/something.mjs')
 
   removeHook(hook)
 
-  const { foo: fooJs } = await import('./fixtures/something.js')
+  const { foo: fooJs } = await import('../fixtures/something.js')
 
   strictEqual(fooMjs, 57)
   strictEqual(fooJs, 42)

package/test/{static-import-default.mjs → low-level/static-import-default.mjs}

@@ -2,9 +2,9 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook } from '../index.js'
-import barMjs from './fixtures/something.mjs'
-import barJs from './fixtures/something.js'
+import { addHook } from '../../index.js'
+import barMjs from '../fixtures/something.mjs'
+import barJs from '../fixtures/something.js'
 import { strictEqual } from 'assert'
 
 addHook((name, exports) => {

package/test/{static-import-disabled.mjs → low-level/static-import-disabled.mjs}

@@ -2,9 +2,9 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook } from '../index.js'
-import { foo as fooMjs } from './fixtures/something.mjs'
-import { foo as fooJs } from './fixtures/something.js'
+import { addHook } from '../../index.js'
+import { foo as fooMjs } from '../fixtures/something.mjs'
+import { foo as fooJs } from '../fixtures/something.js'
 import { strictEqual, fail } from 'assert'
 
 addHook(() => {

package/test/{static-import.mjs → low-level/static-import.mjs}

@@ -2,9 +2,9 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 
-import { addHook } from '../index.js'
-import { foo as fooMjs } from './fixtures/something.mjs'
-import { foo as fooJs } from './fixtures/something.js'
+import { addHook } from '../../index.js'
+import { foo as fooMjs } from '../fixtures/something.mjs'
+import { foo as fooJs } from '../fixtures/something.js'
 import { freemem } from 'os'
 import { strictEqual } from 'assert'
 
@@ -12,8 +12,10 @@ addHook((name, exports) => {
   if (name.match(/something\.m?js/)) {
     exports.foo += 15
   }
-  if (name.match('os')) {
-    exports.freemem = () => 47
+  if (name === 'node:os') {
+    Object.defineProperty(exports, 'freemem', {
+      value: () => 47
+    })
   }
 })
 

package/test/other/executable

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+// 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.
+
+// This script doesn't actually have to do anything.

package/test/other/import-executable.mjs

@@ -0,0 +1,11 @@
+// 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 { rejects } from 'assert'
+(async () => {
+  await rejects(() => import('./executable'), {
+    name: 'TypeError',
+    code: 'ERR_UNKNOWN_FILE_EXTENSION'
+  })
+})()