refactor: types mostly work now

wheresrhys · Jul 21, 2024 · 16fc353 · 16fc353
1 parent bd6e7ac
commit 16fc353
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/src/CallHistory.js b/packages/core/src/CallHistory.js
@@ -1,13 +1,13 @@
 //@type-check
 /** @typedef {import('./Route').RouteConfig} RouteConfig */
 /** @typedef {import('./Route').RouteName} RouteName */
-/** @typedef {import('./Router')} Router */
 /** @typedef {import('./RequestUtils').NormalizedRequestOptions} NormalizedRequestOptions */
 /** @typedef {import('./Matchers').RouteMatcher} RouteMatcher */
 /** @typedef {import('./FetchMock').FetchMockConfig} FetchMockConfig */
 import { createCallLog } from './RequestUtils.js';
 import { isUrlMatcher } from './Matchers.js';
 import Route from './Route.js';
+import Router from './Router.js';
 
 /**
  * @typedef CallLog

diff --git a/packages/core/src/FetchMock.js b/packages/core/src/FetchMock.js
@@ -49,11 +49,13 @@ const defaultConfig = {
  * @property {function():void} clearHistory
  */
 
+const defaultRouter = new Router(defaultConfig)
+
 /** @type {FetchMockCore} */
 const FetchMock = {
 	config: defaultConfig,
-	router: new Router(defaultConfig),
-	callHistory: new CallHistory(defaultConfig, this.router),
+	router: defaultRouter,
+	callHistory: new CallHistory(defaultConfig, defaultRouter),
 	createInstance() {
 		const instance = Object.create(FetchMock);
 		instance.config = { ...this.config };

diff --git a/packages/core/src/Matchers.js b/packages/core/src/Matchers.js
@@ -30,8 +30,7 @@ export const isUrlMatcher = (matcher) =>
 export const isFunctionMatcher = (matcher) => typeof matcher === 'function';
 
 /** @typedef {string | RegExp | URL} RouteMatcherUrl */
-/** @typedef {function(string): boolean} UrlMatcher */
-/** @typedef {function(string): UrlMatcher} UrlMatcherGenerator */
+/** @typedef {function(string): RouteMatcherFunction} UrlMatcherGenerator */
 /** @typedef {function(CallLog): boolean} RouteMatcherFunction */
 /** @typedef {function(RouteConfig): RouteMatcherFunction} MatcherGenerator */
 /** @typedef {RouteMatcherUrl | RouteMatcherFunction} RouteMatcher */

diff --git a/packages/core/src/Route.js b/packages/core/src/Route.js
@@ -3,6 +3,7 @@ import { builtInMatchers } from './Matchers';
 import statusTextMap from './StatusTextMap';
 
 /** @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 */
@@ -28,7 +29,7 @@ import statusTextMap from './StatusTextMap';
 /** @typedef {RouteResponseConfig | object}  RouteResponseObjectData */
 /** @typedef {Response | number| string | RouteResponseObjectData }  RouteResponseData */
 /** @typedef {Promise<RouteResponseData>}  RouteResponsePromise */
-/** @typedef {function(string, RequestInit, Request=): (RouteResponseData|RouteResponsePromise)} RouteResponseFunction */
+/** @typedef {function(CallLog): (RouteResponseData|RouteResponsePromise)} RouteResponseFunction */
 /** @typedef {RouteResponseData | RouteResponsePromise | RouteResponseFunction} RouteResponse*/
 
 /** @typedef {string} RouteName */
@@ -161,8 +162,8 @@ class Route {
 		}
 		const originalMatcher = this.matcher;
 		let timesLeft = this.config.repeat;
-		this.matcher = (url, options, request) => {
-			const match = timesLeft && originalMatcher(url, options, request);
+		this.matcher = (callLog) => {
+			const match = timesLeft && originalMatcher(callLog);
 			if (match) {
 				timesLeft--;
 				return true;