@mswjs/interceptors 0.17.0 → 0.17.3

package/README.md

@@ -9,7 +9,7 @@ Low-level HTTP/HTTPS/XHR/fetch request interception library.
 - `http.get`/`http.request`
 - `https.get`/`https.request`
 - `XMLHttpRequest`
-- `fetch`
+- `window.fetch`
 - Any third-party libraries that use the modules above (i.e. `axios`, `request`, `node-fetch`, `supertest`, etc.)
 
 ## Motivation
@@ -145,7 +145,10 @@ import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/lib/interceptors/
 
 const interceptor = BatchInterceptor({
   name: 'my-interceptor',
-  interceptors: [ClientRequestInterceptor, XMLHttpRequestInterceptor],
+  interceptors: [
+    new ClientRequestInterceptor(),
+    new XMLHttpRequestInterceptor(),
+  ],
 })
 
 // This "request" listener will be called on both

package/lib/IsomorphicRequest.d.ts

@@ -11,7 +11,7 @@ export declare class IsomorphicRequest {
     readonly method: string;
     readonly headers: Headers;
     readonly credentials: RequestCredentials;
-    private readonly body;
+    private readonly _body;
     private _bodyUsed;
     constructor(url: URL);
     constructor(url: URL, init: RequestInit);

package/lib/IsomorphicRequest.js

@@ -52,7 +52,7 @@ var IsomorphicRequest = /** @class */ (function () {
             this.method = input.method;
             this.headers = input.headers;
             this.credentials = input.credentials;
-            this.body = input.body || defaultBody;
+            this._body = input._body || defaultBody;
             return;
         }
         this.id = uuid_1.uuidv4();
@@ -60,7 +60,7 @@ var IsomorphicRequest = /** @class */ (function () {
         this.method = init.method || 'GET';
         this.headers = new lib_1.Headers(init.headers);
         this.credentials = init.credentials || 'same-origin';
-        this.body = init.body || defaultBody;
+        this._body = init.body || defaultBody;
     }
     Object.defineProperty(IsomorphicRequest.prototype, "bodyUsed", {
         get: function () {
@@ -74,7 +74,7 @@ var IsomorphicRequest = /** @class */ (function () {
             return __generator(this, function (_a) {
                 outvariant_1.invariant(!this.bodyUsed, 'Failed to execute "text" on "IsomorphicRequest": body buffer already read');
                 this._bodyUsed = true;
-                return [2 /*return*/, bufferUtils_1.decodeBuffer(this.body)];
+                return [2 /*return*/, bufferUtils_1.decodeBuffer(this._body)];
             });
         });
     };
@@ -84,7 +84,7 @@ var IsomorphicRequest = /** @class */ (function () {
             return __generator(this, function (_a) {
                 outvariant_1.invariant(!this.bodyUsed, 'Failed to execute "json" on "IsomorphicRequest": body buffer already read');
                 this._bodyUsed = true;
-                text = bufferUtils_1.decodeBuffer(this.body);
+                text = bufferUtils_1.decodeBuffer(this._body);
                 return [2 /*return*/, JSON.parse(text)];
             });
         });
@@ -94,7 +94,7 @@ var IsomorphicRequest = /** @class */ (function () {
             return __generator(this, function (_a) {
                 outvariant_1.invariant(!this.bodyUsed, 'Failed to execute "arrayBuffer" on "IsomorphicRequest": body buffer already read');
                 this._bodyUsed = true;
-                return [2 /*return*/, this.body];
+                return [2 /*return*/, this._body];
             });
         });
     };

package/lib/IsomorphicRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"IsomorphicRequest.js","sourceRoot":"","sources":["../src/IsomorphicRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,yCAAsC;AACtC,mDAAkD;AAClD,qCAAqC;AASrC;IAaE,2BAAY,KAA8B,EAAE,IAAsB;QAAtB,qBAAA,EAAA,SAAsB;QAChE,IAAM,WAAW,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QAEtB,IAAI,KAAK,YAAY,iBAAiB,EAAE;YACtC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAA;YAClB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAA;YACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;YAC5B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;YACpC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,WAAW,CAAA;YACrC,OAAM;SACP;QAED,IAAI,CAAC,EAAE,GAAG,aAAM,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,aAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,aAAa,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,CAAA;IACtC,CAAC;IAED,sBAAW,uCAAQ;aAAnB;YACE,OAAO,IAAI,CAAC,SAAS,CAAA;QACvB,CAAC;;;OAAA;IAEY,gCAAI,GAAjB;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,2EAA2E,CAC5E,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACrB,sBAAO,0BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;;KAC/B;IAEY,gCAAI,GAAjB;;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,2EAA2E,CAC5E,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACf,IAAI,GAAG,0BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACpC,sBAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAA;;;KACxB;IAEY,uCAAW,GAAxB;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,kFAAkF,CACnF,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACrB,sBAAO,IAAI,CAAC,IAAI,EAAA;;;KACjB;IAEM,iCAAK,GAAZ;QACE,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IACH,wBAAC;AAAD,CAAC,AAzED,IAyEC;AAzEY,8CAAiB"}
+{"version":3,"file":"IsomorphicRequest.js","sourceRoot":"","sources":["../src/IsomorphicRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,yCAAsC;AACtC,mDAAkD;AAClD,qCAAqC;AASrC;IAaE,2BAAY,KAA8B,EAAE,IAAsB;QAAtB,qBAAA,EAAA,SAAsB;QAChE,IAAM,WAAW,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QAEtB,IAAI,KAAK,YAAY,iBAAiB,EAAE;YACtC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAA;YAClB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAA;YACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;YAC5B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;YACpC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,WAAW,CAAA;YACvC,OAAM;SACP;QAED,IAAI,CAAC,EAAE,GAAG,aAAM,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,aAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,aAAa,CAAA;QACpD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,CAAA;IACvC,CAAC;IAED,sBAAW,uCAAQ;aAAnB;YACE,OAAO,IAAI,CAAC,SAAS,CAAA;QACvB,CAAC;;;OAAA;IAEY,gCAAI,GAAjB;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,2EAA2E,CAC5E,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACrB,sBAAO,0BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAA;;;KAChC;IAEY,gCAAI,GAAjB;;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,2EAA2E,CAC5E,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACf,IAAI,GAAG,0BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACrC,sBAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAA;;;KACxB;IAEY,uCAAW,GAAxB;;;gBACE,sBAAS,CACP,CAAC,IAAI,CAAC,QAAQ,EACd,kFAAkF,CACnF,CAAA;gBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;gBACrB,sBAAO,IAAI,CAAC,KAAK,EAAA;;;KAClB;IAEM,iCAAK,GAAZ;QACE,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IACH,wBAAC;AAAD,CAAC,AAzED,IAyEC;AAzEY,8CAAiB"}

package/lib/index.d.ts

@@ -4,3 +4,4 @@ export * from './BatchInterceptor';
 export * from './IsomorphicRequest';
 export * from './InteractiveIsomorphicRequest';
 export { getCleanUrl } from './utils/getCleanUrl';
+export { encodeBuffer, decodeBuffer } from './utils/bufferUtils';

package/lib/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCleanUrl = void 0;
+exports.decodeBuffer = exports.encodeBuffer = exports.getCleanUrl = void 0;
 __exportStar(require("./glossary"), exports);
 __exportStar(require("./Interceptor"), exports);
 __exportStar(require("./BatchInterceptor"), exports);
@@ -19,4 +19,7 @@ __exportStar(require("./InteractiveIsomorphicRequest"), exports);
 /* Utils */
 var getCleanUrl_1 = require("./utils/getCleanUrl");
 Object.defineProperty(exports, "getCleanUrl", { enumerable: true, get: function () { return getCleanUrl_1.getCleanUrl; } });
+var bufferUtils_1 = require("./utils/bufferUtils");
+Object.defineProperty(exports, "encodeBuffer", { enumerable: true, get: function () { return bufferUtils_1.encodeBuffer; } });
+Object.defineProperty(exports, "decodeBuffer", { enumerable: true, get: function () { return bufferUtils_1.decodeBuffer; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,gDAA6B;AAC7B,qDAAkC;AAClC,sDAAmC;AACnC,iEAA8C;AAE9C,WAAW;AACX,mDAAiD;AAAxC,0GAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,gDAA6B;AAC7B,qDAAkC;AAClC,sDAAmC;AACnC,iEAA8C;AAE9C,WAAW;AACX,mDAAiD;AAAxC,0GAAA,WAAW,OAAA;AACpB,mDAAgE;AAAvD,2GAAA,YAAY,OAAA;AAAE,2GAAA,YAAY,OAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.17.0",
+  "version": "0.17.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "author": "Artem Zakharchenko",
@@ -67,6 +67,7 @@
   },
   "dependencies": {
     "@open-draft/until": "^1.0.3",
+    "@types/debug": "^4.1.7",
     "@xmldom/xmldom": "^0.7.5",
     "debug": "^4.3.3",
     "headers-polyfill": "^3.0.4",

package/src/IsomorphicRequest.test.ts

@@ -82,20 +82,18 @@ it('returns a copy of isomorphic request instance', () => {
 
   expect(request.id).toBe(derivedRequest.id)
   expect(request.url.href).toBe(derivedRequest.url.href)
-  expect(request['body']).toEqual(derivedRequest['body'])
+  expect(request['_body']).toEqual(derivedRequest['_body'])
   expect(request.headers).toEqual(derivedRequest.headers)
   expect(request.method).toBe(derivedRequest.method)
   expect(request.credentials).toBe(derivedRequest.credentials)
   expect(request.bodyUsed).toBe(false)
 })
 
-it('clones current isomorphic request instance', async () => {
+it('clones current isomorphic request instance', () => {
   const request = new IsomorphicRequest(url, {
     body,
     headers: { foo: 'bar' },
   })
-  await request.text()
-
   const clonedRequest = request.clone()
 
   expect(clonedRequest.id).toBe(request.id)
@@ -103,6 +101,6 @@ it('clones current isomorphic request instance', async () => {
   expect(clonedRequest.url.href).toBe(request.url.href)
   expect(clonedRequest.headers).toEqual(request.headers)
   expect(clonedRequest.credentials).toBe(request.credentials)
-  expect(clonedRequest['body']).toEqual(request['body'])
+  expect(clonedRequest['_body']).toEqual(request['_body'])
   expect(clonedRequest.bodyUsed).toBe(false)
 })

package/src/IsomorphicRequest.ts

@@ -17,7 +17,7 @@ export class IsomorphicRequest {
   public readonly headers: Headers
   public readonly credentials: RequestCredentials
 
-  private readonly body: ArrayBuffer
+  private readonly _body: ArrayBuffer
   private _bodyUsed: boolean
 
   constructor(url: URL)
@@ -33,7 +33,7 @@ export class IsomorphicRequest {
       this.method = input.method
       this.headers = input.headers
       this.credentials = input.credentials
-      this.body = input.body || defaultBody
+      this._body = input._body || defaultBody
       return
     }
 
@@ -42,7 +42,7 @@ export class IsomorphicRequest {
     this.method = init.method || 'GET'
     this.headers = new Headers(init.headers)
     this.credentials = init.credentials || 'same-origin'
-    this.body = init.body || defaultBody
+    this._body = init.body || defaultBody
   }
 
   public get bodyUsed(): boolean {
@@ -56,7 +56,7 @@ export class IsomorphicRequest {
     )
 
     this._bodyUsed = true
-    return decodeBuffer(this.body)
+    return decodeBuffer(this._body)
   }
 
   public async json<T = any>(): Promise<T> {
@@ -66,7 +66,7 @@ export class IsomorphicRequest {
     )
 
     this._bodyUsed = true
-    const text = decodeBuffer(this.body)
+    const text = decodeBuffer(this._body)
     return JSON.parse(text)
   }
 
@@ -77,7 +77,7 @@ export class IsomorphicRequest {
     )
 
     this._bodyUsed = true
-    return this.body
+    return this._body
   }
 
   public clone(): IsomorphicRequest {

package/src/index.ts

@@ -6,3 +6,4 @@ export * from './InteractiveIsomorphicRequest'
 
 /* Utils */
 export { getCleanUrl } from './utils/getCleanUrl'
+export { encodeBuffer, decodeBuffer } from './utils/bufferUtils'