@zimic/interceptor 0.17.3 → 0.18.0-canary.1

package/dist/server.js

@@ -1,29 +1,29 @@
 'use strict';
 
-var chunkHPY7FBKU_js = require('./chunk-HPY7FBKU.js');
+var chunk3GG7AT63_js = require('./chunk-3GG7AT63.js');
 require('./chunk-WCQVDF3K.js');
 
 
 
 Object.defineProperty(exports, "DEFAULT_ACCESS_CONTROL_HEADERS", {
   enumerable: true,
-  get: function () { return chunkHPY7FBKU_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
+  get: function () { return chunk3GG7AT63_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
 });
 Object.defineProperty(exports, "DEFAULT_PREFLIGHT_STATUS_CODE", {
   enumerable: true,
-  get: function () { return chunkHPY7FBKU_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
+  get: function () { return chunk3GG7AT63_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
 });
 Object.defineProperty(exports, "NotRunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunkHPY7FBKU_js.NotRunningInterceptorServerError_default; }
+  get: function () { return chunk3GG7AT63_js.NotRunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "RunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunkHPY7FBKU_js.RunningInterceptorServerError_default; }
+  get: function () { return chunk3GG7AT63_js.RunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "createInterceptorServer", {
   enumerable: true,
-  get: function () { return chunkHPY7FBKU_js.createInterceptorServer; }
+  get: function () { return chunk3GG7AT63_js.createInterceptorServer; }
 });
 //# sourceMappingURL=server.js.map
 //# sourceMappingURL=server.js.map

package/dist/server.mjs

@@ -1,4 +1,4 @@
-export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotRunningInterceptorServerError_default as NotRunningInterceptorServerError, RunningInterceptorServerError_default as RunningInterceptorServerError, createInterceptorServer } from './chunk-2JEHCG37.mjs';
+export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotRunningInterceptorServerError_default as NotRunningInterceptorServerError, RunningInterceptorServerError_default as RunningInterceptorServerError, createInterceptorServer } from './chunk-NYY2KKWB.mjs';
 import './chunk-CGILA3WO.mjs';
 //# sourceMappingURL=server.mjs.map
 //# sourceMappingURL=server.mjs.map

package/package.json

@@ -14,7 +14,7 @@
     "api",
     "static"
   ],
-  "version": "0.17.3",
+  "version": "0.18.0-canary.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/zimicjs/zimic.git",
@@ -99,14 +99,14 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.2",
+    "@zimic/eslint-config-node": "0.0.0",
     "@zimic/lint-staged-config": "0.0.0",
-    "@zimic/tsconfig": "0.0.0",
     "@zimic/utils": "0.0.0",
-    "@zimic/eslint-config-node": "0.0.0"
+    "@zimic/tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "typescript": ">=4.8.0",
-    "@zimic/http": "^0.3.0 || 0.3.2"
+    "@zimic/http": "^0.4.0 || 0.4.0-canary.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/http/requestHandler/HttpRequestHandlerClient.ts

@@ -224,13 +224,14 @@ class HttpRequestHandlerClient<
   private matchesRequestHeadersRestrictions(
     request: HttpInterceptorRequest<Path, Default<Schema[Path][Method]>>,
     restriction: HttpRequestHandlerStaticRestriction<Schema, Method, Path>,
-  ): RestrictionMatchResult<RestrictionDiff<HttpHeaders<never>>> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): RestrictionMatchResult<RestrictionDiff<HttpHeaders<any>>> {
     if (restriction.headers === undefined) {
       return { value: true };
     }
 
     const restrictedHeaders = new HttpHeaders(
-      restriction.headers as HttpRequestHeadersSchema<Default<Schema[Path][Method]>>,
+      restriction.headers as Default<HttpRequestHeadersSchema<Default<Schema[Path][Method]>>>,
     );
 
     const matchesRestriction = restriction.exact
@@ -248,13 +249,14 @@ class HttpRequestHandlerClient<
   private matchesRequestSearchParamsRestrictions(
     request: HttpInterceptorRequest<Path, Default<Schema[Path][Method]>>,
     restriction: HttpRequestHandlerStaticRestriction<Schema, Method, Path>,
-  ): RestrictionMatchResult<RestrictionDiff<HttpSearchParams<never>>> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): RestrictionMatchResult<RestrictionDiff<HttpSearchParams<any>>> {
     if (restriction.searchParams === undefined) {
       return { value: true };
     }
 
     const restrictedSearchParams = new HttpSearchParams(
-      restriction.searchParams as HttpRequestSearchParamsSchema<Default<Schema[Path][Method]>>,
+      restriction.searchParams as Default<HttpRequestSearchParamsSchema<Default<Schema[Path][Method]>>>,
     );
 
     const matchesRestriction = restriction.exact

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

@@ -14,35 +14,43 @@ import {
   HttpStatusCode,
   InferPathParams,
 } from '@zimic/http';
-import { Default, PartialByKey, PossiblePromise, ReplaceBy } from '@zimic/utils/types';
+import { Default, PartialByKey, PossiblePromise } from '@zimic/utils/types';
 
-export type HttpRequestHandlerResponseWithBody<ResponseSchema extends HttpResponseSchema> =
-  unknown extends ResponseSchema['body']
-    ? { body?: null }
-    : undefined extends ResponseSchema['body']
-      ? { body?: ReplaceBy<ReplaceBy<ResponseSchema['body'], undefined, null>, ArrayBuffer, Blob> }
-      : { body: ReplaceBy<ResponseSchema['body'], ArrayBuffer, Blob> };
+type HttpRequestHandlerResponseBody<
+  ResponseSchema extends HttpResponseSchema,
+  StatusCode extends HttpStatusCode,
+> = HttpResponseBodySchema<{ response: { [Code in StatusCode]: ResponseSchema } }, StatusCode>;
 
-type HttpRequestHandlerResponseHeaders<ResponseSchema extends HttpResponseSchema> = HttpHeadersInit<
+export type HttpRequestHandlerResponseWithBody<
+  ResponseSchema extends HttpResponseSchema,
+  StatusCode extends HttpStatusCode,
+> = unknown extends ResponseSchema['body']
+  ? { body?: null }
+  : undefined extends ResponseSchema['body']
+    ? { body?: HttpRequestHandlerResponseBody<ResponseSchema, StatusCode> }
+    : { body: HttpRequestHandlerResponseBody<ResponseSchema, StatusCode> };
+
+type HttpRequestHandlerResponseDeclarationHeaders<ResponseSchema extends HttpResponseSchema> = HttpHeadersInit<
   PartialByKey<Default<ResponseSchema['headers']>, 'content-type'>
 >;
 
-export type HttpRequestHandlerResponseWithHeaders<ResponseSchema extends HttpResponseSchema> =
+export type HttpRequestHandlerResponseDeclarationWithHeaders<ResponseSchema extends HttpResponseSchema> =
   undefined extends ResponseSchema['headers']
-    ? { headers?: HttpRequestHandlerResponseHeaders<ResponseSchema> }
-    : keyof ResponseSchema['headers'] extends 'content-type'
-      ? { headers?: HttpRequestHandlerResponseHeaders<ResponseSchema> }
-      : { headers: HttpRequestHandlerResponseHeaders<ResponseSchema> };
+    ? { headers?: HttpRequestHandlerResponseDeclarationHeaders<ResponseSchema> }
+    : Exclude<keyof ResponseSchema['headers'], symbol> extends 'content-type'
+      ? { headers?: HttpRequestHandlerResponseDeclarationHeaders<ResponseSchema> }
+      : { headers: HttpRequestHandlerResponseDeclarationHeaders<ResponseSchema> };
 
 /** A declaration of an HTTP response for an intercepted request. */
 export type HttpRequestHandlerResponseDeclaration<
   MethodSchema extends HttpMethodSchema = HttpMethodSchema,
   StatusCode extends HttpStatusCode = HttpStatusCode,
 > = StatusCode extends StatusCode
-  ? {
-      status: StatusCode;
-    } & HttpRequestHandlerResponseWithBody<Default<Default<MethodSchema['response']>[StatusCode]>> &
-      HttpRequestHandlerResponseWithHeaders<Default<Default<MethodSchema['response']>[StatusCode]>>
+  ? { status: StatusCode } & HttpRequestHandlerResponseWithBody<
+      Default<Default<MethodSchema['response']>[StatusCode]>,
+      StatusCode
+    > &
+      HttpRequestHandlerResponseDeclarationWithHeaders<Default<Default<MethodSchema['response']>[StatusCode]>>
   : never;
 
 /**
@@ -66,15 +74,15 @@ export type HttpRequestHandlerResponseDeclarationFactory<
 export interface HttpInterceptorRequest<Path extends string, MethodSchema extends HttpMethodSchema>
   extends Omit<HttpRequest, keyof Body | 'headers' | 'clone'> {
   /** The headers of the request. */
-  headers: HttpHeaders<HttpRequestHeadersSchema<MethodSchema>>;
+  headers: HttpHeaders<Default<HttpRequestHeadersSchema<MethodSchema>>>;
   /** The path parameters of the request. They are parsed from the path string when using dynamic paths. */
   pathParams: InferPathParams<Path>;
   /** The search parameters of the request. */
-  searchParams: HttpSearchParams<HttpRequestSearchParamsSchema<MethodSchema>>;
+  searchParams: HttpSearchParams<Default<HttpRequestSearchParamsSchema<MethodSchema>>>;
   /** The body of the request. It is already parsed by default. */
-  body: ReplaceBy<HttpRequestBodySchema<MethodSchema>, ArrayBuffer, Blob>;
+  body: HttpRequestBodySchema<MethodSchema>;
   /** The raw request object. */
-  raw: HttpRequest<HttpRequestBodySchema<MethodSchema>>;
+  raw: HttpRequest<HttpRequestBodySchema<MethodSchema>, Default<HttpRequestHeadersSchema<MethodSchema>>>;
 }
 
 /**
@@ -84,13 +92,17 @@ export interface HttpInterceptorRequest<Path extends string, MethodSchema extend
 export interface HttpInterceptorResponse<MethodSchema extends HttpMethodSchema, StatusCode extends HttpStatusCode>
   extends Omit<HttpResponse, keyof Body | 'headers' | 'clone'> {
   /** The headers of the response. */
-  headers: HttpHeaders<HttpResponseHeadersSchema<MethodSchema, StatusCode>>;
+  headers: HttpHeaders<Default<HttpResponseHeadersSchema<MethodSchema, StatusCode>>>;
   /** The status code of the response. */
   status: StatusCode;
   /** The body of the response. It is already parsed by default. */
   body: HttpResponseBodySchema<MethodSchema, StatusCode>;
   /** The raw response object. */
-  raw: HttpResponse<HttpResponseBodySchema<MethodSchema, StatusCode>, StatusCode>;
+  raw: HttpResponse<
+    HttpResponseBodySchema<MethodSchema, StatusCode>,
+    Default<HttpResponseHeadersSchema<MethodSchema, StatusCode>>,
+    StatusCode
+  >;
 }
 
 export const HTTP_INTERCEPTOR_REQUEST_HIDDEN_PROPERTIES = Object.freeze(

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

@@ -16,7 +16,7 @@ import { IfNever, Default, DeepPartial, PossiblePromise } from '@zimic/utils/typ
 
 import { HttpInterceptorRequest } from './requests';
 
-type PartialHttpHeadersOrSchema<Schema extends HttpHeadersSchema> = IfNever<
+type PartialHttpHeadersOrSchema<Schema extends HttpHeadersSchema.Loose> = IfNever<
   Schema,
   never,
   Partial<Schema> | HttpHeaders<Partial<Schema>> | HttpHeaders<Schema>
@@ -31,9 +31,9 @@ export type HttpRequestHandlerHeadersStaticRestriction<
   Schema extends HttpSchema,
   Method extends HttpSchemaMethod<Schema>,
   Path extends HttpSchemaPath<Schema, Method>,
-> = PartialHttpHeadersOrSchema<HttpRequestHeadersSchema<Default<Schema[Path][Method]>>>;
+> = PartialHttpHeadersOrSchema<Default<HttpRequestHeadersSchema<Default<Schema[Path][Method]>>>>;
 
-type PartialHttpSearchParamsOrSchema<Schema extends HttpSearchParamsSchema> = IfNever<
+type PartialHttpSearchParamsOrSchema<Schema extends HttpSearchParamsSchema.Loose> = IfNever<
   Schema,
   never,
   Partial<Schema> | HttpSearchParams<Partial<Schema>> | HttpSearchParams<Schema>
@@ -48,7 +48,7 @@ export type HttpRequestHandlerSearchParamsStaticRestriction<
   Schema extends HttpSchema,
   Method extends HttpSchemaMethod<Schema>,
   Path extends HttpSchemaPath<Schema, Method>,
-> = PartialHttpSearchParamsOrSchema<HttpRequestSearchParamsSchema<Default<Schema[Path][Method]>>>;
+> = PartialHttpSearchParamsOrSchema<Default<HttpRequestSearchParamsSchema<Default<Schema[Path][Method]>>>>;
 
 type PartialBodyOrSchema<Body extends HttpBody> =
   Body extends HttpFormData<infer Schema>
@@ -138,8 +138,8 @@ export type RestrictionMatchResult<Value> = { value: true; diff?: undefined } |
 
 export interface RestrictionDiffs {
   computed?: RestrictionDiff<boolean>;
-  headers?: RestrictionDiff<HttpHeaders<never>>;
-  searchParams?: RestrictionDiff<HttpSearchParams<never>>;
+  headers?: RestrictionDiff<HttpHeaders<any>>; // eslint-disable-line @typescript-eslint/no-explicit-any
+  searchParams?: RestrictionDiff<HttpSearchParams<any>>; // eslint-disable-line @typescript-eslint/no-explicit-any
   body?: RestrictionDiff<unknown>;
 }
 

package/src/utils/http.ts

@@ -1,10 +1,4 @@
-import {
-  HTTP_METHODS_WITH_REQUEST_BODY,
-  HTTP_METHODS_WITH_RESPONSE_BODY,
-  HttpMethod,
-  HttpMethodWithRequestBody,
-  HttpMethodWithResponseBody,
-} from '@zimic/http';
+import { HttpMethod } from '@zimic/http';
 import { Server as HttpServer } from 'http';
 
 class HttpServerTimeoutError extends Error {}
@@ -98,12 +92,21 @@ export function getHttpServerPort(server: HttpServer) {
   }
 }
 
-export function methodCanHaveRequestBody(method: HttpMethod): method is HttpMethodWithRequestBody {
-  const methodsToCompare: readonly string[] = HTTP_METHODS_WITH_REQUEST_BODY;
-  return methodsToCompare.includes(method);
+export const HTTP_METHODS_WITH_REQUEST_BODY = new Set<HttpMethod>(['POST', 'PUT', 'PATCH', 'DELETE']);
+
+export function methodCanHaveRequestBody(method: HttpMethod) {
+  return HTTP_METHODS_WITH_REQUEST_BODY.has(method);
 }
 
-export function methodCanHaveResponseBody(method: HttpMethod): method is HttpMethodWithResponseBody {
-  const methodsToCompare: readonly string[] = HTTP_METHODS_WITH_RESPONSE_BODY;
-  return methodsToCompare.includes(method);
+export const HTTP_METHODS_WITH_RESPONSE_BODY = new Set<HttpMethod>([
+  'GET',
+  'POST',
+  'PUT',
+  'PATCH',
+  'DELETE',
+  'OPTIONS',
+]);
+
+export function methodCanHaveResponseBody(method: HttpMethod) {
+  return HTTP_METHODS_WITH_RESPONSE_BODY.has(method);
 }