@mswjs/interceptors 0.22.9 → 0.22.11

package/lib/browser/{Interceptor-c794917d.d.ts → Interceptor-c8fc448a.d.ts}

@@ -1,5 +1,5 @@
+import { Logger } from '@open-draft/logger';
 import { EventMap, Emitter, Listener } from 'strict-event-emitter';
-import { Debugger } from 'debug';
 
 type AnyFunction = (...args: any[]) => any;
 type LazyCallbackReturnType<FnType extends AnyFunction> = Parameters<FnType> | [];
@@ -30,7 +30,7 @@ declare enum AsyncEventEmitterReadyState {
 }
 declare class AsyncEventEmitter<Events extends EventMap> extends Emitter<Events> {
     readyState: AsyncEventEmitterReadyState;
-    private log;
+    private logger;
     protected queue: Map<keyof Events, Array<QueueItem<Events[any]>>>;
     constructor();
     on<EventName extends keyof Events>(eventName: EventName, listener: Listener<any>): this;
@@ -69,7 +69,7 @@ declare class Interceptor<Events extends InterceptorEventMap> {
     private readonly symbol;
     protected emitter: AsyncEventEmitter<Events>;
     protected subscriptions: Array<InterceptorSubscription>;
-    protected log: Debugger;
+    protected logger: Logger;
     readyState: InterceptorReadyState;
     constructor(symbol: symbol);
     /**

package/lib/browser/{chunk-GL6Y4E24.mjs → chunk-4W72RMFC.mjs}

@@ -5,7 +5,7 @@ import {
 import {
   IS_PATCHED_MODULE,
   Interceptor
-} from "./chunk-2GVXYEMC.mjs";
+} from "./chunk-O7B67YBY.mjs";
 
 // src/interceptors/fetch/index.ts
 import { invariant } from "outvariant";
@@ -24,37 +24,39 @@ var _FetchInterceptor = class extends Interceptor {
       'Failed to patch the "fetch" module: already patched.'
     );
     globalThis.fetch = async (input, init) => {
+      var _a;
       const requestId = uuidv4();
       const request = new Request(input, init);
-      this.log("[%s] %s", request.method, request.url);
+      this.logger.info("[%s] %s", request.method, request.url);
       const interactiveRequest = toInteractiveRequest(request);
-      this.log(
+      this.logger.info(
         'emitting the "request" event for %d listener(s)...',
         this.emitter.listenerCount("request")
       );
       this.emitter.emit("request", interactiveRequest, requestId);
-      this.log("awaiting for the mocked response...");
-      const [middlewareException, mockedResponse] = await until(async () => {
+      this.logger.info("awaiting for the mocked response...");
+      const resolverResult = await until(async () => {
         await this.emitter.untilIdle(
           "request",
           ({ args: [, pendingRequestId] }) => {
             return pendingRequestId === requestId;
           }
         );
-        this.log("all request listeners have been resolved!");
+        this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
-        this.log("event.respondWith called with:", mockedResponse2);
+        this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
-      if (middlewareException) {
+      if (resolverResult.error) {
         console.error(`${request.method} ${request.url} net::ERR_FAILED`);
         const error = Object.assign(new TypeError("Failed to fetch"), {
-          cause: middlewareException
+          cause: resolverResult.error
         });
         return Promise.reject(error);
       }
-      if (mockedResponse) {
-        this.log("received mocked response:", mockedResponse);
+      const mockedResponse = resolverResult.data;
+      if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
+        this.logger.info("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();
         this.emitter.emit(
           "response",
@@ -71,10 +73,10 @@ var _FetchInterceptor = class extends Interceptor {
         });
         return response;
       }
-      this.log("no mocked response received!");
+      this.logger.info("no mocked response received!");
       return pureFetch(request).then((response) => {
         const responseClone = response.clone();
-        this.log("original fetch performed", responseClone);
+        this.logger.info("original fetch performed", responseClone);
         this.emitter.emit(
           "response",
           responseClone,
@@ -94,7 +96,10 @@ var _FetchInterceptor = class extends Interceptor {
         value: void 0
       });
       globalThis.fetch = pureFetch;
-      this.log('restored native "globalThis.fetch"!', globalThis.fetch.name);
+      this.logger.info(
+        'restored native "globalThis.fetch"!',
+        globalThis.fetch.name
+      );
     });
   }
 };

package/lib/browser/{chunk-OK5YCL7L.js → chunk-ECRLBCQN.js}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __getOwnPropNames = Object.getOwnPropertyNames;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -6,7 +6,11 @@ var __commonJS = (cb, mod) => function __require() {
 // src/glossary.ts
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 
+// src/Interceptor.ts
+var _logger = require('@open-draft/logger');
+
 // src/utils/AsyncEventEmitter.ts
+
 var _stricteventemitter = require('strict-event-emitter');
 
 // src/utils/nextTick.ts
@@ -14,37 +18,33 @@ function nextTick(callback) {
   setTimeout(callback, 0);
 }
 
-// src/utils/debug.ts
-var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
-var debug = _debug2.default;
-
 // src/utils/AsyncEventEmitter.ts
 var AsyncEventEmitter = class extends _stricteventemitter.Emitter {
   constructor() {
     super();
-    this.log = debug("async-event-emitter");
+    this.logger = new (0, _logger.Logger)("async-event-emitter");
     this.queue = /* @__PURE__ */ new Map();
     this.readyState = "ACTIVE" /* ACTIVE */;
   }
   on(eventName, listener) {
-    const log = this.log.extend("on");
-    log('adding "%s" listener...', eventName);
+    const logger = this.logger.extend("on");
+    logger.info('adding "%s" listener...', eventName);
     if (this.readyState === "DEACTIVATED" /* DEACTIVATED */) {
-      log("the emitter is destroyed, skipping!");
+      logger.info("the emitter is destroyed, skipping!");
       return this;
     }
     return super.on(eventName, async (...args) => {
       const queue = this.openListenerQueue(eventName);
-      log('awaiting the "%s" listener...', eventName);
+      logger.info('awaiting the "%s" listener...', eventName);
       queue.push({
         args,
         done: new Promise(async (resolve, reject) => {
           try {
             await listener(...args);
             resolve();
-            log('"%s" listener has resolved!', eventName);
+            logger.info('"%s" listener has resolved!', eventName);
           } catch (error) {
-            log('"%s" listener has rejected!', error);
+            logger.info('"%s" listener has rejected!', error);
             reject(error);
           }
         })
@@ -52,21 +52,21 @@ var AsyncEventEmitter = class extends _stricteventemitter.Emitter {
     });
   }
   emit(eventName, ...data) {
-    const log = this.log.extend("emit");
-    log('emitting "%s" event...', eventName);
+    const logger = this.logger.extend("emit");
+    logger.info('emitting "%s" event...', eventName);
     if (this.readyState === "DEACTIVATED" /* DEACTIVATED */) {
-      log("the emitter is destroyed, skipping!");
+      logger.info("the emitter is destroyed, skipping!");
       return false;
     }
     if (this.isInternalEventName(eventName)) {
       return super.emit(eventName, ...data);
     }
     this.openListenerQueue(eventName);
-    log('appending a one-time cleanup "%s" listener...', eventName);
+    logger.info('appending a one-time cleanup "%s" listener...', eventName);
     this.once(eventName, () => {
       nextTick(() => {
         this.queue.delete(eventName);
-        log('cleaned up "%s" listeners queue!', eventName);
+        logger.info('cleaned up "%s" listeners queue!', eventName);
       });
     });
     return super.emit(eventName, ...data);
@@ -80,44 +80,44 @@ var AsyncEventEmitter = class extends _stricteventemitter.Emitter {
     });
   }
   openListenerQueue(eventName) {
-    const log = this.log.extend("openListenerQueue");
-    log('opening "%s" listeners queue...', eventName);
+    const logger = this.logger.extend("openListenerQueue");
+    logger.info('opening "%s" listeners queue...', eventName);
     const queue = this.queue.get(eventName);
     if (!queue) {
-      log("no queue found, creating one...");
+      logger.info("no queue found, creating one...");
       this.queue.set(eventName, []);
       return [];
     }
-    log("returning an exising queue:", queue);
+    logger.info("returning an exising queue:", queue);
     return queue;
   }
   removeAllListeners(eventName) {
-    const log = this.log.extend("removeAllListeners");
-    log("event:", eventName);
+    const logger = this.logger.extend("removeAllListeners");
+    logger.info("event:", eventName);
     if (eventName) {
       this.queue.delete(eventName);
-      log(
+      logger.info(
         'cleared the "%s" listeners queue!',
         eventName,
         this.queue.get(eventName)
       );
     } else {
       this.queue.clear();
-      log("cleared the listeners queue!", this.queue);
+      logger.info("cleared the listeners queue!", this.queue);
     }
     return super.removeAllListeners(eventName);
   }
   activate() {
-    const log = this.log.extend("activate");
+    const logger = this.logger.extend("activate");
     this.readyState = "ACTIVE" /* ACTIVE */;
-    log("set state to:", this.readyState);
+    logger.info("set state to:", this.readyState);
   }
   deactivate() {
-    const log = this.log.extend("deactivate");
-    log("removing all listeners...");
+    const logger = this.logger.extend("deactivate");
+    logger.info("removing all listeners...");
     this.removeAllListeners();
     this.readyState = "DEACTIVATED" /* DEACTIVATED */;
-    log("set state to:", this.readyState);
+    logger.info("set state to:", this.readyState);
   }
   isInternalEventName(eventName) {
     return eventName === "newListener" || eventName === "removeListener";
@@ -148,37 +148,37 @@ var Interceptor = class {
     this.readyState = "INACTIVE" /* INACTIVE */;
     this.emitter = new AsyncEventEmitter();
     this.subscriptions = [];
-    this.log = debug(symbol.description);
+    this.logger = new (0, _logger.Logger)(symbol.description);
     this.emitter.setMaxListeners(0);
-    this.log("constructing the interceptor...");
+    this.logger.info("constructing the interceptor...");
   }
   checkEnvironment() {
     return true;
   }
   apply() {
-    const log = this.log.extend("apply");
-    log("applying the interceptor...");
+    const logger = this.logger.extend("apply");
+    logger.info("applying the interceptor...");
     if (this.readyState === "APPLIED" /* APPLIED */) {
-      log("intercepted already applied!");
+      logger.info("intercepted already applied!");
       return;
     }
     const shouldApply = this.checkEnvironment();
     if (!shouldApply) {
-      log("the interceptor cannot be applied in this environment!");
+      logger.info("the interceptor cannot be applied in this environment!");
       return;
     }
     this.readyState = "APPLYING" /* APPLYING */;
     this.emitter.activate();
-    log("activated the emiter!", this.emitter.readyState);
+    logger.info("activated the emiter!", this.emitter.readyState);
     const runningInstance = this.getInstance();
     if (runningInstance) {
-      log("found a running instance, reusing...");
+      logger.info("found a running instance, reusing...");
       this.on = (event, listener) => {
-        log('proxying the "%s" listener', event);
+        logger.info('proxying the "%s" listener', event);
         runningInstance.emitter.addListener(event, listener);
         this.subscriptions.push(() => {
           runningInstance.emitter.removeListener(event, listener);
-          log('removed proxied "%s" listener!', event);
+          logger.info('removed proxied "%s" listener!', event);
         });
       };
       nextTick(() => {
@@ -186,7 +186,7 @@ var Interceptor = class {
       });
       return;
     }
-    log("no running instance found, setting up a new instance...");
+    logger.info("no running instance found, setting up a new instance...");
     this.setup();
     this.setInstance();
     nextTick(() => {
@@ -196,38 +196,38 @@ var Interceptor = class {
   setup() {
   }
   on(eventName, listener) {
-    const log = this.log.extend("on");
+    const logger = this.logger.extend("on");
     if (this.readyState === "DISPOSING" /* DISPOSING */ || this.readyState === "DISPOSED" /* DISPOSED */) {
-      log("cannot listen to events, already disposed!");
+      logger.info("cannot listen to events, already disposed!");
       return;
     }
-    log('adding "%s" event listener:', eventName, listener.name);
+    logger.info('adding "%s" event listener:', eventName, listener.name);
     this.emitter.on(eventName, listener);
   }
   dispose() {
-    const log = this.log.extend("dispose");
+    const logger = this.logger.extend("dispose");
     if (this.readyState === "DISPOSED" /* DISPOSED */) {
-      log("cannot dispose, already disposed!");
+      logger.info("cannot dispose, already disposed!");
       return;
     }
-    log("disposing the interceptor...");
+    logger.info("disposing the interceptor...");
     this.readyState = "DISPOSING" /* DISPOSING */;
     if (!this.getInstance()) {
-      log("no interceptors running, skipping dispose...");
+      logger.info("no interceptors running, skipping dispose...");
       return;
     }
     this.clearInstance();
-    log("global symbol deleted:", getGlobalSymbol(this.symbol));
+    logger.info("global symbol deleted:", getGlobalSymbol(this.symbol));
     if (this.subscriptions.length > 0) {
-      log("disposing of %d subscriptions...", this.subscriptions.length);
+      logger.info("disposing of %d subscriptions...", this.subscriptions.length);
       for (const dispose of this.subscriptions) {
         dispose();
       }
       this.subscriptions = [];
-      log("disposed of all subscriptions!", this.subscriptions.length);
+      logger.info("disposed of all subscriptions!", this.subscriptions.length);
     }
     this.emitter.deactivate();
-    log("destroyed the listener!");
+    logger.info("destroyed the listener!");
     nextTick(() => {
       this.readyState = "DISPOSED" /* DISPOSED */;
     });
@@ -235,16 +235,16 @@ var Interceptor = class {
   getInstance() {
     var _a;
     const instance = getGlobalSymbol(this.symbol);
-    this.log("retrieved global instance:", (_a = instance == null ? void 0 : instance.constructor) == null ? void 0 : _a.name);
+    this.logger.info("retrieved global instance:", (_a = instance == null ? void 0 : instance.constructor) == null ? void 0 : _a.name);
     return instance;
   }
   setInstance() {
     setGlobalSymbol(this.symbol, this);
-    this.log("set global instance!", this.symbol.description);
+    this.logger.info("set global instance!", this.symbol.description);
   }
   clearInstance() {
     deleteGlobalSymbol(this.symbol);
-    this.log("cleared global instance!", this.symbol.description);
+    this.logger.info("cleared global instance!", this.symbol.description);
   }
 };
 

package/lib/browser/{chunk-2Z7B3HL5.js → chunk-EGQUVEJ3.js}

@@ -5,12 +5,12 @@ var _chunkPCFJD76Xjs = require('./chunk-PCFJD76X.js');
 
 
 
-var _chunkOK5YCL7Ljs = require('./chunk-OK5YCL7L.js');
+var _chunkECRLBCQNjs = require('./chunk-ECRLBCQN.js');
 
 // src/interceptors/fetch/index.ts
 var _outvariant = require('outvariant');
 var _until = require('@open-draft/until');
-var _FetchInterceptor = class extends _chunkOK5YCL7Ljs.Interceptor {
+var _FetchInterceptor = class extends _chunkECRLBCQNjs.Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
   }
@@ -20,41 +20,43 @@ var _FetchInterceptor = class extends _chunkOK5YCL7Ljs.Interceptor {
   setup() {
     const pureFetch = globalThis.fetch;
     _outvariant.invariant.call(void 0, 
-      !pureFetch[_chunkOK5YCL7Ljs.IS_PATCHED_MODULE],
+      !pureFetch[_chunkECRLBCQNjs.IS_PATCHED_MODULE],
       'Failed to patch the "fetch" module: already patched.'
     );
     globalThis.fetch = async (input, init) => {
+      var _a;
       const requestId = _chunkPCFJD76Xjs.uuidv4.call(void 0, );
       const request = new Request(input, init);
-      this.log("[%s] %s", request.method, request.url);
+      this.logger.info("[%s] %s", request.method, request.url);
       const interactiveRequest = _chunkPCFJD76Xjs.toInteractiveRequest.call(void 0, request);
-      this.log(
+      this.logger.info(
         'emitting the "request" event for %d listener(s)...',
         this.emitter.listenerCount("request")
       );
       this.emitter.emit("request", interactiveRequest, requestId);
-      this.log("awaiting for the mocked response...");
-      const [middlewareException, mockedResponse] = await _until.until.call(void 0, async () => {
+      this.logger.info("awaiting for the mocked response...");
+      const resolverResult = await _until.until.call(void 0, async () => {
         await this.emitter.untilIdle(
           "request",
           ({ args: [, pendingRequestId] }) => {
             return pendingRequestId === requestId;
           }
         );
-        this.log("all request listeners have been resolved!");
+        this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
-        this.log("event.respondWith called with:", mockedResponse2);
+        this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
-      if (middlewareException) {
+      if (resolverResult.error) {
         console.error(`${request.method} ${request.url} net::ERR_FAILED`);
         const error = Object.assign(new TypeError("Failed to fetch"), {
-          cause: middlewareException
+          cause: resolverResult.error
         });
         return Promise.reject(error);
       }
-      if (mockedResponse) {
-        this.log("received mocked response:", mockedResponse);
+      const mockedResponse = resolverResult.data;
+      if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
+        this.logger.info("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();
         this.emitter.emit(
           "response",
@@ -71,10 +73,10 @@ var _FetchInterceptor = class extends _chunkOK5YCL7Ljs.Interceptor {
         });
         return response;
       }
-      this.log("no mocked response received!");
+      this.logger.info("no mocked response received!");
       return pureFetch(request).then((response) => {
         const responseClone = response.clone();
-        this.log("original fetch performed", responseClone);
+        this.logger.info("original fetch performed", responseClone);
         this.emitter.emit(
           "response",
           responseClone,
@@ -84,17 +86,20 @@ var _FetchInterceptor = class extends _chunkOK5YCL7Ljs.Interceptor {
         return response;
       });
     };
-    Object.defineProperty(globalThis.fetch, _chunkOK5YCL7Ljs.IS_PATCHED_MODULE, {
+    Object.defineProperty(globalThis.fetch, _chunkECRLBCQNjs.IS_PATCHED_MODULE, {
       enumerable: true,
       configurable: true,
       value: true
     });
     this.subscriptions.push(() => {
-      Object.defineProperty(globalThis.fetch, _chunkOK5YCL7Ljs.IS_PATCHED_MODULE, {
+      Object.defineProperty(globalThis.fetch, _chunkECRLBCQNjs.IS_PATCHED_MODULE, {
         value: void 0
       });
       globalThis.fetch = pureFetch;
-      this.log('restored native "globalThis.fetch"!', globalThis.fetch.name);
+      this.logger.info(
+        'restored native "globalThis.fetch"!',
+        globalThis.fetch.name
+      );
     });
   }
 };