@zimic/interceptor 1.1.2 → 1.1.3-canary.1

package/dist/server.js

@@ -1,29 +1,29 @@
 'use strict';
 
-var chunkRQ2YYT5B_js = require('./chunk-RQ2YYT5B.js');
+var chunkNWA64QXK_js = require('./chunk-NWA64QXK.js');
 require('./chunk-DGUM43GV.js');
 
 
 
 Object.defineProperty(exports, "DEFAULT_ACCESS_CONTROL_HEADERS", {
   enumerable: true,
-  get: function () { return chunkRQ2YYT5B_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
+  get: function () { return chunkNWA64QXK_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
 });
 Object.defineProperty(exports, "DEFAULT_PREFLIGHT_STATUS_CODE", {
   enumerable: true,
-  get: function () { return chunkRQ2YYT5B_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
+  get: function () { return chunkNWA64QXK_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
 });
 Object.defineProperty(exports, "NotRunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunkRQ2YYT5B_js.NotRunningInterceptorServerError_default; }
+  get: function () { return chunkNWA64QXK_js.NotRunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "RunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunkRQ2YYT5B_js.RunningInterceptorServerError_default; }
+  get: function () { return chunkNWA64QXK_js.RunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "createInterceptorServer", {
   enumerable: true,
-  get: function () { return chunkRQ2YYT5B_js.createInterceptorServer; }
+  get: function () { return chunkNWA64QXK_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-AMKVGJZN.mjs';
+export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotRunningInterceptorServerError_default as NotRunningInterceptorServerError, RunningInterceptorServerError_default as RunningInterceptorServerError, createInterceptorServer } from './chunk-5JHZWURB.mjs';
 import './chunk-BJTO5JO5.mjs';
 //# sourceMappingURL=server.mjs.map
 //# sourceMappingURL=server.mjs.map

package/package.json

@@ -14,7 +14,7 @@
     "api",
     "static"
   ],
-  "version": "1.1.2",
+  "version": "1.1.3-canary.1",
   "homepage": "https://zimic.dev/docs/interceptor",
   "repository": {
     "type": "git",
@@ -105,13 +105,13 @@
     "typescript": "^5.9.2",
     "vitest": "^3.2.4",
     "@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/utils": "0.0.0",
+    "@zimic/lint-staged-config": "0.0.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",
-    "@zimic/http": "^1.1.0 || 1.1.2"
+    "@zimic/http": "^1.1.0 || 1.2.0-canary.0"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/http/index.ts

@@ -1,11 +1,14 @@
+import {
+  InvalidFormDataError as HttpInvalidFormDataError,
+  InvalidJSONError as HttpInvalidJSONError,
+} from '@zimic/http';
+
 export { default as RunningHttpInterceptorError } from './interceptor/errors/RunningHttpInterceptorError';
 export { default as NotRunningHttpInterceptorError } from './interceptor/errors/NotRunningHttpInterceptorError';
 export { default as UnknownHttpInterceptorPlatformError } from './interceptor/errors/UnknownHttpInterceptorPlatformError';
 export { default as UnknownHttpInterceptorTypeError } from './interceptor/errors/UnknownHttpInterceptorTypeError';
 export { default as RequestSavingSafeLimitExceededError } from './interceptor/errors/RequestSavingSafeLimitExceededError';
 
-export { default as InvalidFormDataError } from './interceptorWorker/errors/InvalidFormDataError';
-export { default as InvalidJSONError } from './interceptorWorker/errors/InvalidJSONError';
 export { default as UnregisteredBrowserServiceWorkerError } from './interceptorWorker/errors/UnregisteredBrowserServiceWorkerError';
 
 export { default as DisabledRequestSavingError } from './requestHandler/errors/DisabledRequestSavingError';
@@ -51,3 +54,31 @@ export type { InferHttpInterceptorSchema } from './interceptor/types/schema';
 export type { LocalHttpInterceptor, RemoteHttpInterceptor, HttpInterceptor } from './interceptor/types/public';
 
 export { createHttpInterceptor } from './interceptor/factory';
+
+/**
+ * Error thrown when a value is not valid {@link https://developer.mozilla.org/docs/Web/API/FormData FormData}. HTTP
+ * interceptors might throw this error when trying to parse the body of a request or response with the header
+ * `'content-type': 'multipart/form-data'`, if the content cannot be parsed to form data.
+ *
+ * @deprecated This type has been moved to {@link https://zimic.dev/docs/http `@zimic/http`}. Please import
+ *   `InvalidFormDataError` from `@zimic/http` instead.
+ *
+ *   ```ts
+ *   import { InvalidFormDataError } from '@zimic/http';
+ *   ```
+ */
+export class InvalidFormDataError extends HttpInvalidFormDataError {}
+
+/**
+ * Error thrown when a value is not valid JSON. HTTP interceptors might throw this error when trying to parse the body
+ * of a request or response with the header `'content-type': 'application/json'`, if the content cannot be parsed to
+ * JSON.
+ *
+ * @deprecated This type has been moved to {@link https://zimic.dev/docs/http `@zimic/http`}. Please import
+ *   `InvalidJSONError` from `@zimic/http` instead.
+ *
+ *   ```ts
+ *   import { InvalidJSONError } from '@zimic/http';
+ *   ```
+ */
+export class InvalidJSONError extends HttpInvalidJSONError {}

package/src/http/interceptor/HttpInterceptorClient.ts

@@ -9,7 +9,7 @@ import {
 } from '@zimic/http';
 import { Default, PossiblePromise } from '@zimic/utils/types';
 import createRegexFromPath from '@zimic/utils/url/createRegexFromPath';
-import excludeURLParams from '@zimic/utils/url/excludeURLParams';
+import excludeNonPathParams from '@zimic/utils/url/excludeNonPathParams';
 import validateURLProtocol from '@zimic/utils/url/validateURLProtocol';
 
 import { isServerSide } from '@/utils/environment';
@@ -109,7 +109,7 @@ class HttpInterceptorClient<
     }
 
     validateURLProtocol(newBaseURL, SUPPORTED_BASE_URL_PROTOCOLS);
-    excludeURLParams(newBaseURL);
+    excludeNonPathParams(newBaseURL);
 
     this._baseURL = newBaseURL;
   }

package/src/http/interceptorWorker/HttpInterceptorWorker.ts

@@ -8,7 +8,7 @@ import {
   HttpSchema,
   HttpStatusCode,
   InferPathParams,
-  HttpFormData,
+  parseHttpBody,
   HttpSearchParams,
 } from '@zimic/http';
 import isDefined from '@zimic/utils/data/isDefined';
@@ -33,8 +33,6 @@ import {
   HttpInterceptorResponse,
 } from '../requestHandler/types/requests';
 import { DEFAULT_UNHANDLED_REQUEST_STRATEGY } from './constants';
-import InvalidFormDataError from './errors/InvalidFormDataError';
-import InvalidJSONError from './errors/InvalidJSONError';
 import { MSWHttpResponseFactory } from './types/msw';
 import { HttpInterceptorWorkerType } from './types/options';
 
@@ -208,6 +206,7 @@ abstract class HttpInterceptorWorker {
 
     if (
       typeof declaration.body === 'string' ||
+      declaration.body === null ||
       declaration.body === undefined ||
       declaration.body instanceof FormData ||
       declaration.body instanceof URLSearchParams ||
@@ -235,7 +234,11 @@ abstract class HttpInterceptorWorker {
     const rawRequestClone = rawRequest.clone();
 
     type BodySchema = Default<Default<MethodSchema['request']>['body']>;
-    const parsedBody = await this.parseRawBody<BodySchema>(rawRequest);
+
+    const parsedBody = await parseHttpBody<BodySchema>(rawRequest).catch((error: unknown) => {
+      logger.error('Failed to parse request body:', error);
+      return null;
+    });
 
     type HeadersSchema = Default<Default<MethodSchema['request']>['headers']>;
     const headers = new HttpHeaders<HeadersSchema>(rawRequest.headers);
@@ -311,7 +314,10 @@ abstract class HttpInterceptorWorker {
     const rawResponseClone = rawResponse.clone();
 
     type BodySchema = Default<Default<Default<MethodSchema['response']>[StatusCode]>['body']>;
-    const parsedBody = await this.parseRawBody<BodySchema>(rawResponse);
+    const parsedBody = await parseHttpBody<BodySchema>(rawResponse).catch((error: unknown) => {
+      logger.error('Failed to parse response body:', error);
+      return null;
+    });
 
     type HeadersSchema = Default<Default<Default<MethodSchema['response']>[StatusCode]>['headers']>;
     const headers = new HttpHeaders<HeadersSchema>(rawResponse.headers);
@@ -376,107 +382,6 @@ abstract class HttpInterceptorWorker {
     return params as InferPathParams<Path>;
   }
 
-  static async parseRawBody<Body extends HttpBody>(resource: Request | Response) {
-    const contentType = resource.headers.get('content-type');
-
-    try {
-      if (contentType) {
-        if (contentType.startsWith('application/json')) {
-          return await this.parseRawBodyAsJSON<Body>(resource);
-        }
-        if (contentType.startsWith('multipart/form-data')) {
-          return await this.parseRawBodyAsFormData<Body>(resource);
-        }
-        if (contentType.startsWith('application/x-www-form-urlencoded')) {
-          return await this.parseRawBodyAsSearchParams<Body>(resource);
-        }
-        if (contentType.startsWith('text/') || contentType.startsWith('application/xml')) {
-          return await this.parseRawBodyAsText<Body>(resource);
-        }
-        if (
-          contentType.startsWith('application/') ||
-          contentType.startsWith('image/') ||
-          contentType.startsWith('audio/') ||
-          contentType.startsWith('font/') ||
-          contentType.startsWith('video/') ||
-          contentType.startsWith('multipart/')
-        ) {
-          return await this.parseRawBodyAsBlob<Body>(resource);
-        }
-      }
-
-      const resourceClone = resource.clone();
-
-      try {
-        return await this.parseRawBodyAsJSON<Body>(resource);
-      } catch {
-        return await this.parseRawBodyAsBlob<Body>(resourceClone);
-      }
-    } catch (error) {
-      console.error(error);
-      return null;
-    }
-  }
-
-  private static async parseRawBodyAsJSON<Body extends HttpBody>(resource: Request | Response) {
-    const bodyAsText = await resource.text();
-
-    if (!bodyAsText.trim()) {
-      return null;
-    }
-
-    try {
-      const bodyAsJSON = JSON.parse(bodyAsText) as Body;
-      return bodyAsJSON;
-    } catch {
-      throw new InvalidJSONError(bodyAsText);
-    }
-  }
-
-  private static async parseRawBodyAsSearchParams<Body extends HttpBody>(resource: Request | Response) {
-    const bodyAsText = await resource.text();
-
-    if (!bodyAsText.trim()) {
-      return null;
-    }
-
-    const bodyAsSearchParams = new HttpSearchParams(bodyAsText);
-    return bodyAsSearchParams as Body;
-  }
-
-  private static async parseRawBodyAsFormData<Body extends HttpBody>(resource: Request | Response) {
-    const resourceClone = resource.clone();
-
-    try {
-      const bodyAsRawFormData = await resource.formData();
-
-      const bodyAsFormData = new HttpFormData();
-      for (const [key, value] of bodyAsRawFormData) {
-        bodyAsFormData.append(key, value as string);
-      }
-
-      return bodyAsFormData as Body;
-    } catch {
-      const bodyAsText = await resourceClone.text();
-
-      if (!bodyAsText.trim()) {
-        return null;
-      }
-
-      throw new InvalidFormDataError(bodyAsText);
-    }
-  }
-
-  private static async parseRawBodyAsBlob<Body extends HttpBody>(resource: Request | Response) {
-    const bodyAsBlob = await resource.blob();
-    return bodyAsBlob as Body;
-  }
-
-  private static async parseRawBodyAsText<Body extends HttpBody>(resource: Request | Response) {
-    const bodyAsText = await resource.text();
-    return (bodyAsText || null) as Body;
-  }
-
   static async logUnhandledRequestWarning(rawRequest: Request, action: UnhandledRequestStrategy.Action) {
     const request = await this.parseRawRequest(rawRequest);
 

package/src/http/interceptorWorker/LocalHttpInterceptorWorker.ts

@@ -1,6 +1,6 @@
 import { HttpRequest, HttpResponse, HttpMethod, HttpSchema } from '@zimic/http';
 import createRegexFromPath from '@zimic/utils/url/createRegexFromPath';
-import excludeURLParams from '@zimic/utils/url/excludeURLParams';
+import excludeNonPathParams from '@zimic/utils/url/excludeNonPathParams';
 import validatePathParams from '@zimic/utils/url/validatePathParams';
 import { SharedOptions as MSWWorkerSharedOptions, http, passthrough } from 'msw';
 import * as mswBrowser from 'msw/browser';
@@ -210,7 +210,7 @@ class LocalHttpInterceptorWorker extends HttpInterceptorWorker {
   private async createResponseForRequest(request: HttpRequest) {
     const methodHandlers = this.httpHandlersByMethod[request.method as HttpMethod];
 
-    const requestURL = excludeURLParams(new URL(request.url));
+    const requestURL = excludeNonPathParams(new URL(request.url));
     const requestURLAsString = requestURL.href === `${requestURL.origin}/` ? requestURL.origin : requestURL.href;
 
     for (let handlerIndex = methodHandlers.length - 1; handlerIndex >= 0; handlerIndex--) {

package/src/server/InterceptorServer.ts

@@ -1,7 +1,7 @@
 import { normalizeNodeRequest, sendNodeResponse } from '@whatwg-node/server';
 import { HttpRequest, HttpMethod } from '@zimic/http';
 import createRegexFromPath from '@zimic/utils/url/createRegexFromPath';
-import excludeURLParams from '@zimic/utils/url/excludeURLParams';
+import excludeNonPathParams from '@zimic/utils/url/excludeNonPathParams';
 import { createServer, Server as HttpServer, IncomingMessage, ServerResponse } from 'http';
 import type { WebSocket as Socket } from 'isomorphic-ws';
 
@@ -314,7 +314,7 @@ class InterceptorServer implements PublicInterceptorServer {
   private async createResponseForRequest(request: SerializedHttpRequest) {
     const methodHandlers = this.httpHandlersByMethod[request.method as HttpMethod];
 
-    const requestURL = excludeURLParams(new URL(request.url));
+    const requestURL = excludeNonPathParams(new URL(request.url));
     const requestURLAsString = requestURL.href === `${requestURL.origin}/` ? requestURL.origin : requestURL.href;
 
     let matchedSomeInterceptor = false;