Merge pull request #42 from iambumblehead/handle-encoded-whitespace-a…

…t-moduleLoader

handle encoded whitespace at moduleLoader.mjs

CHANGELOG.md

@@ -1,5 +1,8 @@
 # changelog
 
+ * 1.7.0 _Dec.13.2021_
+   * re-use predefined regexps (faster)
+   * resolve encoded whitespace bug at module loader
  * 1.6.5 _Dec.06.2021_
    * add size and downloads badges to README
    * edits to README

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esmock",
-  "version": "1.6.6",
+  "version": "1.7.0",
   "license": "MIT",
   "readmeFilename": "README.md",
   "description": "provides native ESM import mocking for unit tests",
@@ -46,7 +46,7 @@
     "rewire"
   ],
   "dependencies": {
-    "resolvewithplus": "^0.4.2"
+    "resolvewithplus": "^0.5.1"
   },
   "devDependencies": {
     "uvu": "0.5.2",
@@ -56,7 +56,7 @@
     "sinon": "^12.0.1"
   },
   "scripts": {
-    "test-ava": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs\" ./spec/ava/*spec.js",
+    "test-ava": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs\" ./spec/ava/*.spec.js",
     "test-uvu": "node --no-warnings --loader=./src/esmockLoader.mjs ./node_modules/uvu/bin.js ./spec/uvu/",
     "test": "npm run test-ava && npm run test-uvu",
     "test-no-warn": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs --no-warnings\"",

spec/ava/esmock.ava.spec.js

@@ -342,3 +342,13 @@ test('should merge "default" value, when safe', async t => {
 
   t.is(mockMainA(), mockMainB());
 });
+
+test('should not error when mocked file has space in path', async t => {
+  const main = await esmock('../local/main.js', {
+    '../local/space in path/wild-file.js' : {
+      default : 'tamed'
+    }
+  });
+
+  t.is(main.wild, 'tamed');
+});

spec/local/main.js

@@ -5,6 +5,8 @@ import {
 } from './mainUtilNamedExports.js';
 import { readPath, readSync } from './usesCoreModule.js';
 
+import wildfile from './space in path/wild-file.js';
+
 import {
   createString,
   causeRuntimeError
@@ -34,3 +36,5 @@ export default () => {
     ? 'main string and mocked export, ' + createString()
     : 'main string, ' + createString();
 };
+
+export const wild = wildfile;

spec/local/space in path/wild-file.js

@@ -0,0 +1 @@
+export default 'success';

src/esmockLoader.mjs

@@ -15,11 +15,11 @@ const urlDummy = 'file:///' + path
   .join(path.dirname(url.fileURLToPath(import.meta.url)), 'esmock.js')
   .replace(/^\//, '');
 
+const esmockGlobalsAndAfterRe = /\?esmockGlobals=.*/;
 const esMockGlobalsAndBeforeRe = /.*\?esmockGlobals=/;
 const esmockModuleKeysRe = /#esmockModuleKeys/;
 const exportNamesRe = /.*exportNames=(.*)/;
 const esmockKeyRe = /esmockKey=\d*/;
-const esmockGlobalsAndAfterRe = /\?esmockGlobals=.*/;
 const withHashRe = /[^#]*#/;
 const isesmRe = /isesm=true/;
 
@@ -37,8 +37,9 @@ const resolve = async (specifier, context, defaultResolve) => {
     return defaultResolve(specifier, context, defaultResolve);
 
   const resolved = defaultResolve(specifier, context, defaultResolve);
+  const resolvedurl = decodeURI(resolved.url);
   const moduleKeyRe = new RegExp(
-    '.*(' + resolved.url + '\\?' + esmockKeyParam + '[^#]*).*');
+    '.*(' + resolvedurl + '\\?' + esmockKeyParam + '[^#]*).*');
 
   const [ keyUrl, keys ] = esmockKeyLong.split(esmockModuleKeysRe);
   const moduleGlobals = keyUrl.replace(esMockGlobalsAndBeforeRe, '');