@modern-js/create-request 2.5.1-alpha.8 → 2.6.0

package/dist/cjs/browser.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -43,58 +47,51 @@ const configure = (options) => {
     realAllowedHeaders = allowedHeaders;
   }
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch2 = originFetch) => {
+const createRequest = (path, method, port, fetch2 = originFetch) => {
   const getFinalPath = (0, import_path_to_regexp.compile)(path, { encode: encodeURIComponent });
   const keys = [];
   (0, import_path_to_regexp.pathToRegexp)(path, keys);
   const sender = async (...args) => {
     const fetcher = realRequest || originFetch;
-    let body;
-    let finalURL;
-    let headers;
-    if (httpMethodDecider === "inputParams") {
-      finalURL = path;
-      body = JSON.stringify({
-        args
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
+    payload.params = payload.params || {};
+    const requestParams = args[0];
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
+        payload.params[key.name] = params[key.name];
       });
-      headers = {
-        "Content-Type": "application/json"
-      };
     } else {
-      const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
-      payload.params = payload.params || {};
-      const requestParams = args[0];
-      if (typeof requestParams === "object" && requestParams.params) {
-        const { params } = requestParams;
-        keys.forEach((key) => {
-          payload.params[key.name] = params[key.name];
-        });
+      keys.forEach((key, index) => {
+        payload.params[key.name] = args[index];
+      });
+    }
+    const finalPath = getFinalPath(payload.params);
+    const finalURL = payload.query ? `${finalPath}?${import_query_string.default.stringify(payload.query)}` : finalPath;
+    const headers = payload.headers || {};
+    let body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+    if (payload.data) {
+      headers["Content-Type"] = "application/json";
+      body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+    } else if (payload.body) {
+      headers["Content-Type"] = "text/plain";
+      body = payload.body;
+    } else if (payload.formData) {
+      body = payload.formData;
+    } else if (payload.formUrlencoded) {
+      headers["Content-Type"] = "application/x-www-form-urlencoded";
+      if (typeof payload.formUrlencoded === "object" && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
+      !(payload.formUrlencoded instanceof URLSearchParams)) {
+        body = import_query_string.default.stringify(payload.formUrlencoded);
       } else {
-        keys.forEach((key, index) => {
-          payload.params[key.name] = args[index];
-        });
-      }
-      const finalPath = getFinalPath(payload.params);
-      finalURL = payload.query ? `${finalPath}?${import_query_string.default.stringify(payload.query)}` : finalPath;
-      headers = payload.headers || {};
-      body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-      if (payload.data) {
-        headers["Content-Type"] = "application/json";
-        body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-      } else if (payload.body) {
-        headers["Content-Type"] = "text/plain";
-        body = payload.body;
-      } else if (payload.formData) {
-        body = payload.formData;
-      } else if (payload.formUrlencoded) {
-        headers["Content-Type"] = "application/x-www-form-urlencoded";
-        if (typeof payload.formUrlencoded === "object" && !(payload.formUrlencoded instanceof URLSearchParams)) {
-          body = import_query_string.default.stringify(payload.formUrlencoded);
-        } else {
-          body = payload.formUrlencoded;
-        }
+        body = payload.formUrlencoded;
       }
     }
+    if (method.toLowerCase() === "get") {
+      body = void 0;
+    }
     return fetcher(finalURL, {
       method,
       body,

package/dist/cjs/node.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -45,62 +49,55 @@ const configure = (options) => {
     realAllowedHeaders = allowedHeaders;
   }
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch = import_node_fetch.default) => {
+const createRequest = (path, method, port, fetch = import_node_fetch.default) => {
   const getFinalPath = (0, import_path_to_regexp.compile)(path, { encode: encodeURIComponent });
   const keys = [];
   (0, import_path_to_regexp.pathToRegexp)(path, keys);
   const sender = (...args) => {
     const webRequestHeaders = (0, import_ssr.useHeaders)();
-    let body;
-    let headers;
-    let url;
-    if (httpMethodDecider === "inputParams") {
-      url = path;
-      body = args;
-      headers = {
-        "Content-Type": "application/json"
-      };
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
+    payload.params = payload.params || {};
+    const requestParams = args[0];
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
+        payload.params[key.name] = params[key.name];
+      });
     } else {
-      const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
-      payload.params = payload.params || {};
-      const requestParams = args[0];
-      if (typeof requestParams === "object" && requestParams.params) {
-        const { params } = requestParams;
-        keys.forEach((key) => {
-          payload.params[key.name] = params[key.name];
-        });
-      } else {
-        keys.forEach((key, index) => {
-          payload.params[key.name] = args[index];
-        });
-      }
-      const plainPath = getFinalPath(payload.params);
-      const finalPath = payload.query ? `${plainPath}?${import_query_string.default.stringify(payload.query)}` : plainPath;
-      headers = payload.headers || {};
-      for (const key of realAllowedHeaders) {
-        if (typeof webRequestHeaders[key] !== "undefined") {
-          headers[key] = webRequestHeaders[key];
-        }
+      keys.forEach((key, index) => {
+        payload.params[key.name] = args[index];
+      });
+    }
+    const plainPath = getFinalPath(payload.params);
+    const finalPath = payload.query ? `${plainPath}?${import_query_string.default.stringify(payload.query)}` : plainPath;
+    const headers = payload.headers || {};
+    let body;
+    for (const key of realAllowedHeaders) {
+      if (typeof webRequestHeaders[key] !== "undefined") {
+        headers[key] = webRequestHeaders[key];
       }
-      if (payload.data) {
-        headers["Content-Type"] = "application/json";
-        body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-      } else if (payload.body) {
-        headers["Content-Type"] = "text/plain";
-        body = payload.body;
-      } else if (payload.formData) {
-        body = payload.formData;
-      } else if (payload.formUrlencoded) {
-        headers["Content-Type"] = "application/x-www-form-urlencoded";
-        if (typeof payload.formUrlencoded === "object") {
-          body = import_query_string.default.stringify(payload.formUrlencoded);
-        } else {
-          body = payload.formUrlencoded;
-        }
+    }
+    if (payload.data) {
+      headers["Content-Type"] = "application/json";
+      body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+    } else if (payload.body) {
+      headers["Content-Type"] = "text/plain";
+      body = payload.body;
+    } else if (payload.formData) {
+      body = payload.formData;
+    } else if (payload.formUrlencoded) {
+      headers["Content-Type"] = "application/x-www-form-urlencoded";
+      if (typeof payload.formUrlencoded === "object") {
+        body = import_query_string.default.stringify(payload.formUrlencoded);
+      } else {
+        body = payload.formUrlencoded;
       }
-      url = `http://localhost:${port}${finalPath}`;
     }
+    const url = `http://localhost:${port}${finalPath}`;
     const fetcher = realRequest || originFetch;
+    if (method.toLowerCase() === "get") {
+      body = void 0;
+    }
     return fetcher(url, { method, body, headers });
   };
   return sender;

package/dist/esm/browser.js

@@ -176,7 +176,7 @@ var configure = function(options) {
     }
 };
 var createRequest = function(path, method, port) {
-    var httpMethodDecider = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "functionName", fetch2 = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : originFetch;
+    var fetch2 = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : originFetch;
     var getFinalPath = compile(path, {
         encode: encodeURIComponent
     });
@@ -184,56 +184,52 @@ var createRequest = function(path, method, port) {
     pathToRegexp(path, keys);
     var sender = function() {
         var _ref = _asyncToGenerator(function() {
-            var _len, args, _key, fetcher, body, finalURL, headers, payload, requestParams, params, finalPath;
+            var _len, args, _key, fetcher, payload, requestParams, params, finalPath, finalURL, headers, body;
             var _arguments = arguments;
             return __generator(this, function(_state) {
                 for(_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
                     args[_key] = _arguments[_key];
                 }
                 fetcher = realRequest || originFetch;
-                if (httpMethodDecider === "inputParams") {
-                    finalURL = path;
-                    body = JSON.stringify({
-                        args: args
+                payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
+                payload.params = payload.params || {};
+                requestParams = args[0];
+                if (typeof requestParams === "object" && requestParams.params) {
+                    params = requestParams.params;
+                    keys.forEach(function(key) {
+                        payload.params[key.name] = params[key.name];
                     });
-                    headers = {
-                        "Content-Type": "application/json"
-                    };
                 } else {
-                    payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
-                    payload.params = payload.params || {};
-                    requestParams = args[0];
-                    if (typeof requestParams === "object" && requestParams.params) {
-                        params = requestParams.params;
-                        keys.forEach(function(key) {
-                            payload.params[key.name] = params[key.name];
-                        });
+                    keys.forEach(function(key, index) {
+                        payload.params[key.name] = args[index];
+                    });
+                }
+                finalPath = getFinalPath(payload.params);
+                finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
+                headers = payload.headers || {};
+                body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+                if (payload.data) {
+                    headers["Content-Type"] = "application/json";
+                    body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+                } else if (payload.body) {
+                    headers["Content-Type"] = "text/plain";
+                    body = payload.body;
+                } else if (payload.formData) {
+                    body = payload.formData;
+                } else if (payload.formUrlencoded) {
+                    headers["Content-Type"] = "application/x-www-form-urlencoded";
+                    if (typeof payload.formUrlencoded === "object" && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-expect-error
+                    // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
+                    !_instanceof(payload.formUrlencoded, URLSearchParams)) {
+                        body = qs.stringify(payload.formUrlencoded);
                     } else {
-                        keys.forEach(function(key, index) {
-                            payload.params[key.name] = args[index];
-                        });
-                    }
-                    finalPath = getFinalPath(payload.params);
-                    finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
-                    headers = payload.headers || {};
-                    body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-                    if (payload.data) {
-                        headers["Content-Type"] = "application/json";
-                        body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-                    } else if (payload.body) {
-                        headers["Content-Type"] = "text/plain";
-                        body = payload.body;
-                    } else if (payload.formData) {
-                        body = payload.formData;
-                    } else if (payload.formUrlencoded) {
-                        headers["Content-Type"] = "application/x-www-form-urlencoded";
-                        if (typeof payload.formUrlencoded === "object" && !_instanceof(payload.formUrlencoded, URLSearchParams)) {
-                            body = qs.stringify(payload.formUrlencoded);
-                        } else {
-                            body = payload.formUrlencoded;
-                        }
+                        body = payload.formUrlencoded;
                     }
                 }
+                if (method.toLowerCase() === "get") {
+                    body = void 0;
+                }
                 return [
                     2,
                     fetcher(finalURL, {

package/dist/esm/node.js

@@ -47,7 +47,7 @@ var configure = function(options) {
     }
 };
 var createRequest = function(path, method, port) {
-    var httpMethodDecider = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "functionName", fetch = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : nodeFetch;
+    var fetch = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : nodeFetch;
     var getFinalPath = compile(path, {
         encode: encodeURIComponent
     });
@@ -58,73 +58,66 @@ var createRequest = function(path, method, port) {
             args[_key] = arguments[_key];
         }
         var webRequestHeaders = useHeaders();
-        var body;
-        var headers;
-        var url;
-        if (httpMethodDecider === "inputParams") {
-            url = path;
-            body = args;
-            headers = {
-                "Content-Type": "application/json"
-            };
+        var payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
+        payload.params = payload.params || {};
+        var requestParams = args[0];
+        if (typeof requestParams === "object" && requestParams.params) {
+            var params = requestParams.params;
+            keys.forEach(function(key) {
+                payload.params[key.name] = params[key.name];
+            });
         } else {
-            var payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
-            payload.params = payload.params || {};
-            var requestParams = args[0];
-            if (typeof requestParams === "object" && requestParams.params) {
-                var params = requestParams.params;
-                keys.forEach(function(key) {
-                    payload.params[key.name] = params[key.name];
-                });
-            } else {
-                keys.forEach(function(key, index) {
-                    payload.params[key.name] = args[index];
-                });
+            keys.forEach(function(key, index) {
+                payload.params[key.name] = args[index];
+            });
+        }
+        var plainPath = getFinalPath(payload.params);
+        var finalPath = payload.query ? "".concat(plainPath, "?").concat(qs.stringify(payload.query)) : plainPath;
+        var headers = payload.headers || {};
+        var body;
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = realAllowedHeaders[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var key = _step.value;
+                if (typeof webRequestHeaders[key] !== "undefined") {
+                    headers[key] = webRequestHeaders[key];
+                }
             }
-            var plainPath = getFinalPath(payload.params);
-            var finalPath = payload.query ? "".concat(plainPath, "?").concat(qs.stringify(payload.query)) : plainPath;
-            headers = payload.headers || {};
-            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
             try {
-                for(var _iterator = realAllowedHeaders[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                    var key = _step.value;
-                    if (typeof webRequestHeaders[key] !== "undefined") {
-                        headers[key] = webRequestHeaders[key];
-                    }
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
                 }
-            } catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
             } finally{
-                try {
-                    if (!_iteratorNormalCompletion && _iterator.return != null) {
-                        _iterator.return();
-                    }
-                } finally{
-                    if (_didIteratorError) {
-                        throw _iteratorError;
-                    }
+                if (_didIteratorError) {
+                    throw _iteratorError;
                 }
             }
-            if (payload.data) {
-                headers["Content-Type"] = "application/json";
-                body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-            } else if (payload.body) {
-                headers["Content-Type"] = "text/plain";
-                body = payload.body;
-            } else if (payload.formData) {
-                body = payload.formData;
-            } else if (payload.formUrlencoded) {
-                headers["Content-Type"] = "application/x-www-form-urlencoded";
-                if (typeof payload.formUrlencoded === "object") {
-                    body = qs.stringify(payload.formUrlencoded);
-                } else {
-                    body = payload.formUrlencoded;
-                }
+        }
+        if (payload.data) {
+            headers["Content-Type"] = "application/json";
+            body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+        } else if (payload.body) {
+            headers["Content-Type"] = "text/plain";
+            body = payload.body;
+        } else if (payload.formData) {
+            body = payload.formData;
+        } else if (payload.formUrlencoded) {
+            headers["Content-Type"] = "application/x-www-form-urlencoded";
+            if (typeof payload.formUrlencoded === "object") {
+                body = qs.stringify(payload.formUrlencoded);
+            } else {
+                body = payload.formUrlencoded;
             }
-            url = "http://localhost:".concat(port).concat(finalPath);
         }
+        var url = "http://localhost:".concat(port).concat(finalPath);
         var fetcher = realRequest || originFetch;
+        if (method.toLowerCase() === "get") {
+            body = void 0;
+        }
         return fetcher(url, {
             method: method,
             body: body,

package/dist/esm-node/browser.js

@@ -14,58 +14,51 @@ const configure = (options) => {
     realAllowedHeaders = allowedHeaders;
   }
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch2 = originFetch) => {
+const createRequest = (path, method, port, fetch2 = originFetch) => {
   const getFinalPath = compile(path, { encode: encodeURIComponent });
   const keys = [];
   pathToRegexp(path, keys);
   const sender = async (...args) => {
     const fetcher = realRequest || originFetch;
-    let body;
-    let finalURL;
-    let headers;
-    if (httpMethodDecider === "inputParams") {
-      finalURL = path;
-      body = JSON.stringify({
-        args
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
+    payload.params = payload.params || {};
+    const requestParams = args[0];
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
+        payload.params[key.name] = params[key.name];
       });
-      headers = {
-        "Content-Type": "application/json"
-      };
     } else {
-      const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
-      payload.params = payload.params || {};
-      const requestParams = args[0];
-      if (typeof requestParams === "object" && requestParams.params) {
-        const { params } = requestParams;
-        keys.forEach((key) => {
-          payload.params[key.name] = params[key.name];
-        });
+      keys.forEach((key, index) => {
+        payload.params[key.name] = args[index];
+      });
+    }
+    const finalPath = getFinalPath(payload.params);
+    const finalURL = payload.query ? `${finalPath}?${qs.stringify(payload.query)}` : finalPath;
+    const headers = payload.headers || {};
+    let body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+    if (payload.data) {
+      headers["Content-Type"] = "application/json";
+      body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
+    } else if (payload.body) {
+      headers["Content-Type"] = "text/plain";
+      body = payload.body;
+    } else if (payload.formData) {
+      body = payload.formData;
+    } else if (payload.formUrlencoded) {
+      headers["Content-Type"] = "application/x-www-form-urlencoded";
+      if (typeof payload.formUrlencoded === "object" && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
+      !(payload.formUrlencoded instanceof URLSearchParams)) {
+        body = qs.stringify(payload.formUrlencoded);
       } else {
-        keys.forEach((key, index) => {
-          payload.params[key.name] = args[index];
-        });
-      }
-      const finalPath = getFinalPath(payload.params);
-      finalURL = payload.query ? `${finalPath}?${qs.stringify(payload.query)}` : finalPath;
-      headers = payload.headers || {};
-      body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-      if (payload.data) {
-        headers["Content-Type"] = "application/json";
-        body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
-      } else if (payload.body) {
-        headers["Content-Type"] = "text/plain";
-        body = payload.body;
-      } else if (payload.formData) {
-        body = payload.formData;
-      } else if (payload.formUrlencoded) {
-        headers["Content-Type"] = "application/x-www-form-urlencoded";
-        if (typeof payload.formUrlencoded === "object" && !(payload.formUrlencoded instanceof URLSearchParams)) {
-          body = qs.stringify(payload.formUrlencoded);
-        } else {
-          body = payload.formUrlencoded;
-        }
+        body = payload.formUrlencoded;
       }
     }
+    if (method.toLowerCase() === "get") {
+      body = void 0;
+    }
     return fetcher(finalURL, {
       method,
       body,