@zimic/interceptor 0.14.0-canary.20 → 0.14.0-canary.22

package/package.json

@@ -14,7 +14,7 @@
     "api",
     "static"
   ],
-  "version": "0.14.0-canary.20",
+  "version": "0.14.0-canary.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/zimicjs/zimic.git",
@@ -80,8 +80,7 @@
     "isomorphic-ws": "5.0.0",
     "msw": "2.7.1",
     "ws": "8.18.1",
-    "yargs": "17.7.2",
-    "@zimic/utils": "0.0.0"
+    "yargs": "17.7.2"
   },
   "optionalDependencies": {
     "bufferutil": "4.0.9"
@@ -100,6 +99,7 @@
     "vitest": "^3.0.6",
     "@zimic/eslint-config-node": "0.0.0",
     "@zimic/lint-staged-config": "0.0.0",
+    "@zimic/utils": "0.0.0",
     "@zimic/tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/src/http/interceptor/factory.ts

@@ -28,22 +28,22 @@ function isRemoteHttpInterceptorOptions(options: HttpInterceptorOptions) {
  */
 export function createHttpInterceptor<Schema extends HttpSchema>(
   options: LocalHttpInterceptorOptions,
-): PublicLocalHttpInterceptor<HttpSchema<Schema>>;
+): PublicLocalHttpInterceptor<Schema>;
 export function createHttpInterceptor<Schema extends HttpSchema>(
   options: RemoteHttpInterceptorOptions,
-): PublicRemoteHttpInterceptor<HttpSchema<Schema>>;
+): PublicRemoteHttpInterceptor<Schema>;
 export function createHttpInterceptor<Schema extends HttpSchema>(
   options: HttpInterceptorOptions,
-): PublicLocalHttpInterceptor<HttpSchema<Schema>> | PublicRemoteHttpInterceptor<HttpSchema<Schema>>;
+): PublicLocalHttpInterceptor<Schema> | PublicRemoteHttpInterceptor<Schema>;
 export function createHttpInterceptor<Schema extends HttpSchema>(
   options: HttpInterceptorOptions,
-): PublicLocalHttpInterceptor<HttpSchema<Schema>> | PublicRemoteHttpInterceptor<HttpSchema<Schema>> {
+): PublicLocalHttpInterceptor<Schema> | PublicRemoteHttpInterceptor<Schema> {
   const type = options.type;
 
   if (isLocalHttpInterceptorOptions(options)) {
-    return new LocalHttpInterceptor<HttpSchema<Schema>>(options);
+    return new LocalHttpInterceptor<Schema>(options);
   } else if (isRemoteHttpInterceptorOptions(options)) {
-    return new RemoteHttpInterceptor<HttpSchema<Schema>>(options);
+    return new RemoteHttpInterceptor<Schema>(options);
   }
 
   throw new UnknownHttpInterceptorTypeError(type);

package/src/http/requestHandler/HttpRequestHandlerClient.ts

@@ -230,7 +230,7 @@ class HttpRequestHandlerClient<
 
   private matchesRequestHeadersRestrictions(
     request: HttpInterceptorRequest<Path, Default<Schema[Path][Method]>>,
-    restriction: HttpRequestHandlerStaticRestriction<Schema, Path, Method>,
+    restriction: HttpRequestHandlerStaticRestriction<Schema, Method, Path>,
   ): RestrictionMatchResult<RestrictionDiff<HttpHeaders<never>>> {
     if (restriction.headers === undefined) {
       return { value: true };
@@ -254,7 +254,7 @@ class HttpRequestHandlerClient<
 
   private matchesRequestSearchParamsRestrictions(
     request: HttpInterceptorRequest<Path, Default<Schema[Path][Method]>>,
-    restriction: HttpRequestHandlerStaticRestriction<Schema, Path, Method>,
+    restriction: HttpRequestHandlerStaticRestriction<Schema, Method, Path>,
   ): RestrictionMatchResult<RestrictionDiff<HttpSearchParams<never>>> {
     if (restriction.searchParams === undefined) {
       return { value: true };
@@ -278,7 +278,7 @@ class HttpRequestHandlerClient<
 
   private async matchesRequestBodyRestrictions(
     request: HttpInterceptorRequest<Path, Default<Schema[Path][Method]>>,
-    restriction: HttpRequestHandlerStaticRestriction<Schema, Path, Method>,
+    restriction: HttpRequestHandlerStaticRestriction<Schema, Method, Path>,
   ): Promise<RestrictionMatchResult<RestrictionDiff<unknown>>> {
     if (restriction.body === undefined) {
       return { value: true };

package/src/http/requestHandler/types/restrictions.ts

@@ -29,8 +29,8 @@ type PartialHttpHeadersOrSchema<Schema extends HttpHeadersSchema> = IfNever<
  */
 export type HttpRequestHandlerHeadersStaticRestriction<
   Schema extends HttpSchema,
-  Path extends HttpSchemaPath<Schema, Method>,
   Method extends HttpSchemaMethod<Schema>,
+  Path extends HttpSchemaPath<Schema, Method>,
 > = PartialHttpHeadersOrSchema<HttpRequestHeadersSchema<Default<Schema[Path][Method]>>>;
 
 type PartialHttpSearchParamsOrSchema<Schema extends HttpSearchParamsSchema> = IfNever<
@@ -46,8 +46,8 @@ type PartialHttpSearchParamsOrSchema<Schema extends HttpSearchParamsSchema> = If
  */
 export type HttpRequestHandlerSearchParamsStaticRestriction<
   Schema extends HttpSchema,
-  Path extends HttpSchemaPath<Schema, Method>,
   Method extends HttpSchemaMethod<Schema>,
+  Path extends HttpSchemaPath<Schema, Method>,
 > = PartialHttpSearchParamsOrSchema<HttpRequestSearchParamsSchema<Default<Schema[Path][Method]>>>;
 
 type PartialBodyOrSchema<Body extends HttpBody> =
@@ -66,8 +66,8 @@ type PartialBodyOrSchema<Body extends HttpBody> =
  */
 export type HttpRequestHandlerBodyStaticRestriction<
   Schema extends HttpSchema,
-  Path extends HttpSchemaPath<Schema, Method>,
   Method extends HttpSchemaMethod<Schema>,
+  Path extends HttpSchemaPath<Schema, Method>,
 > = PartialBodyOrSchema<HttpRequestBodySchema<Default<Schema[Path][Method]>>>;
 
 /**
@@ -77,26 +77,26 @@ export type HttpRequestHandlerBodyStaticRestriction<
  */
 export interface HttpRequestHandlerStaticRestriction<
   Schema extends HttpSchema,
-  Path extends HttpSchemaPath<Schema, Method>,
   Method extends HttpSchemaMethod<Schema>,
+  Path extends HttpSchemaPath<Schema, Method>,
 > {
   /**
    * A set of headers that the intercepted request must contain to match the handler. If exact is `true`, the request
    * must contain exactly these headers and no others.
    */
-  headers?: HttpRequestHandlerHeadersStaticRestriction<Schema, Path, Method>;
+  headers?: HttpRequestHandlerHeadersStaticRestriction<Schema, Method, Path>;
 
   /**
    * A set of search params that the intercepted request must contain to match the handler. If exact is `true`, the
    * request must contain exactly these search params and no others.
    */
-  searchParams?: HttpRequestHandlerSearchParamsStaticRestriction<Schema, Path, Method>;
+  searchParams?: HttpRequestHandlerSearchParamsStaticRestriction<Schema, Method, Path>;
 
   /**
    * The body that the intercepted request must contain to match the handler. If exact is `true`, the request must
    * contain exactly this body and no other.
    */
-  body?: HttpRequestHandlerBodyStaticRestriction<Schema, Path, Method>;
+  body?: HttpRequestHandlerBodyStaticRestriction<Schema, Method, Path>;
 
   /**
    * If `true`, the request must contain **exactly** the headers, search params, and body declared in this restriction.
@@ -126,7 +126,7 @@ export type HttpRequestHandlerRestriction<
   Method extends HttpSchemaMethod<Schema>,
   Path extends HttpSchemaPath<Schema, Method>,
 > =
-  | HttpRequestHandlerStaticRestriction<Schema, Path, Method>
+  | HttpRequestHandlerStaticRestriction<Schema, Method, Path>
   | HttpRequestHandlerComputedRestriction<Schema, Method, Path>;
 
 export interface RestrictionDiff<Value> {