Merge pull request #282 from iambumblehead/test-import-nodefs-promises

Test import nodefs promises

CHANGELOG.md

@@ -1,10 +1,11 @@
 # changelog
 
- * 2.6.1 _???.??.2023_
+ * 2.6.1 _Dec.30.2023_
    * [update ci job to use checkout v4](https://github.com/iambumblehead/esmock/pull/279)
    * [update README to work w/ eslint-plugin-markdown](https://github.com/iambumblehead/esmock/pull/275)
    * [update eslint](https://github.com/iambumblehead/esmock/pull/276) disallow trailing whitespace
    * [add typescript example](https://github.com/iambumblehead/esmock/pull/278) to README
+   * [update esmock to correctly](https://github.com/iambumblehead/esmock/pull/282) mock builtins imported with `await import` thanks @btakita
  * 2.6.0 _Nov.07.2023_
    * [typings: make MockFunction generic,](https://github.com/iambumblehead/esmock/pull/267) thanks @uwinkelvos
  * 2.5.9 _Nov.01.2023_

package.json

@@ -1,7 +1,7 @@
 {
   "name": "esmock",
   "type": "module",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "ISC",
   "readmeFilename": "README.md",
   "description": "provides native ESM import and globals mocking for unit tests",

src/esmockLoader.js

@@ -224,6 +224,12 @@ const load = async (url, context, nextLoad) => {
     }
   }
 
+  if (treeid && !url.includes(treeid)) {
+    // long querystring reduces readability of runtime error stacktrace
+    // smaller querystring `esmk=$id` does not clutter stacktrace
+    url = url + '?esmk=' + treeid.split('=')[1]
+  }
+
   return nextLoad(url, context)
 }
 

tests/local/usesInlineBuiltinImport.js

@@ -0,0 +1,6 @@
+export default {
+  importFSPromisesReadDir: async () => {
+    const {readdir} = (await import('node:fs/promises'))
+    return await readdir('path')
+  }
+}

tests/local/usesInlineBuiltinImportChild.js

@@ -0,0 +1,3 @@
+import usesInlineBuiltinImport from './usesInlineBuiltinImport.js'
+
+export default usesInlineBuiltinImport

tests/local/usesInlineImport.mjs

@@ -1,4 +1,3 @@
-
 async function writeJSConfigFile (config, filePath) {
   const eslint = (await import('eslint'))
 

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

@@ -581,3 +581,25 @@ test('should mock imported json (strict)', async () => {
     Object.keys(importsJSON.JSONobj).sort().join(), 'test-example')
   assert.strictEqual(importsJSON.JSONobj['test-example'], 'test-json-b')
 })
+
+test('mocks await import node:fs/promises', async () => {
+  const main = await esmock.p('../local/usesInlineBuiltinImport.js', {
+    'node:fs/promises': {
+      readdir: () => (['mock', 'local'])
+    }
+  })
+
+  assert.deepStrictEqual(
+    await main.importFSPromisesReadDir(), ['mock', 'local'])
+})
+
+test('mocks await import node:fs/promises (global)', async () => {
+  const main = await esmock.p('../local/usesInlineBuiltinImportChild.js', {}, {
+    'node:fs/promises': {
+      readdir: () => (['mock', 'global'])
+    }
+  })
+
+  assert.deepStrictEqual(
+    await main.importFSPromisesReadDir(), ['mock', 'global'])
+})