msw 2.14.3 → 2.14.4

package/lib/iife/index.js

@@ -16166,7 +16166,9 @@ ${operationTypes.join("\n")}
     resolver;
     resolverIterator;
     resolverIteratorResult;
+    resolverIteratorCleanups;
     options;
+    scheduledCleanups;
     info;
     /**
      * Indicates whether this request handler has been used
@@ -16176,6 +16178,7 @@ ${operationTypes.join("\n")}
     constructor(args) {
       this.resolver = args.resolver;
       this.options = args.options;
+      this.scheduledCleanups = /* @__PURE__ */ new Map();
       const callFrame = getCallFrame(new Error());
       this.info = {
         ...args.info,
@@ -16190,9 +16193,11 @@ ${operationTypes.join("\n")}
      * from a clean state.
      */
     reset() {
+      this.scheduledCleanups.clear();
       const iterator = this.resolverIterator;
       this.resolverIterator = void 0;
       this.resolverIteratorResult = void 0;
+      this.resolverIteratorCleanups = void 0;
       if (typeof iterator?.return === "function") {
         void Promise.resolve(iterator.return());
       }
@@ -16278,8 +16283,20 @@ ${operationTypes.join("\n")}
         request: args.request,
         parsedResult
       });
+      const listenerController = new AbortController();
+      args.request.signal.addEventListener(
+        "abort",
+        () => this.runScheduledCleanups(args.requestId),
+        {
+          once: true,
+          signal: listenerController.signal
+        }
+      );
       const mockedResponsePromise = executeResolver({
         ...resolverExtras,
+        finalize: (callback) => {
+          this.scheduleCleanup(args.requestId, callback);
+        },
         requestId: args.requestId,
         request: args.request
       }).catch((errorOrResponse) => {
@@ -16287,6 +16304,8 @@ ${operationTypes.join("\n")}
           return errorOrResponse;
         }
         throw errorOrResponse;
+      }).finally(() => {
+        listenerController.abort();
       });
       const mockedResponse = await mockedResponsePromise;
       if (mockedResponse) {
@@ -16305,10 +16324,22 @@ ${operationTypes.join("\n")}
     wrapResolver(resolver) {
       return async (info) => {
         if (!this.resolverIterator) {
-          const result = await resolver(info);
+          let result;
+          try {
+            result = await resolver(info);
+          } catch (error3) {
+            await this.runScheduledCleanups(info.requestId);
+            throw error3;
+          }
           if (!isIterable(result)) {
+            await this.runScheduledCleanups(info.requestId);
             return result;
           }
+          const existingCleanups = this.scheduledCleanups.get(info.requestId);
+          if (existingCleanups != null && existingCleanups.length > 0) {
+            this.resolverIteratorCleanups = existingCleanups;
+            this.scheduledCleanups.delete(info.requestId);
+          }
           this.resolverIterator = Symbol.iterator in result ? result[Symbol.iterator]() : result[Symbol.asyncIterator]();
         }
         this.isUsed = false;
@@ -16319,6 +16350,7 @@ ${operationTypes.join("\n")}
         }
         if (done) {
           this.isUsed = true;
+          await this.runScheduledCleanups(info.requestId);
           return this.resolverIteratorResult?.clone();
         }
         return nextResponse;
@@ -16333,6 +16365,54 @@ ${operationTypes.join("\n")}
         parsedResult: args.parsedResult
       };
     }
+    scheduleCleanup(requestId, callback) {
+      if (this.resolverIterator) {
+        ;
+        (this.resolverIteratorCleanups ||= []).unshift(callback);
+        return;
+      }
+      const cleanups = this.scheduledCleanups.get(requestId) || [];
+      cleanups.unshift(callback);
+      this.scheduledCleanups.set(requestId, cleanups);
+    }
+    async exhaustCleanups(cleanups) {
+      const errors = [];
+      for (const cleanup of cleanups) {
+        try {
+          await cleanup();
+        } catch (error3) {
+          if (error3 instanceof Error) {
+            errors.push(error3);
+          }
+        }
+      }
+      if (errors.length > 0) {
+        devUtils.error(
+          'Failed to execute cleanup for request handler "%s"',
+          this.info.header,
+          new AggregateError(
+            errors,
+            `Failed to execute cleanup for request handler "${this.info.header}"`
+          )
+        );
+      }
+    }
+    async runScheduledCleanups(requestId) {
+      if (this.resolverIterator && this.resolverIteratorCleanups != null && this.resolverIteratorCleanups.length > 0) {
+        try {
+          await this.exhaustCleanups(this.resolverIteratorCleanups);
+        } finally {
+          this.resolverIteratorCleanups = void 0;
+        }
+        return;
+      }
+      const cleanups = this.scheduledCleanups.get(requestId);
+      if (!cleanups || cleanups.length == 0) {
+        return;
+      }
+      await this.exhaustCleanups(cleanups);
+      this.scheduledCleanups.delete(requestId);
+    }
   };
   function forwardResponseCookies(response) {
     if (typeof document === "undefined") {