Update types addl options

.eslintrc.json

@@ -71,7 +71,7 @@
     "no-return-assign": 0,
     "no-use-before-define": [2, "nofunc"],
     "no-nested-ternary": 0,
-    "array-bracket-spacing": [2, "always"],
+    "array-bracket-spacing": [2, "never"],
     "prefer-destructuring": 2,
     "class-methods-use-this": 0,
     "no-confusing-arrow": 0

src/esmock.d.ts

@@ -22,6 +22,8 @@ declare namespace esmock {
   interface Options {
     partial?: boolean | undefined;
     purge?: boolean | undefined;
+    isPackageNotFoundError?: boolean | undefined;
+    parent?: string | undefined;
   }
 
   /**

src/esmock.js

@@ -10,21 +10,24 @@ import {
   esmockCache
 } from './esmockCache.js'
 
-const argsToObj = args => {
-  // Distinguish between the two overloads; see esmock.d.ts.
-  let modulePath, parent, mockDefs, globalDefs, opt
-  if (typeof args[1] === "string") {
-    [ modulePath, parent, mockDefs, globalDefs, opt ] = args
-  } else {
-    [ modulePath, mockDefs, globalDefs, opt ] = args
-  }
-  return { modulePath, parent, mockDefs, globalDefs, opt }
+// this function normalizes different "overloaded" args signatures, returning
+// one predictable args list. ex,
+//   [modulepath, mockdefs, globaldefs, opts]
+//     -> [modulepath, mockdefs, globaldefs, opts]
+//   [modulepath, parent, mockdefs, globaldefs, opts]
+//     -> [modulepath, mockdefs, globaldefs, { ...opts, parent }]
+const argsnormal = (args, argsextra, parent) => {
+  parent = typeof args[1] === 'string' && args[1]
+  args = parent ? [args[0], ...args.slice(2)] : args
+  args[3] = { parent, ...args[3], ...(argsextra && argsextra[0]) }
+  args[4] = (argsextra && argsextra[1]) || args[4]
+
+  return args
 }
 
-const _esmock = async (argsObj, err) => {
-  const { modulePath, parent, mockDefs, globalDefs, opt = {} } = argsObj
-
-  const calleePath = (parent || err.stack.split('\n')[2])
+const esmock = async (...args) => {
+  const [modulePath, mockDefs, globalDefs, opt = {}, err] = argsnormal(args)
+  const calleePath = (opt.parent || (err || new Error).stack.split('\n')[2])
     .replace(/^.*file:\/\//, '') // rm every before filepath
     .replace(/:[\d]*:[\d]*.*$/, '') // rm line and row number
     .replace(/^.*:/, '') // rm windows-style drive location
@@ -44,19 +47,11 @@ const _esmock = async (argsObj, err) => {
   return esmockModuleImportedSanitize(importedModule, modulePathKey)
 }
 
-const esmock = async (...args) => _esmock(argsToObj(args), new Error)
-
-esmock.px = async (...args) => {
-  const argsObj = argsToObj(args)
-  argsObj.opt = { ...argsObj.opt, partial: true }
-  return _esmock(argsObj, new Error)
-}
+esmock.px = async (...args) => (
+  esmock(...argsnormal(args, [{ partial: true }, new Error])))
 
-esmock.p = async (...args) => {
-  const argsObj = argsToObj(args)
-  argsObj.opt = { ...argsObj.opt, purge: false }
-  return _esmock(argsObj, new Error)
-}
+esmock.p = async (...args) => (
+  esmock(...argsnormal(args, [{ purge: false }, new Error])))
 
 esmock.purge = mockModule => {
   if (mockModule && /object|function/.test(typeof mockModule)

src/esmockLoader.js

@@ -4,7 +4,7 @@ import urlDummy from './esmockDummy.js'
 
 export default esmock
 
-const [ major, minor ] = process.versions.node.split('.').map(it => +it)
+const [major, minor] = process.versions.node.split('.').map(it => +it)
 const isLT1612 = major < 16 || (major === 16 && minor < 12)
 
 const esmockGlobalsAndAfterRe = /\?esmockGlobals=.*/
@@ -33,7 +33,7 @@ const nextResolveCall = async (nextResolve, specifier, context) => (
 
 const resolve = async (specifier, context, nextResolve) => {
   const { parentURL } = context
-  const [ esmockKeyParamSmall ] =
+  const [esmockKeyParamSmall] =
     (parentURL && parentURL.match(/\?esmk=\d*/)) || []
   const esmockKeyLong = esmockKeyParamSmall
     ? global.esmockKeyGet(esmockKeyParamSmall.split('=')[1])
@@ -42,8 +42,8 @@ const resolve = async (specifier, context, nextResolve) => {
   if (!esmockKeyRe.test(esmockKeyLong))
     return nextResolveCall(nextResolve, specifier, context)
 
-  const [ esmockKeyParam ] = String(esmockKeyLong).match(esmockKeyRe)
-  const [ keyUrl, keys ] = esmockKeyLong.split(esmockModuleKeysRe)
+  const [esmockKeyParam] = String(esmockKeyLong).match(esmockKeyRe)
+  const [keyUrl, keys] = esmockKeyLong.split(esmockModuleKeysRe)
   const moduleGlobals = keyUrl && keyUrl.replace(esmockGlobalsAndBeforeRe, '')
   // do not call 'nextResolve' for notfound modules
   if (esmockKeyLong.includes(`notfound=${specifier}`)) {

src/esmockModule.js

@@ -88,7 +88,7 @@ const esmockModuleImportedSanitize = (importedModule, esmockKey) => {
 const esmockModuleImportedPurge = modulePathKey => {
   const purgeKey = key => key === 'null' || esmockCacheSet(key, null)
   const longKey = esmockKeyGet(modulePathKey.split('esmk=')[1])
-  const [ url, keys ] = longKey.split('#-#esmockModuleKeys=')
+  const [url, keys] = longKey.split('#-#esmockModuleKeys=')
 
   String(keys).split('#-#').forEach(purgeKey)
   String(url.split('esmockGlobals=')[1]).split('#-#').forEach(purgeKey)

tests/tests-ava/spec/esmock.ava.spec.js

@@ -307,7 +307,7 @@ test('mocks inline `async import("name")`', async t => {
       filePath: 'filePath'
     }))
 
-  const [ , key ] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
+  const [, key] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
   const keyRe = new RegExp(`esmockKey=${key}[^d]`)
 
   const moduleKeys = Object.keys(esmock.esmockCache.mockDefs)

tests/tests-node/esmock.node.test.js

@@ -322,7 +322,7 @@ test('mocks inline `async import("name")`', async () => {
       filePath: 'filePath'
     }))
 
-  const [ , key ] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
+  const [, key] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
   const keyRe = new RegExp(`esmockKey=${key}[^d]`)
 
   const moduleKeys = Object.keys(esmock.esmockCache.mockDefs)

tests/tests-source-map/src/__tests__/index.test.ts

@@ -28,3 +28,16 @@ test("using relative path", async (t) => {
     const getHostname: typeof indexType.getHostname = indexModule.getHostname;
     t.is(getHostname(), expectedHostname);
 });
+
+test("using opt.parent", async (t) => {
+    const indexModule = await esmock("../index.js", {
+        os: {
+            hostname: () => expectedHostname,
+        },
+    }, undefined, {
+        parent: import.meta.url
+    });
+
+    const getHostname: typeof indexType.getHostname = indexModule.getHostname;
+    t.is(getHostname(), expectedHostname);
+});

tests/tests-uvu/esmock.uvu.spec.js

@@ -276,7 +276,7 @@ test('mocks inline `async import("name")`', async () => {
       filePath: 'filePath'
     }))
 
-  const [ , key ] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
+  const [, key] = writeJSConfigFile.esmockKey.match(/esmk=(\d*)/)
   const keyRe = new RegExp(`esmockKey=${key}[^d]`)
 
   const moduleKeys = Object.keys(esmock.esmockCache.mockDefs)