msw 0.34.0 → 0.35.0

package/lib/umd/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.34.0).
+ * Mock Service Worker (0.35.0).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

package/native/lib/index.js

@@ -2228,7 +2228,6 @@ function invariant(condition, message) {
 
 // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 var nodejsCustomInspectSymbol = typeof Symbol === 'function' && typeof Symbol.for === 'function' ? Symbol.for('nodejs.util.inspect.custom') : undefined;
-var nodejsCustomInspectSymbol$1 = nodejsCustomInspectSymbol;
 
 /**
  * The `defineInspect()` function defines `inspect()` prototype method as alias of `toJSON`
@@ -2239,8 +2238,8 @@ function defineInspect(classObject) {
   typeof fn === 'function' || invariant(0);
   classObject.prototype.inspect = fn; // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
-  if (nodejsCustomInspectSymbol$1) {
-    classObject.prototype[nodejsCustomInspectSymbol$1] = fn;
+  if (nodejsCustomInspectSymbol) {
+    classObject.prototype[nodejsCustomInspectSymbol] = fn;
   }
 }
 
@@ -2483,7 +2482,7 @@ function formatArray(array, seenValues) {
 }
 
 function getCustomFn(object) {
-  var customInspectFn = object[String(nodejsCustomInspectSymbol$1)];
+  var customInspectFn = object[String(nodejsCustomInspectSymbol)];
 
   if (typeof customInspectFn === 'function') {
     return customInspectFn;
@@ -5469,7 +5468,10 @@ function getAbsoluteUrl(path, baseUrl) {
     // Resolve a relative request URL against a given custom "baseUrl"
     // or the current location (in the case of browser/browser-like environments).
     const origin = baseUrl || (typeof location !== 'undefined' && location.origin);
-    return origin ? new URL(path, origin).href : path;
+    return origin
+        ? // Encode and decode the path to preserve escaped characters.
+            decodeURI(new URL(encodeURI(path), origin).href)
+        : path;
 }
 
 /**
@@ -5960,8 +5962,10 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
     const message = messageTemplate.join('\n\n');
     switch (strategy) {
         case 'error': {
+            // Print a developer-friendly error.
             devUtils.error('Error: %s', message);
-            break;
+            // Throw an exception to halt request processing and not perform the original request.
+            throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
         }
         case 'warn': {
             devUtils.warn('Warning: %s', message);
@@ -6028,6 +6032,23 @@ function handleRequest(request, handlers, options, emitter, handleRequestOptions
     });
 }
 
+/**
+ * Pipes all emitted events from one emitter to another.
+ */
+function pipeEvents(source, destination) {
+    const rawEmit = source.emit;
+    // @ts-ignore
+    if (rawEmit._isPiped) {
+        return;
+    }
+    source.emit = function (event, ...data) {
+        destination.emit(event, ...data);
+        return rawEmit.call(this, event, ...data);
+    };
+    // @ts-ignore
+    source.emit._isPiped = true;
+}
+
 const DEFAULT_LISTEN_OPTIONS = {
     onUnhandledRequest: 'warn',
 };
@@ -6037,6 +6058,8 @@ const DEFAULT_LISTEN_OPTIONS = {
  */
 function createSetupServer(...interceptors$1) {
     const emitter = new lib$3.StrictEventEmitter();
+    const publicEmitter = new lib$3.StrictEventEmitter();
+    pipeEvents(emitter, publicEmitter);
     return function setupServer(...requestHandlers) {
         requestHandlers.forEach((handler) => {
             if (Array.isArray(handler))
@@ -6106,11 +6129,20 @@ ${chalk.bold(`${pragma} ${header}`)}
 `);
                 });
             },
-            on(eventType, listener) {
-                emitter.addListener(eventType, listener);
+            events: {
+                on(...args) {
+                    return publicEmitter.on(...args);
+                },
+                removeListener(...args) {
+                    return publicEmitter.removeListener(...args);
+                },
+                removeAllListeners(...args) {
+                    return publicEmitter.removeAllListeners(...args);
+                },
             },
             close() {
                 emitter.removeAllListeners();
+                publicEmitter.removeAllListeners();
                 interceptor.restore();
             },
         };

package/node/lib/index.js

@@ -4114,7 +4114,6 @@ function invariant(condition, message) {
 
 // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 var nodejsCustomInspectSymbol = typeof Symbol === 'function' && typeof Symbol.for === 'function' ? Symbol.for('nodejs.util.inspect.custom') : undefined;
-var nodejsCustomInspectSymbol$1 = nodejsCustomInspectSymbol;
 
 /**
  * The `defineInspect()` function defines `inspect()` prototype method as alias of `toJSON`
@@ -4125,8 +4124,8 @@ function defineInspect(classObject) {
   typeof fn === 'function' || invariant(0);
   classObject.prototype.inspect = fn; // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
-  if (nodejsCustomInspectSymbol$1) {
-    classObject.prototype[nodejsCustomInspectSymbol$1] = fn;
+  if (nodejsCustomInspectSymbol) {
+    classObject.prototype[nodejsCustomInspectSymbol] = fn;
   }
 }
 
@@ -4369,7 +4368,7 @@ function formatArray(array, seenValues) {
 }
 
 function getCustomFn(object) {
-  var customInspectFn = object[String(nodejsCustomInspectSymbol$1)];
+  var customInspectFn = object[String(nodejsCustomInspectSymbol)];
 
   if (typeof customInspectFn === 'function') {
     return customInspectFn;
@@ -7355,7 +7354,10 @@ function getAbsoluteUrl(path, baseUrl) {
     // Resolve a relative request URL against a given custom "baseUrl"
     // or the current location (in the case of browser/browser-like environments).
     const origin = baseUrl || (typeof location !== 'undefined' && location.origin);
-    return origin ? new URL(path, origin).href : path;
+    return origin
+        ? // Encode and decode the path to preserve escaped characters.
+            decodeURI(new URL(encodeURI(path), origin).href)
+        : path;
 }
 
 /**
@@ -7846,8 +7848,10 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
     const message = messageTemplate.join('\n\n');
     switch (strategy) {
         case 'error': {
+            // Print a developer-friendly error.
             devUtils.error('Error: %s', message);
-            break;
+            // Throw an exception to halt request processing and not perform the original request.
+            throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
         }
         case 'warn': {
             devUtils.warn('Warning: %s', message);
@@ -7914,6 +7918,23 @@ function handleRequest(request, handlers, options, emitter, handleRequestOptions
     });
 }
 
+/**
+ * Pipes all emitted events from one emitter to another.
+ */
+function pipeEvents(source, destination) {
+    const rawEmit = source.emit;
+    // @ts-ignore
+    if (rawEmit._isPiped) {
+        return;
+    }
+    source.emit = function (event, ...data) {
+        destination.emit(event, ...data);
+        return rawEmit.call(this, event, ...data);
+    };
+    // @ts-ignore
+    source.emit._isPiped = true;
+}
+
 const DEFAULT_LISTEN_OPTIONS = {
     onUnhandledRequest: 'warn',
 };
@@ -7923,6 +7944,8 @@ const DEFAULT_LISTEN_OPTIONS = {
  */
 function createSetupServer(...interceptors$1) {
     const emitter = new lib$3.StrictEventEmitter();
+    const publicEmitter = new lib$3.StrictEventEmitter();
+    pipeEvents(emitter, publicEmitter);
     return function setupServer(...requestHandlers) {
         requestHandlers.forEach((handler) => {
             if (Array.isArray(handler))
@@ -7992,11 +8015,20 @@ ${source.bold(`${pragma} ${header}`)}
 `);
                 });
             },
-            on(eventType, listener) {
-                emitter.addListener(eventType, listener);
+            events: {
+                on(...args) {
+                    return publicEmitter.on(...args);
+                },
+                removeListener(...args) {
+                    return publicEmitter.removeListener(...args);
+                },
+                removeAllListeners(...args) {
+                    return publicEmitter.removeAllListeners(...args);
+                },
             },
             close() {
                 emitter.removeAllListeners();
+                publicEmitter.removeAllListeners();
                 interceptor.restore();
             },
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "lib/umd/index.js",
   "module": "lib/esm/index.js",
@@ -65,7 +65,7 @@
   "sideEffects": false,
   "dependencies": {
     "@mswjs/cookies": "^0.1.6",
-    "@mswjs/interceptors": "^0.12.5",
+    "@mswjs/interceptors": "^0.12.6",
     "@open-draft/until": "^1.0.3",
     "@types/cookie": "^0.4.1",
     "@types/inquirer": "^7.3.3",