chore: fixed newly arisen type errors

in particular, switched dependency is-subset for newer, is-subset-of library

package.json

@@ -21,7 +21,7 @@
     "docs"
   ],
   "scripts": {
-    "lint": "eslint --cache --fix --ext .js,.cjs .",
+    "lint": "eslint --cache --fix --ext .js,.cjs",
     "lint:ci": "eslint --ext .js,.cjs .",
     "prettier": "prettier --cache --write *.md \"./**/*.md\"",
     "prettier:ci": "prettier *.md \"./**/*.md\"",
@@ -76,7 +76,7 @@
       "npm run lint"
     ],
     "packages/**/*.js": [
-       "npm run types:check"
+      "npm run types:check"
     ],
     "**/*.md":[
       "npm run prettier"

packages/core/package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "dequal": "^2.0.3",
     "globrex": "^0.1.2",
-    "is-subset": "^0.1.1",
+    "is-subset-of": "^3.1.10",
     "querystring": "^0.2.1",
     "regexparam": "^3.0.0"
   }

packages/core/src/CallHistory.js

@@ -1,9 +1,9 @@
 //@type-check
-/** @typedef {import('./Route').RouteConfig} RouteConfig */
-/** @typedef {import('./Route').RouteName} RouteName */
-/** @typedef {import('./RequestUtils').NormalizedRequestOptions} NormalizedRequestOptions */
-/** @typedef {import('./Matchers').RouteMatcher} RouteMatcher */
-/** @typedef {import('./FetchMock').FetchMockConfig} FetchMockConfig */
+/** @typedef {import('./Route.js').RouteConfig} RouteConfig */
+/** @typedef {import('./Route.js').RouteName} RouteName */
+/** @typedef {import('./RequestUtils.js').NormalizedRequestOptions} NormalizedRequestOptions */
+/** @typedef {import('./Matchers.js').RouteMatcher} RouteMatcher */
+/** @typedef {import('./FetchMock.js').FetchMockConfig} FetchMockConfig */
 import { createCallLogFromUrlAndOptions } from './RequestUtils.js';
 import { isUrlMatcher } from './Matchers.js';
 import Route from './Route.js';

packages/core/src/FetchMock.js

@@ -3,13 +3,13 @@ import Router from './Router.js';
 import Route from './Route.js';
 import CallHistory from './CallHistory.js';
 import * as requestUtils from './RequestUtils.js';
-/** @typedef {import('./Router').RouteMatcher} RouteMatcher */
-/** @typedef {import('./Route').RouteName} RouteName */
-/** @typedef {import('./Route').UserRouteConfig} UserRouteConfig */
-/** @typedef {import('./Router').RouteResponse} RouteResponse */
-/** @typedef {import('./Matchers').MatcherDefinition} MatcherDefinition */
-/** @typedef {import('./CallHistory').CallLog} CallLog */
-/** @typedef {import('./Route').RouteResponseFunction} RouteResponseFunction */
+/** @typedef {import('./Router.js').RouteMatcher} RouteMatcher */
+/** @typedef {import('./Route.js').RouteName} RouteName */
+/** @typedef {import('./Route.js').UserRouteConfig} UserRouteConfig */
+/** @typedef {import('./Router.js').RouteResponse} RouteResponse */
+/** @typedef {import('./Matchers.js').MatcherDefinition} MatcherDefinition */
+/** @typedef {import('./CallHistory.js').CallLog} CallLog */
+/** @typedef {import('./Route.js').RouteResponseFunction} RouteResponseFunction */
 
 /**
  * @typedef FetchMockGlobalConfig

packages/core/src/Matchers.js

@@ -1,10 +1,10 @@
 //@type-check
-/** @typedef {import('./Route').RouteConfig} RouteConfig */
-/** @typedef {import('./CallHistory').CallLog} CallLog */
+/** @typedef {import('./Route.js').RouteConfig} RouteConfig */
+/** @typedef {import('./CallHistory.js').CallLog} CallLog */
 import glob from 'globrex';
 import * as regexparam from 'regexparam';
 import querystring from 'querystring';
-import isSubset from 'is-subset';
+import { isSubsetOf } from 'is-subset-of';
 import { dequal as isEqual } from 'dequal';
 import {
 	normalizeHeaders,
@@ -177,8 +177,8 @@ const getBodyMatcher = (route) => {
 		return (
 			sentBody &&
 			(route.matchPartialBody
-				? isSubset(sentBody, expectedBody)
-				: isEqual(sentBody, expectedBody))
+				? isSubsetOf(expectedBody, sentBody)
+				: isEqual(expectedBody, sentBody))
 		);
 	};
 };

packages/core/src/RequestUtils.js

@@ -12,7 +12,7 @@ const protocolRelativeUrlRX = new RegExp('^//', 'i');
  */
 
 /** @typedef {RequestInit | (RequestInit & DerivedRequestOptions) } NormalizedRequestOptions */
-/** @typedef {import('./CallHistory').CallLog} CallLog */
+/** @typedef {import('./CallHistory.js').CallLog} CallLog */
 
 /**
  * @param {string | string | URL} url

packages/core/src/Route.js

@@ -2,13 +2,13 @@
 import { builtInMatchers } from './Matchers.js';
 import statusTextMap from './StatusTextMap.js';
 
-/** @typedef {import('./Matchers').RouteMatcher} RouteMatcher */
-/** @typedef {import('./CallHistory').CallLog} CallLog */
-/** @typedef {import('./Matchers').RouteMatcherFunction} RouteMatcherFunction */
-/** @typedef {import('./Matchers').RouteMatcherUrl} RouteMatcherUrl */
-/** @typedef {import('./Matchers').MatcherDefinition} MatcherDefinition */
-/** @typedef {import('./FetchMock').FetchMockGlobalConfig} FetchMockGlobalConfig */
-/** @typedef {import('./FetchMock').FetchImplementations} FetchImplementations */
+/** @typedef {import('./Matchers.js').RouteMatcher} RouteMatcher */
+/** @typedef {import('./CallHistory.js').CallLog} CallLog */
+/** @typedef {import('./Matchers.js').RouteMatcherFunction} RouteMatcherFunction */
+/** @typedef {import('./Matchers.js').RouteMatcherUrl} RouteMatcherUrl */
+/** @typedef {import('./Matchers.js').MatcherDefinition} MatcherDefinition */
+/** @typedef {import('./FetchMock.js').FetchMockGlobalConfig} FetchMockGlobalConfig */
+/** @typedef {import('./FetchMock.js').FetchImplementations} FetchImplementations */
 
 /**
  * @typedef UserRouteConfig

packages/core/src/Router.js

@@ -1,17 +1,17 @@
 //@type-check
 import Route from './Route.js';
 import { isUrlMatcher, isFunctionMatcher } from './Matchers.js';
-/** @typedef {import('./Route').UserRouteConfig} UserRouteConfig */
-/** @typedef {import('./Route').RouteConfig} RouteConfig */
-/** @typedef {import('./Route').RouteResponse} RouteResponse */
-/** @typedef {import('./Route').RouteResponseData} RouteResponseData */
-/** @typedef {import('./Route').RouteResponseObjectData} RouteResponseObjectData */
-/** @typedef {import('./Route').RouteResponseConfig} RouteResponseConfig */
-/** @typedef {import('./Route').RouteResponseFunction} RouteResponseFunction */
-/** @typedef {import('./Matchers').RouteMatcher} RouteMatcher */
-/** @typedef {import('./FetchMock').FetchMockConfig} FetchMockConfig */
-/** @typedef {import('./FetchMock')} FetchMock */
-/** @typedef {import('./CallHistory').CallLog} CallLog */
+/** @typedef {import('./Route.js').UserRouteConfig} UserRouteConfig */
+/** @typedef {import('./Route.js').RouteConfig} RouteConfig */
+/** @typedef {import('./Route.js').RouteResponse} RouteResponse */
+/** @typedef {import('./Route.js').RouteResponseData} RouteResponseData */
+/** @typedef {import('./Route.js').RouteResponseObjectData} RouteResponseObjectData */
+/** @typedef {import('./Route.js').RouteResponseConfig} RouteResponseConfig */
+/** @typedef {import('./Route.js').RouteResponseFunction} RouteResponseFunction */
+/** @typedef {import('./Matchers.js').RouteMatcher} RouteMatcher */
+/** @typedef {import('./FetchMock.js').FetchMockConfig} FetchMockConfig */
+/** @typedef {import('./FetchMock.js')} FetchMock */
+/** @typedef {import('./CallHistory.js').CallLog} CallLog */
 
 /** @typedef {'body' |'headers' |'throws' |'status' |'redirectUrl' } ResponseConfigProp */
 

packages/core/src/__tests__/Matchers/body.test.js

@@ -211,7 +211,7 @@ describe('body matching', () => {
 			).toBe(true);
 		});
 
-		it('not match when not starting subset of array', () => {
+		it('match when subset of array has gaps', () => {
 			const route = new Route({
 				body: { ham: [1, 3] },
 				matchPartialBody: true,
@@ -225,7 +225,7 @@ describe('body matching', () => {
 						body: JSON.stringify({ ham: [1, 2, 3] }),
 					},
 				}),
-			).toBe(false);
+			).toBe(true);
 		});
 	});
 });

packages/core/src/package.json

@@ -1 +1 @@
-{"type": "module"}
+{"type": "module"}

packages/core/types/CallHistory.d.ts

@@ -1,9 +1,9 @@
 export default CallHistory;
-export type RouteConfig = import("./Route").RouteConfig;
-export type RouteName = import("./Route").RouteName;
-export type NormalizedRequestOptions = import("./RequestUtils").NormalizedRequestOptions;
-export type RouteMatcher = import("./Matchers").RouteMatcher;
-export type FetchMockConfig = import("./FetchMock").FetchMockConfig;
+export type RouteConfig = import("./Route.js").RouteConfig;
+export type RouteName = import("./Route.js").RouteName;
+export type NormalizedRequestOptions = import("./RequestUtils.js").NormalizedRequestOptions;
+export type RouteMatcher = import("./Matchers.js").RouteMatcher;
+export type FetchMockConfig = import("./FetchMock.js").FetchMockConfig;
 export type CallLog = {
     arguments: any[];
     url: string;
@@ -26,7 +26,7 @@ export type CallHistoryFilter = RouteName | Matched | Unmatched | boolean | Rout
 declare class CallHistory {
     constructor(globalConfig: FetchMockConfig, router: Router);
     callLogs: CallLog[];
-    config: import("./FetchMock").FetchMockConfig;
+    config: import("./FetchMock.js").FetchMockConfig;
     router: Router;
     recordCall(callLog: CallLog): void;
     clear(): void;

packages/core/types/FetchMock.d.ts

@@ -1,11 +1,11 @@
 export default fetchMock;
-export type RouteMatcher = import("./Router").RouteMatcher;
-export type RouteName = import("./Route").RouteName;
-export type UserRouteConfig = import("./Route").UserRouteConfig;
-export type RouteResponse = import("./Router").RouteResponse;
-export type MatcherDefinition = import("./Matchers").MatcherDefinition;
-export type CallLog = import("./CallHistory").CallLog;
-export type RouteResponseFunction = import("./Route").RouteResponseFunction;
+export type RouteMatcher = import("./Router.js").RouteMatcher;
+export type RouteName = import("./Route.js").RouteName;
+export type UserRouteConfig = import("./Route.js").UserRouteConfig;
+export type RouteResponse = import("./Router.js").RouteResponse;
+export type MatcherDefinition = import("./Matchers.js").MatcherDefinition;
+export type CallLog = import("./CallHistory.js").CallLog;
+export type RouteResponseFunction = import("./Route.js").RouteResponseFunction;
 export type FetchMockGlobalConfig = {
     sendAsJson?: boolean;
     includeContentLength?: boolean;

packages/core/types/Matchers.d.ts

@@ -1,8 +1,8 @@
 export function isUrlMatcher(matcher: RouteMatcher | RouteConfig): matcher is RouteMatcherUrl;
 export function isFunctionMatcher(matcher: RouteMatcher | RouteConfig): matcher is RouteMatcherFunction;
 export const builtInMatchers: MatcherDefinition[];
-export type RouteConfig = import("./Route").RouteConfig;
-export type CallLog = import("./CallHistory").CallLog;
+export type RouteConfig = import("./Route.js").RouteConfig;
+export type CallLog = import("./CallHistory.js").CallLog;
 export type RouteMatcherUrl = string | RegExp | URL;
 export type UrlMatcherGenerator = (arg0: string) => RouteMatcherFunction;
 export type RouteMatcherFunction = (arg0: CallLog) => boolean;

packages/core/types/RequestUtils.d.ts

@@ -16,4 +16,4 @@ export type DerivedRequestOptions = {
     };
 };
 export type NormalizedRequestOptions = RequestInit | (RequestInit & DerivedRequestOptions);
-export type CallLog = import("./CallHistory").CallLog;
+export type CallLog = import("./CallHistory.js").CallLog;

packages/core/types/Route.d.ts

@@ -1,11 +1,11 @@
 export default Route;
-export type RouteMatcher = import("./Matchers").RouteMatcher;
-export type CallLog = import("./CallHistory").CallLog;
-export type RouteMatcherFunction = import("./Matchers").RouteMatcherFunction;
-export type RouteMatcherUrl = import("./Matchers").RouteMatcherUrl;
-export type MatcherDefinition = import("./Matchers").MatcherDefinition;
-export type FetchMockGlobalConfig = import("./FetchMock").FetchMockGlobalConfig;
-export type FetchImplementations = import("./FetchMock").FetchImplementations;
+export type RouteMatcher = import("./Matchers.js").RouteMatcher;
+export type CallLog = import("./CallHistory.js").CallLog;
+export type RouteMatcherFunction = import("./Matchers.js").RouteMatcherFunction;
+export type RouteMatcherUrl = import("./Matchers.js").RouteMatcherUrl;
+export type MatcherDefinition = import("./Matchers.js").MatcherDefinition;
+export type FetchMockGlobalConfig = import("./FetchMock.js").FetchMockGlobalConfig;
+export type FetchImplementations = import("./FetchMock.js").FetchImplementations;
 export type UserRouteConfig = {
     name?: RouteName;
     method?: string;

packages/core/types/Router.d.ts

@@ -4,7 +4,7 @@ export default class Router {
         fallbackRoute?: Route;
     });
     routes: Route[];
-    config: import("./FetchMock").FetchMockConfig;
+    config: import("./FetchMock.js").FetchMockConfig;
     fallbackRoute: Route;
     needsToReadBody(request: Request): boolean;
     execute(callLog: CallLog): Promise<Response>;
@@ -22,16 +22,16 @@ export default class Router {
         includeFallback?: boolean;
     }): void;
 }
-export type UserRouteConfig = import("./Route").UserRouteConfig;
-export type RouteConfig = import("./Route").RouteConfig;
-export type RouteResponse = import("./Route").RouteResponse;
-export type RouteResponseData = import("./Route").RouteResponseData;
-export type RouteResponseObjectData = import("./Route").RouteResponseObjectData;
-export type RouteResponseConfig = import("./Route").RouteResponseConfig;
-export type RouteResponseFunction = import("./Route").RouteResponseFunction;
-export type RouteMatcher = import("./Matchers").RouteMatcher;
-export type FetchMockConfig = import("./FetchMock").FetchMockConfig;
-export type FetchMock = typeof import("./FetchMock");
-export type CallLog = import("./CallHistory").CallLog;
+export type UserRouteConfig = import("./Route.js").UserRouteConfig;
+export type RouteConfig = import("./Route.js").RouteConfig;
+export type RouteResponse = import("./Route.js").RouteResponse;
+export type RouteResponseData = import("./Route.js").RouteResponseData;
+export type RouteResponseObjectData = import("./Route.js").RouteResponseObjectData;
+export type RouteResponseConfig = import("./Route.js").RouteResponseConfig;
+export type RouteResponseFunction = import("./Route.js").RouteResponseFunction;
+export type RouteMatcher = import("./Matchers.js").RouteMatcher;
+export type FetchMockConfig = import("./FetchMock.js").FetchMockConfig;
+export type FetchMock = typeof import("./FetchMock.js");
+export type CallLog = import("./CallHistory.js").CallLog;
 export type ResponseConfigProp = "body" | "headers" | "throws" | "status" | "redirectUrl";
 import Route from './Route.js';