From 73cc6dd849836530310f6aabe6c17a31762dfdcd Mon Sep 17 00:00:00 2001
From: chris <chris@bumblehead.com>
Date: Fri, 21 Oct 2022 22:52:56 -0700
Subject: [PATCH 1/2] use latest resolvewithplus

---
 package.json        |  2 +-
 src/esmockModule.js | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index ff9f86b7..0b8f1a97 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "node": ">=14.16.0"
   },
   "dependencies": {
-    "resolvewithplus": "^1.0.2"
+    "resolvewithplus": "^2.0.0"
   },
   "devDependencies": {
     "c8": "^7.12.0",
diff --git a/src/esmockModule.js b/src/esmockModule.js
index 13a97ae4..cb923954 100644
--- a/src/esmockModule.js
+++ b/src/esmockModule.js
@@ -95,12 +95,12 @@ const esmockModuleCreate = async (treeid, def, id, fileURL, opt) => {
   return mockModuleKey
 }
 
-const esmockMetaResolve = async (id, parent) => {
-  try {
-    return decodeURI(await import.meta.resolve(id, asFileURL(parent)))
-  } catch {
-    return null
-  }
+const esmockMetaResolve = async (id, parent, p) => {
+  p = isMetaResolve
+    ? await import.meta.resolve(id, asFileURL(parent)).catch(() => p)
+    : resolvewith(id, parent)
+
+  return p && decodeURI(p)
 }
 
 const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
@@ -110,9 +110,7 @@ const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
 
   if (!id) return mocks
 
-  const fileURL = isMetaResolve
-    ? await esmockMetaResolve(id, parent)
-    : resolvewith(id, parent)
+  const fileURL = await esmockMetaResolve(id, parent)
   if (!fileURL && opt.isModuleNotFoundError !== false)
     throw esmockErr.errModuleIdNotFound(id, parent)
 

From 04129f32175c4713c132763261cb82b84e775326 Mon Sep 17 00:00:00 2001
From: chris <chris@bumblehead.com>
Date: Fri, 21 Oct 2022 23:09:37 -0700
Subject: [PATCH 2/2] remove no-longer-needed decodeURI

---
 src/esmockLoader.js           |  5 ++---
 src/esmockModule.js           | 12 +++---------
 tests/tests-node/package.json |  3 ++-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/esmockLoader.js b/src/esmockLoader.js
index 74ca3ce1..54a625c5 100644
--- a/src/esmockLoader.js
+++ b/src/esmockLoader.js
@@ -58,9 +58,8 @@ const resolve = async (specifier, context, nextResolve) => {
   }
 
   const resolved = await nextResolveCall(nextResolve, specifier, context)
-  const resolvedurl = decodeURI(resolved.url)
   const moduleIdRe = new RegExp(
-    '.*(' + resolvedurl + '\\?' + treeid + '(?:(?!#-#).)*).*')
+    '.*(' + resolved.url + '\\?' + treeid + '(?:(?!#-#).)*).*')
   const moduleId =
     moduleIdRe.test(defs) && defs.replace(moduleIdRe, '$1') ||
     moduleIdRe.test(gdefs) && gdefs.replace(moduleIdRe, '$1')
@@ -75,7 +74,7 @@ const resolve = async (specifier, context, nextResolve) => {
   }
 
   if (/strict=3/.test(treeidspec) && !moduleId)
-    throw esmockErr.errModuleIdNotMocked(resolvedurl, treeidspec.split('?')[0])
+    throw esmockErr.errModuleIdNotMocked(resolved.url, treeidspec.split('?')[0])
 
   return resolved
 }
diff --git a/src/esmockModule.js b/src/esmockModule.js
index cb923954..3415e7e2 100644
--- a/src/esmockModule.js
+++ b/src/esmockModule.js
@@ -95,14 +95,6 @@ const esmockModuleCreate = async (treeid, def, id, fileURL, opt) => {
   return mockModuleKey
 }
 
-const esmockMetaResolve = async (id, parent, p) => {
-  p = isMetaResolve
-    ? await import.meta.resolve(id, asFileURL(parent)).catch(() => p)
-    : resolvewith(id, parent)
-
-  return p && decodeURI(p)
-}
-
 const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
   ids = ids || Object.keys(defs)
   id = ids[0]
@@ -110,7 +102,9 @@ const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
 
   if (!id) return mocks
 
-  const fileURL = await esmockMetaResolve(id, parent)
+  const fileURL = isMetaResolve
+    ? await import.meta.resolve(id, asFileURL(parent)).catch(() => null)
+    : resolvewith(id, parent)
   if (!fileURL && opt.isModuleNotFoundError !== false)
     throw esmockErr.errModuleIdNotFound(id, parent)
 
diff --git a/tests/tests-node/package.json b/tests/tests-node/package.json
index 456cfaba..a75d8ae8 100644
--- a/tests/tests-node/package.json
+++ b/tests/tests-node/package.json
@@ -14,6 +14,7 @@
   },
   "scripts": {
     "test:metaresolve": "node --experimental-import-meta-resolve --loader=esmock --test",
-    "test": "node --loader=esmock --test && npm run test:metaresolve"
+    "test": "node --loader=esmock --test && npm run test:metaresolve",
+    "test-one": "node --loader=esmock --test"
   }
 }