Merge pull request #707 from talentlessguy/replace-lodash

Replace deps with lighter alternatives

package.json

@@ -14,7 +14,7 @@
   },
   "homepage": "http://www.wheresrhys.co.uk/fetch-mock",
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.0.0"
   },
   "workspaces": [
     "packages/*",

packages/core/package.json

@@ -18,10 +18,10 @@
   },
   "homepage": "https://github.com/wheresrhys/fetch-mock#readme",
   "dependencies": {
-    "glob-to-regexp": "^0.4.1",
+    "dequal": "^2.0.3",
+    "globrex": "^0.1.2",
     "is-subset": "^0.1.1",
-    "lodash.isequal": "^4.5.0",
-    "path-to-regexp": "^2.4.0",
-    "querystring": "^0.2.1"
+    "querystring": "^0.2.1",
+    "regexparam": "^3.0.0"
   }
 }

packages/core/src/Matchers.js

@@ -1,12 +1,11 @@
 //@type-check
 /** @typedef {import('./Route').RouteConfig} RouteConfig */
 /** @typedef {import('./RequestUtils').NormalizedRequestOptions} NormalizedRequestOptions */
-/** @typedef {import('path-to-regexp').Key} Key */
-import glob from 'glob-to-regexp';
-import pathToRegexp from 'path-to-regexp';
+import glob from 'globrex';
+import * as regexparam from 'regexparam';
 import querystring from 'querystring';
 import isSubset from 'is-subset';
-import isEqual from 'lodash.isequal';
+import { dequal as isEqual } from 'dequal';
 import {
 	normalizeHeaders,
 	getPath,
@@ -54,11 +53,11 @@ const stringMatchers = {
 
 	glob: (targetString) => {
 		const urlRX = glob(targetString);
-		return (url) => urlRX.test(url);
+		return (url) => urlRX.regex.test(url);
 	},
 	express: (targetString) => {
-		const urlRX = pathToRegexp(targetString);
-		return (url) => urlRX.test(getPath(url));
+		const urlRX = regexparam.parse(targetString);
+		return (url) => urlRX.pattern.test(getPath(url));
 	},
 	path: (targetString) => (url) => getPath(url) === targetString,
 };
@@ -129,16 +128,14 @@ const getParamsMatcher = ({ params: expectedParams, url: matcherUrl }) => {
 			);
 		}
 		const expectedKeys = Object.keys(expectedParams);
-		/** @type {Key[]} */
-		const keys = [];
-		const re = pathToRegexp(matcherUrl.replace(/^express:/, ''), keys);
+		const re = regexparam.parse(matcherUrl.replace(/^express:/, ''));
 		return (url) => {
-			const vals = re.exec(getPath(url)) || [];
+			const vals = re.pattern.exec(getPath(url)) || [];
 			vals.shift();
 			/** @type {Object.<string,string>} */
-			const params = keys.reduce(
-				(map, { name }, i) =>
-					vals[i] ? Object.assign(map, { [name]: vals[i] }) : map,
+			const params = re.keys.reduce(
+				(map, paramName, i) =>
+					vals[i] ? Object.assign(map, { [paramName]: vals[i] }) : map,
 				{},
 			);
 			return expectedKeys.every((key) => params[key] === expectedParams[key]);

packages/fetch-mock/package.json

@@ -33,17 +33,17 @@
   "homepage": "http://www.wheresrhys.co.uk/fetch-mock",
   "dependencies": {
     "debug": "^4.1.1",
-    "glob-to-regexp": "^0.4.0",
+    "dequal": "^2.0.3",
+    "globrex": "^0.1.2",
     "is-subset": "^0.1.1",
-    "lodash.isequal": "^4.5.0",
-    "path-to-regexp": "^2.2.1"
+    "regexparam": "^3.0.0"
   },
   "peerDependenciesMeta": {
     "node-fetch": {
       "optional": true
     }
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.0.0"
   }
 }

packages/fetch-mock/src/Route/matchers.js

@@ -1,7 +1,7 @@
-import glob from 'glob-to-regexp';
-import pathToRegexp from 'path-to-regexp';
+import glob from 'globrex';
+import * as regexparam from 'regexparam';
 import isSubset from 'is-subset';
-import isEqual from 'lodash.isequal';
+import { dequal as isEqual } from 'dequal';
 import {
 	headers as headerUtils,
 	getPath,
@@ -24,11 +24,11 @@ const stringMatchers = {
 		),
 	glob: (targetString) => {
 		const urlRX = glob(targetString);
-		return debuggableUrlFunc((url) => urlRX.test(url));
+		return debuggableUrlFunc((url) => urlRX.regex.test(url));
 	},
 	express: (targetString) => {
-		const urlRX = pathToRegexp(targetString);
-		return debuggableUrlFunc((url) => urlRX.test(getPath(url)));
+		const urlRX = regexparam.parse(targetString);
+		return debuggableUrlFunc((url) => urlRX.pattern.test(getPath(url)));
 	},
 	path: (targetString) =>
 		debuggableUrlFunc((url) => getPath(url) === targetString),
@@ -142,15 +142,14 @@ const getParamsMatcher = ({ params: expectedParams, url: matcherUrl }) => {
 	}
 	debug('  Expected path parameters:', expectedParams);
 	const expectedKeys = Object.keys(expectedParams);
-	const keys = [];
-	const re = pathToRegexp(matcherUrl.replace(/^express:/, ''), keys);
+	const re = regexparam.parse(matcherUrl.replace(/^express:/, ''));
 	return (url) => {
 		debug('Attempting to match path parameters');
-		const vals = re.exec(getPath(url)) || [];
+		const vals = re.pattern.exec(getPath(url)) || [];
 		vals.shift();
-		const params = keys.reduce(
-			(map, { name }, i) =>
-				vals[i] ? Object.assign(map, { [name]: vals[i] }) : map,
+		const params = re.keys.reduce(
+			(map, paramName, i) =>
+				vals[i] ? Object.assign(map, { [paramName]: vals[i] }) : map,
 			{},
 		);
 		debug('  Expected path parameters:', expectedParams);