msw 0.28.1 → 0.30.1

package/cli/init.js

@@ -1,13 +1,14 @@
 const fs = require('fs')
 const path = require('path')
 const chalk = require('chalk')
+const { until } = require('@open-draft/until')
 const inquirer = require('inquirer')
 const invariant = require('./invariant')
 const { SERVICE_WORKER_BUILD_PATH } = require('../config/constants')
 
 const CWD = process.cwd()
 
-module.exports = function init(args) {
+module.exports = async function init(args) {
   const { publicDir, save } = args
 
   // When running as a part of "postinstall" script, "cwd" equals the library's directory.
@@ -18,11 +19,18 @@ module.exports = function init(args) {
   const relativePublicDir = path.relative(CWD, absolutePublicDir)
   const dirExists = fs.existsSync(absolutePublicDir)
 
-  invariant(
-    dirExists,
-    'Failed to create a Service Worker at "%s": directory does not exist.\nMake sure to include a relative path to the root directory of your server.',
-    absolutePublicDir,
-  )
+  if (!dirExists) {
+    // Try to create the directory if it doesn't exist
+    const [createDirectoryError] = await until(() =>
+      fs.promises.mkdir(absolutePublicDir, { recursive: true }),
+    )
+    invariant(
+      createDirectoryError == null,
+      'Failed to create a Service Worker at "%s": directory does not exist and could not be created.\nMake sure to include a relative path to the root directory of your server.\n\nSee the original error below:\n%s',
+      absolutePublicDir,
+      createDirectoryError,
+    )
+  }
 
   console.log(
     'Initializing the Mock Service Worker at "%s"...',

package/lib/esm/RequestHandler-deps.js

@@ -1,4 +1,4 @@
-import { c as createCommonjsModule, a as commonjsGlobal, l as lib, j as jsonParse, s as status, b as set, d as delay, f as fetch } from './fetch-deps.js';
+import { l as lib, j as jsonParse, c as commonjsGlobal, s as status, a as set, d as delay, f as fetch } from './fetch-deps.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -37,9 +37,115 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+class NetworkError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'NetworkError';
+    }
+}
+
+function parseContentHeaders(headersString) {
+    var _a, _b;
+    const headers = lib.stringToHeaders(headersString);
+    const contentType = headers.get('content-type') || 'text/plain';
+    const disposition = headers.get('content-disposition');
+    if (!disposition) {
+        throw new Error('"Content-Disposition" header is required.');
+    }
+    const directives = disposition.split(';').reduce((acc, chunk) => {
+        const [name, ...rest] = chunk.trim().split('=');
+        acc[name] = rest.join('=');
+        return acc;
+    }, {});
+    const name = (_a = directives.name) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
+    const filename = (_b = directives.filename) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
+    return {
+        name,
+        filename,
+        contentType,
+    };
+}
+/**
+ * Parses a given string as a multipart/form-data.
+ * Does not throw an exception on an invalid multipart string.
+ */
+function parseMultipartData(data, headers) {
+    const contentType = headers === null || headers === void 0 ? void 0 : headers.get('content-type');
+    if (!contentType) {
+        return undefined;
+    }
+    const [, ...directives] = contentType.split(/; */);
+    const boundary = directives
+        .filter((d) => d.startsWith('boundary='))
+        .map((s) => s.replace(/^boundary=/, ''))[0];
+    if (!boundary) {
+        return undefined;
+    }
+    const boundaryRegExp = new RegExp(`--+${boundary}`);
+    const fields = data
+        .split(boundaryRegExp)
+        .filter((chunk) => chunk.startsWith('\r\n') && chunk.endsWith('\r\n'))
+        .map((chunk) => chunk.trimStart().replace(/\r\n$/, ''));
+    if (!fields.length) {
+        return undefined;
+    }
+    const parsedBody = {};
+    try {
+        for (const field of fields) {
+            const [contentHeaders, ...rest] = field.split('\r\n\r\n');
+            const contentBody = rest.join('\r\n\r\n');
+            const { contentType, filename, name } = parseContentHeaders(contentHeaders);
+            const value = filename === undefined
+                ? contentBody
+                : new File([contentBody], filename, { type: contentType });
+            const parsedValue = parsedBody[name];
+            if (parsedValue === undefined) {
+                parsedBody[name] = value;
+            }
+            else if (Array.isArray(parsedValue)) {
+                parsedBody[name] = [...parsedValue, value];
+            }
+            else {
+                parsedBody[name] = [parsedValue, value];
+            }
+        }
+        return parsedBody;
+    }
+    catch (error) {
+        return undefined;
+    }
+}
+
+/**
+ * Parses a given request/response body based on the `Content-Type` header.
+ */
+function parseBody(body, headers) {
+    // Return whatever falsey body value is given.
+    if (!body) {
+        return body;
+    }
+    const contentType = headers === null || headers === void 0 ? void 0 : headers.get('content-type');
+    // If the body has a Multipart Content-Type
+    // parse it into an object.
+    const hasMultipartContent = contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('multipart/form-data');
+    if (hasMultipartContent && typeof body !== 'object') {
+        return parseMultipartData(body, headers) || body;
+    }
+    // If the intercepted request's body has a JSON Content-Type
+    // parse it into an object.
+    const hasJsonContent = contentType === null || contentType === void 0 ? void 0 : contentType.includes('json');
+    if (hasJsonContent && typeof body !== 'object') {
+        return jsonParse(body) || body;
+    }
+    // Otherwise leave as-is.
+    return body;
+}
+
+var punycode$1 = {exports: {}};
+
 /*! https://mths.be/punycode v1.3.2 by @mathias */
 
-var punycode = createCommonjsModule(function (module, exports) {
+(function (module, exports) {
 (function(root) {
 
 	/** Detect free variables */
@@ -561,9 +667,9 @@ var punycode = createCommonjsModule(function (module, exports) {
 	}
 
 }(commonjsGlobal));
-});
+}(punycode$1, punycode$1.exports));
 
-var util = {
+var util$1 = {
   isString: function(arg) {
     return typeof(arg) === 'string';
   },
@@ -578,7 +684,7 @@ var util = {
   }
 };
 
-// Copyright Joyent, Inc. and other Node contributors.
+var querystring$1 = {};
 
 // If obj.hasOwnProperty has been overridden, then calling
 // obj.hasOwnProperty(prop) will break.
@@ -638,8 +744,6 @@ var decode = function(qs, sep, eq, options) {
   return obj;
 };
 
-// Copyright Joyent, Inc. and other Node contributors.
-
 var stringifyPrimitive = function(v) {
   switch (typeof v) {
     case 'string':
@@ -682,12 +786,11 @@ var encode = function(obj, sep, eq, name) {
          encodeURIComponent(stringifyPrimitive(obj));
 };
 
-var querystring = createCommonjsModule(function (module, exports) {
-
-exports.decode = exports.parse = decode;
-exports.encode = exports.stringify = encode;
-});
+querystring$1.decode = querystring$1.parse = decode;
+querystring$1.encode = querystring$1.stringify = encode;
 
+var punycode = punycode$1.exports;
+var util = util$1;
 var format = urlFormat;
 
 function Url() {
@@ -755,7 +858,8 @@ var protocolPattern = /^([a-z0-9.+-]+:)/i,
       'ftp:': true,
       'gopher:': true,
       'file:': true
-    };
+    },
+    querystring = querystring$1;
 
 function urlParse(url, parseQueryString, slashesDenoteHost) {
   if (url && util.isObject(url) && url instanceof Url) return url;
@@ -1423,108 +1527,11 @@ function prepareRequest(request) {
     return Object.assign(Object.assign({}, request), { headers: request.headers.all() });
 }
 
-function parseContentHeaders(headersString) {
-    var _a, _b;
-    const headers = lib.stringToHeaders(headersString);
-    const contentType = headers.get('content-type') || 'text/plain';
-    const disposition = headers.get('content-disposition');
-    if (!disposition) {
-        throw new Error('"Content-Disposition" header is required.');
-    }
-    const directives = disposition.split(';').reduce((acc, chunk) => {
-        const [name, ...rest] = chunk.trim().split('=');
-        acc[name] = rest.join('=');
-        return acc;
-    }, {});
-    const name = (_a = directives.name) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    const filename = (_b = directives.filename) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
-    return {
-        name,
-        filename,
-        contentType,
-    };
-}
-/**
- * Parses a given string as a multipart/form-data.
- * Does not throw an exception on an invalid multipart string.
- */
-function parseMultipartData(data, headers) {
-    const contentType = headers === null || headers === void 0 ? void 0 : headers.get('content-type');
-    if (!contentType) {
-        return undefined;
-    }
-    const [, ...directives] = contentType.split(/; */);
-    const boundary = directives
-        .filter((d) => d.startsWith('boundary='))
-        .map((s) => s.replace(/^boundary=/, ''))[0];
-    if (!boundary) {
-        return undefined;
-    }
-    const boundaryRegExp = new RegExp(`--+${boundary}`);
-    const fields = data
-        .split(boundaryRegExp)
-        .filter((chunk) => chunk.startsWith('\r\n') && chunk.endsWith('\r\n'))
-        .map((chunk) => chunk.trimStart().replace(/\r\n$/, ''));
-    if (!fields.length) {
-        return undefined;
-    }
-    const parsedBody = {};
-    try {
-        for (const field of fields) {
-            const [contentHeaders, ...rest] = field.split('\r\n\r\n');
-            const contentBody = rest.join('\r\n\r\n');
-            const { contentType, filename, name } = parseContentHeaders(contentHeaders);
-            const value = filename === undefined
-                ? contentBody
-                : new File([contentBody], filename, { type: contentType });
-            const parsedValue = parsedBody[name];
-            if (parsedValue === undefined) {
-                parsedBody[name] = value;
-            }
-            else if (Array.isArray(parsedValue)) {
-                parsedBody[name] = [...parsedValue, value];
-            }
-            else {
-                parsedBody[name] = [parsedValue, value];
-            }
-        }
-        return parsedBody;
-    }
-    catch (error) {
-        return undefined;
-    }
-}
-
-/**
- * Parses a given request/response body based on the `Content-Type` header.
- */
-function parseBody(body, headers) {
-    if (body) {
-        const contentType = headers === null || headers === void 0 ? void 0 : headers.get('content-type');
-        // If the body has a Multipart Content-Type
-        // parse it into an object.
-        const hasMultipartContent = contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('multipart/form-data');
-        if (hasMultipartContent && typeof body !== 'object') {
-            return parseMultipartData(body, headers) || body;
-        }
-        // If the intercepted request's body has a JSON Content-Type
-        // parse it into an object.
-        const hasJsonContent = contentType === null || contentType === void 0 ? void 0 : contentType.includes('json');
-        if (hasJsonContent && typeof body !== 'object') {
-            return jsonParse(body) || body;
-        }
-        // Otherwise leave as-is.
-        return body;
-    }
-    // Return whatever falsey body value is given.
-    return body;
-}
-
 /**
  * Formats a mocked response for introspection in browser's console.
  */
 function prepareResponse(res) {
-    const responseHeaders = lib.listToHeaders(res.headers);
+    const responseHeaders = lib.objectToHeaders(res.headers);
     return Object.assign(Object.assign({}, res), { 
         // Parse a response JSON body for preview in the logs
         body: parseBody(res.body, responseHeaders) });
@@ -1569,9 +1576,10 @@ const match = (path, url) => {
     };
 };
 
-var getCleanUrl_1 = createCommonjsModule(function (module, exports) {
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCleanUrl = void 0;
+var getCleanUrl$1 = {};
+
+Object.defineProperty(getCleanUrl$1, "__esModule", { value: true });
+var getCleanUrl_2 = getCleanUrl$1.getCleanUrl = void 0;
 /**
  * Removes query parameters and hashes from a given URL.
  */
@@ -1579,9 +1587,7 @@ function getCleanUrl(url, isAbsolute) {
     if (isAbsolute === void 0) { isAbsolute = true; }
     return [isAbsolute && url.origin, url.pathname].filter(Boolean).join('');
 }
-exports.getCleanUrl = getCleanUrl;
-
-});
+getCleanUrl_2 = getCleanUrl$1.getCleanUrl = getCleanUrl;
 
 /**
  * Returns an absolute URL based on the given relative URL, if possible.
@@ -1622,7 +1628,7 @@ function getUrlByMask(mask) {
 
 function getCleanMask(resolvedMask) {
     return resolvedMask instanceof URL
-        ? getCleanUrl_1.getCleanUrl(resolvedMask)
+        ? getCleanUrl_2(resolvedMask)
         : resolvedMask instanceof RegExp
             ? resolvedMask
             : getAbsoluteUrl(resolvedMask);
@@ -1635,7 +1641,7 @@ function getCleanMask(resolvedMask) {
 function matchRequestUrl(url, mask) {
     const resolvedMask = getUrlByMask(mask);
     const cleanMask = getCleanMask(resolvedMask);
-    const cleanRequestUrl = getCleanUrl_1.getCleanUrl(url);
+    const cleanRequestUrl = getCleanUrl_2(url);
     return match(cleanMask, cleanRequestUrl);
 }
 
@@ -1653,13 +1659,6 @@ function compose(...fns) {
     };
 }
 
-class NetworkError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'NetworkError';
-    }
-}
-
 const defaultResponse = {
     status: 200,
     statusText: 'OK',
@@ -1715,6 +1714,16 @@ function getCallFrame() {
     return declarationPath;
 }
 
+/**
+ * Determines if the given function is an iterator.
+ */
+function isIterable(fn) {
+    if (!fn) {
+        return false;
+    }
+    return typeof fn[Symbol.iterator] == 'function';
+}
+
 const defaultContext = {
     status,
     set,
@@ -1733,7 +1742,7 @@ class RequestHandler {
      * Parse the captured request to extract additional information from it.
      * Parsed result is then exposed to other methods of this request handler.
      */
-    parse(request) {
+    parse(_request) {
         return null;
     }
     /**
@@ -1746,7 +1755,7 @@ class RequestHandler {
      * Derive the publicly exposed request (`req`) instance of the response resolver
      * from the captured request and its parsed result.
      */
-    getPublicRequest(request, parsedResult) {
+    getPublicRequest(request, _parsedResult) {
         return request;
     }
     markAsSkipped(shouldSkip = true) {
@@ -1767,10 +1776,33 @@ class RequestHandler {
                 return null;
             }
             const publicRequest = this.getPublicRequest(request, parsedResult);
-            const mockedResponse = yield this.resolver(publicRequest, response, this.ctx);
+            // Create a response extraction wrapper around the resolver
+            // since it can be both an async function and a generator.
+            const executeResolver = this.wrapResolver(this.resolver);
+            const mockedResponse = yield executeResolver(publicRequest, response, this.ctx);
             return this.createExecutionResult(parsedResult, publicRequest, mockedResponse);
         });
     }
+    wrapResolver(resolver) {
+        return (req, res, ctx) => __awaiter(this, void 0, void 0, function* () {
+            const result = this.resolverGenerator || (yield resolver(req, res, ctx));
+            if (isIterable(result)) {
+                const { value, done } = result[Symbol.iterator]().next();
+                const nextResponse = yield value;
+                // If the generator is done and there is no next value,
+                // return the previous generator's value.
+                if (!nextResponse && done) {
+                    return this.resolverGeneratorResult;
+                }
+                if (!this.resolverGenerator) {
+                    this.resolverGenerator = result;
+                }
+                this.resolverGeneratorResult = nextResponse;
+                return nextResponse;
+            }
+            return result;
+        });
+    }
     createExecutionResult(parsedResult, request, response) {
         return {
             handler: this,
@@ -1781,4 +1813,4 @@ class RequestHandler {
     }
 }
 
-export { NetworkError as N, RequestHandler as R, __awaiter as _, defaultContext as a, compose as b, createResponseComposition as c, defaultResponse as d, getUrlByMask as e, prepareRequest as f, getPublicUrlFromRequest as g, prepareResponse as h, getTimestamp as i, getStatusCodeColor as j, __rest as k, matchRequestUrl as m, parseBody as p, response as r };
+export { NetworkError as N, RequestHandler as R, __awaiter as _, getCleanUrl$1 as a, defaultContext as b, createResponseComposition as c, defaultResponse as d, compose as e, getUrlByMask as f, getPublicUrlFromRequest as g, prepareRequest as h, prepareResponse as i, getTimestamp as j, getStatusCodeColor as k, __rest as l, matchRequestUrl as m, parseBody as p, response as r };