msw 0.0.0-fetch.rc-14 → 0.0.0-fetch.rc-16

package/lib/mockServiceWorker.js

@@ -2,13 +2,14 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.0.0-fetch.rc-14).
+ * Mock Service Worker (0.0.0-fetch.rc-16).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.
  */
 
-const INTEGRITY_CHECKSUM = 'b24acb1451c726c44a3a37a0b8092d67'
+const INTEGRITY_CHECKSUM = '42fb047ce943b9103a6ed499f86548c4'
+const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
 self.addEventListener('install', function () {
@@ -154,6 +155,7 @@ async function handleRequest(event, requestId) {
           type: 'RESPONSE',
           payload: {
             requestId,
+            isMockedResponse: IS_MOCKED_RESPONSE in response,
             type: responseClone.type,
             status: responseClone.status,
             statusText: responseClone.statusText,
@@ -302,5 +304,20 @@ function sendToClient(client, message, transferrables = []) {
 }
 
 async function respondWithMock(response) {
-  return new Response(response.body, response)
+  // Setting response status code to 0 is a no-op.
+  // However, when responding with a "Response.error()", the produced Response
+  // instance will have status code set to 0. Since it's not possible to create
+  // a Response instance with status code 0, handle that use-case separately.
+  if (response.status === 0) {
+    return Response.error()
+  }
+
+  const mockedResponse = new Response(response.body, response)
+
+  Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
+    value: true,
+    enumerable: true,
+  })
+
+  return mockedResponse
 }

package/lib/native/index.d.ts

@@ -35,11 +35,6 @@ interface SetupServer {
      * @see {@link https://mswjs.io/docs/api/setup-server/list-handlers `server.listHandlers()`}
      */
     listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>;
-    /**
-     * Lists all active request handlers.
-     * @see {@link https://mswjs.io/docs/api/setup-server/print-handlers `server.print-handlers()`}
-     */
-    printHandlers(): void;
     events: LifeCycleEventEmitter<LifeCycleEventsMap>;
 }
 
@@ -54,7 +49,6 @@ declare class SetupServerApi extends SetupApi<LifeCycleEventsMap> implements Set
      */
     private init;
     listen(options?: Partial<SharedOptions>): void;
-    printHandlers(): void;
     close(): void;
 }
 

package/lib/native/index.js

@@ -69,7 +69,7 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
-    this.interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+    this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
       const response = yield (0, import_handleRequest.handleRequest)(
         request,
         requestId,
@@ -82,13 +82,19 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
       }
       return;
     }));
-    this.interceptor.on("response", (response, request, requestId) => {
-      if (response.headers.get("x-powered-by") === "msw") {
-        this.emitter.emit("response:mocked", response, request, requestId);
-      } else {
-        this.emitter.emit("response:bypass", response, request, requestId);
+    this.interceptor.on(
+      "response",
+      ({ response, isMockedResponse, request, requestId }) => {
+        this.emitter.emit(
+          isMockedResponse ? "response:mocked" : "response:bypass",
+          {
+            response,
+            request,
+            requestId
+          }
+        );
       }
-    });
+    );
   }
   listen(options = {}) {
     this.resolvedOptions = (0, import_mergeRight.mergeRight)(
@@ -109,16 +115,6 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
       "https://github.com/mswjs/msw/issues/new/choose"
     );
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.log(`${`${pragma} ${header}`}
-  Declaration: ${callFrame}
-`);
-    });
-  }
   close() {
     this.dispose();
   }

package/lib/native/index.mjs

@@ -49,7 +49,7 @@ var SetupServerApi = class extends SetupApi {
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
-    this.interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+    this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
       const response = yield handleRequest(
         request,
         requestId,
@@ -62,13 +62,19 @@ var SetupServerApi = class extends SetupApi {
       }
       return;
     }));
-    this.interceptor.on("response", (response, request, requestId) => {
-      if (response.headers.get("x-powered-by") === "msw") {
-        this.emitter.emit("response:mocked", response, request, requestId);
-      } else {
-        this.emitter.emit("response:bypass", response, request, requestId);
+    this.interceptor.on(
+      "response",
+      ({ response, isMockedResponse, request, requestId }) => {
+        this.emitter.emit(
+          isMockedResponse ? "response:mocked" : "response:bypass",
+          {
+            response,
+            request,
+            requestId
+          }
+        );
       }
-    });
+    );
   }
   listen(options = {}) {
     this.resolvedOptions = mergeRight(
@@ -89,16 +95,6 @@ var SetupServerApi = class extends SetupApi {
       "https://github.com/mswjs/msw/issues/new/choose"
     );
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.log(`${`${pragma} ${header}`}
-  Declaration: ${callFrame}
-`);
-    });
-  }
   close() {
     this.dispose();
   }

package/lib/node/index.d.ts

@@ -35,11 +35,6 @@ interface SetupServer {
      * @see {@link https://mswjs.io/docs/api/setup-server/list-handlers `server.listHandlers()`}
      */
     listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>;
-    /**
-     * Lists all active request handlers.
-     * @see {@link https://mswjs.io/docs/api/setup-server/print-handlers `server.print-handlers()`}
-     */
-    printHandlers(): void;
     events: LifeCycleEventEmitter<LifeCycleEventsMap>;
 }
 
@@ -54,7 +49,6 @@ declare class SetupServerApi extends SetupApi<LifeCycleEventsMap> implements Set
      */
     private init;
     listen(options?: Partial<SharedOptions>): void;
-    printHandlers(): void;
     close(): void;
 }
 

package/lib/node/index.js

@@ -69,7 +69,7 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
-    this.interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+    this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
       const response = yield (0, import_handleRequest.handleRequest)(
         request,
         requestId,
@@ -82,13 +82,19 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
       }
       return;
     }));
-    this.interceptor.on("response", (response, request, requestId) => {
-      if (response.headers.get("x-powered-by") === "msw") {
-        this.emitter.emit("response:mocked", response, request, requestId);
-      } else {
-        this.emitter.emit("response:bypass", response, request, requestId);
+    this.interceptor.on(
+      "response",
+      ({ response, isMockedResponse, request, requestId }) => {
+        this.emitter.emit(
+          isMockedResponse ? "response:mocked" : "response:bypass",
+          {
+            response,
+            request,
+            requestId
+          }
+        );
       }
-    });
+    );
   }
   listen(options = {}) {
     this.resolvedOptions = (0, import_mergeRight.mergeRight)(
@@ -109,16 +115,6 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
       "https://github.com/mswjs/msw/issues/new/choose"
     );
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.log(`${`${pragma} ${header}`}
-  Declaration: ${callFrame}
-`);
-    });
-  }
   close() {
     this.dispose();
   }

package/lib/node/index.mjs

@@ -46,7 +46,7 @@ var SetupServerApi = class extends SetupApi {
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
-    this.interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+    this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
       const response = yield handleRequest(
         request,
         requestId,
@@ -59,13 +59,19 @@ var SetupServerApi = class extends SetupApi {
       }
       return;
     }));
-    this.interceptor.on("response", (response, request, requestId) => {
-      if (response.headers.get("x-powered-by") === "msw") {
-        this.emitter.emit("response:mocked", response, request, requestId);
-      } else {
-        this.emitter.emit("response:bypass", response, request, requestId);
+    this.interceptor.on(
+      "response",
+      ({ response, isMockedResponse, request, requestId }) => {
+        this.emitter.emit(
+          isMockedResponse ? "response:mocked" : "response:bypass",
+          {
+            response,
+            request,
+            requestId
+          }
+        );
       }
-    });
+    );
   }
   listen(options = {}) {
     this.resolvedOptions = mergeRight(
@@ -86,16 +92,6 @@ var SetupServerApi = class extends SetupApi {
       "https://github.com/mswjs/msw/issues/new/choose"
     );
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.log(`${`${pragma} ${header}`}
-  Declaration: ${callFrame}
-`);
-    });
-  }
   close() {
     this.dispose();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.0.0-fetch.rc-14",
+  "version": "0.0.0-fetch.rc-16",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -113,7 +113,7 @@
     "@bundled-es-modules/js-levenshtein": "^2.0.1",
     "@bundled-es-modules/statuses": "^1.0.1",
     "@mswjs/cookies": "^1.0.0",
-    "@mswjs/interceptors": "^0.22.13",
+    "@mswjs/interceptors": "^0.23.0",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.4.1",
     "@types/js-levenshtein": "^1.1.1",
@@ -121,7 +121,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.4.2",
     "formdata-node": "4.4.1",
-    "graphql": "^15.0.0 || ^16.0.0",
+    "graphql": "^15.0.0 || ^16.7.0",
     "headers-polyfill": "^3.1.2",
     "inquirer": "^8.2.0",
     "is-node-process": "^1.2.0",
@@ -139,7 +139,7 @@
     "@commitlint/cli": "^16.1.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@open-draft/test-server": "^0.4.2",
-    "@ossjs/release": "^0.4.0",
+    "@ossjs/release": "^0.5.1",
     "@playwright/test": "^1.30.0",
     "@swc/core": "^1.3.35",
     "@swc/jest": "^0.2.24",
@@ -188,7 +188,7 @@
     "webpack-http-server": "^0.5.0"
   },
   "peerDependencies": {
-    "typescript": ">= 4.4.x <= 5.0.x"
+    "typescript": ">= 4.4.x <= 5.1.x"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/lib/core/rest.mjs

@@ -1,22 +0,0 @@
-import {
-  RESTMethods,
-  RestHandler
-} from './handlers/RestHandler.mjs';
-function createRestHandler(method) {
-  return (path, resolver, options = {}) => {
-    return new RestHandler(method, path, resolver, options);
-  };
-}
-const rest = {
-  all: createRestHandler(/.+/),
-  head: createRestHandler(RESTMethods.HEAD),
-  get: createRestHandler(RESTMethods.GET),
-  post: createRestHandler(RESTMethods.POST),
-  put: createRestHandler(RESTMethods.PUT),
-  delete: createRestHandler(RESTMethods.DELETE),
-  patch: createRestHandler(RESTMethods.PATCH),
-  options: createRestHandler(RESTMethods.OPTIONS)
-};
-export {
-  rest
-};