@modern-js/create-request 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/modern/browser.js

@@ -1,44 +1,51 @@
-import { compile, pathToRegexp } from 'path-to-regexp';
-import qs from 'query-string';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { compile, pathToRegexp } from "path-to-regexp";
+import qs from "query-string";
 import { handleRes } from "./handleRes";
 let realRequest;
 let realAllowedHeaders;
 const originFetch = (...params) => fetch(...params).then(handleRes);
-export const configure = options => {
-  const {
-    request,
-    interceptor,
-    allowedHeaders
-  } = options;
+const configure = (options) => {
+  const { request, interceptor, allowedHeaders } = options;
   realRequest = request || originFetch;
   if (interceptor && !request) {
     realRequest = interceptor(fetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     realAllowedHeaders = allowedHeaders;
   }
 };
-export const createRequest = (path, method, port,
-// 后续可能要修改，暂时先保留
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-fetch = originFetch) => {
-  const getFinalPath = compile(path, {
-    encode: encodeURIComponent
-  });
+const createRequest = (path, method, port, fetch2 = originFetch) => {
+  const getFinalPath = compile(path, { encode: encodeURIComponent });
   const keys = [];
   pathToRegexp(path, keys);
-  const sender = async (...args) => {
+  const sender = (...args) => __async(void 0, null, function* () {
     const fetcher = realRequest || originFetch;
-    const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
     payload.params = payload.params || {};
     const requestParams = args[0];
-    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-    if (typeof requestParams === 'object' && requestParams.params) {
-      const {
-        params
-      } = requestParams;
-      keys.forEach(key => {
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
         payload.params[key.name] = params[key.name];
       });
     } else {
@@ -49,26 +56,18 @@ fetch = originFetch) => {
     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;
+    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;
+      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';
-      // eslint-disable-next-line prefer-destructuring
+      headers["Content-Type"] = "text/plain";
       body = payload.body;
     } else if (payload.formData) {
       body = payload.formData;
-      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
-      // need multipart boundary aotu attached by browser when multipart is true
-      // headers['Content-Type'] = 'multipart/form-data';
     } 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)) {
+      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;
@@ -79,6 +78,10 @@ fetch = originFetch) => {
       body,
       headers
     });
-  };
+  });
   return sender;
-};
+};
+export {
+  configure,
+  createRequest
+};

package/dist/js/modern/handleRes.js

@@ -1,24 +1,44 @@
-const handleRes = async res => {
-  const contentType = res.headers.get('content-type');
-
-  // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+const handleRes = (res) => __async(void 0, null, function* () {
+  const contentType = res.headers.get("content-type");
   if (!res.ok) {
-    const data = await res.json();
+    const data = yield res.json();
     res.data = data;
     throw res;
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
+  if ((contentType == null ? void 0 : contentType.includes("application/json")) || (contentType == null ? void 0 : contentType.includes("text/json"))) {
     return res.json();
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
+  if ((contentType == null ? void 0 : contentType.includes("text/html")) || (contentType == null ? void 0 : contentType.includes("text/plain"))) {
     return res.text();
   }
-  if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
+  if (((contentType == null ? void 0 : contentType.includes("application/x-www-form-urlencoded")) || (contentType == null ? void 0 : contentType.includes("multipart/form-data"))) && res instanceof Response) {
     return res.formData();
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
+  if (contentType == null ? void 0 : contentType.includes("application/octet-stream")) {
     return res.arrayBuffer();
   }
   return res.text();
+});
+export {
+  handleRes
 };
-export { handleRes };

package/dist/js/modern/index.js

@@ -1,5 +1,8 @@
-import { isBrowser } from '@modern-js/utils';
+import { isBrowser } from "@modern-js/utils";
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";
 const createRequest = (...args) => isBrowser() ? browser(...args) : node(...args);
-export default createRequest;
+var src_default = createRequest;
+export {
+  src_default as default
+};

package/dist/js/modern/node.js

@@ -1,17 +1,13 @@
-import nodeFetch from 'node-fetch';
-import { compile, pathToRegexp } from 'path-to-regexp';
-import { useHeaders } from '@modern-js/utils/ssr';
-import qs from 'query-string';
+import nodeFetch from "node-fetch";
+import { compile, pathToRegexp } from "path-to-regexp";
+import { useHeaders } from "@modern-js/utils/ssr";
+import qs from "query-string";
 import { handleRes } from "./handleRes";
 let realRequest;
 let realAllowedHeaders = [];
 const originFetch = (...params) => nodeFetch(...params).then(handleRes);
-export const configure = options => {
-  const {
-    request,
-    interceptor,
-    allowedHeaders
-  } = options;
+const configure = (options) => {
+  const { request, interceptor, allowedHeaders } = options;
   realRequest = request || originFetch;
   if (interceptor && !request) {
     realRequest = interceptor(nodeFetch);
@@ -20,26 +16,18 @@ export const configure = options => {
     realAllowedHeaders = allowedHeaders;
   }
 };
-export const createRequest = (path, method, port,
-// 后续可能要修改，暂时先保留
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-fetch = nodeFetch) => {
-  const getFinalPath = compile(path, {
-    encode: encodeURIComponent
-  });
+const createRequest = (path, method, port, fetch = nodeFetch) => {
+  const getFinalPath = compile(path, { encode: encodeURIComponent });
   const keys = [];
   pathToRegexp(path, keys);
   const sender = (...args) => {
     const webRequestHeaders = useHeaders();
-    const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
     payload.params = payload.params || {};
     const requestParams = args[0];
-    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-    if (typeof requestParams === 'object' && requestParams.params) {
-      const {
-        params
-      } = requestParams;
-      keys.forEach(key => {
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
         payload.params[key.name] = params[key.name];
       });
     } else {
@@ -52,25 +40,21 @@ fetch = nodeFetch) => {
     const headers = payload.headers || {};
     let body;
     for (const key of realAllowedHeaders) {
-      if (typeof webRequestHeaders[key] !== 'undefined') {
+      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;
+      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';
-      // eslint-disable-next-line prefer-destructuring
+      headers["Content-Type"] = "text/plain";
       body = payload.body;
     } else if (payload.formData) {
       body = payload.formData;
-      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
-      // need multipart boundary auto attached by node-fetch when multipart is true
-      // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
-      headers['Content-Type'] = 'application/x-www-form-urlencoded';
-      if (typeof payload.formUrlencoded === 'object') {
+      headers["Content-Type"] = "application/x-www-form-urlencoded";
+      if (typeof payload.formUrlencoded === "object") {
         body = qs.stringify(payload.formUrlencoded);
       } else {
         body = payload.formUrlencoded;
@@ -78,11 +62,11 @@ fetch = nodeFetch) => {
     }
     const url = `http://localhost:${port}${finalPath}`;
     const fetcher = realRequest || originFetch;
-    return fetcher(url, {
-      method,
-      body,
-      headers
-    });
+    return fetcher(url, { method, body, headers });
   };
   return sender;
-};
+};
+export {
+  configure,
+  createRequest
+};

package/dist/js/node/browser.js

@@ -1,52 +1,80 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  configure: () => configure,
+  createRequest: () => createRequest
 });
-exports.createRequest = exports.configure = void 0;
-var _pathToRegexp = require("path-to-regexp");
-var _queryString = _interopRequireDefault(require("query-string"));
-var _handleRes = require("./handleRes");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path_to_regexp = require("path-to-regexp");
+var import_query_string = __toESM(require("query-string"));
+var import_handleRes = require("./handleRes");
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 let realRequest;
 let realAllowedHeaders;
-const originFetch = (...params) => fetch(...params).then(_handleRes.handleRes);
-const configure = options => {
-  const {
-    request,
-    interceptor,
-    allowedHeaders
-  } = options;
+const originFetch = (...params) => fetch(...params).then(import_handleRes.handleRes);
+const configure = (options) => {
+  const { request, interceptor, allowedHeaders } = options;
   realRequest = request || originFetch;
   if (interceptor && !request) {
     realRequest = interceptor(fetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     realAllowedHeaders = allowedHeaders;
   }
 };
-exports.configure = configure;
-const createRequest = (path, method, port,
-// 后续可能要修改，暂时先保留
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-fetch = originFetch) => {
-  const getFinalPath = (0, _pathToRegexp.compile)(path, {
-    encode: encodeURIComponent
-  });
+const createRequest = (path, method, port, fetch2 = originFetch) => {
+  const getFinalPath = (0, import_path_to_regexp.compile)(path, { encode: encodeURIComponent });
   const keys = [];
-  (0, _pathToRegexp.pathToRegexp)(path, keys);
-  const sender = async (...args) => {
+  (0, import_path_to_regexp.pathToRegexp)(path, keys);
+  const sender = (...args) => __async(void 0, null, function* () {
     const fetcher = realRequest || originFetch;
-    const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
+    const payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
     payload.params = payload.params || {};
     const requestParams = args[0];
-    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-    if (typeof requestParams === 'object' && requestParams.params) {
-      const {
-        params
-      } = requestParams;
-      keys.forEach(key => {
+    if (typeof requestParams === "object" && requestParams.params) {
+      const { params } = requestParams;
+      keys.forEach((key) => {
         payload.params[key.name] = params[key.name];
       });
     } else {
@@ -55,29 +83,21 @@ fetch = originFetch) => {
       });
     }
     const finalPath = getFinalPath(payload.params);
-    const finalURL = payload.query ? `${finalPath}?${_queryString.default.stringify(payload.query)}` : finalPath;
+    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;
+    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;
+      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';
-      // eslint-disable-next-line prefer-destructuring
+      headers["Content-Type"] = "text/plain";
       body = payload.body;
     } else if (payload.formData) {
       body = payload.formData;
-      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
-      // need multipart boundary aotu attached by browser when multipart is true
-      // headers['Content-Type'] = 'multipart/form-data';
     } 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 = _queryString.default.stringify(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;
       }
@@ -87,7 +107,6 @@ fetch = originFetch) => {
       body,
       headers
     });
-  };
+  });
   return sender;
 };
-exports.createRequest = createRequest;

package/dist/js/node/handleRes.js

@@ -1,30 +1,63 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  handleRes: () => handleRes
 });
-exports.handleRes = void 0;
-const handleRes = async res => {
-  const contentType = res.headers.get('content-type');
-
-  // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
+module.exports = __toCommonJS(stdin_exports);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+const handleRes = (res) => __async(void 0, null, function* () {
+  const contentType = res.headers.get("content-type");
   if (!res.ok) {
-    const data = await res.json();
+    const data = yield res.json();
     res.data = data;
     throw res;
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
+  if ((contentType == null ? void 0 : contentType.includes("application/json")) || (contentType == null ? void 0 : contentType.includes("text/json"))) {
     return res.json();
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
+  if ((contentType == null ? void 0 : contentType.includes("text/html")) || (contentType == null ? void 0 : contentType.includes("text/plain"))) {
     return res.text();
   }
-  if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
+  if (((contentType == null ? void 0 : contentType.includes("application/x-www-form-urlencoded")) || (contentType == null ? void 0 : contentType.includes("multipart/form-data"))) && res instanceof Response) {
     return res.formData();
   }
-  if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
+  if (contentType == null ? void 0 : contentType.includes("application/octet-stream")) {
     return res.arrayBuffer();
   }
   return res.text();
-};
-exports.handleRes = handleRes;
+});

package/dist/js/node/index.js

@@ -1,12 +1,27 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => src_default
 });
-exports.default = void 0;
-var _utils = require("@modern-js/utils");
-var _browser = require("./browser");
-var _node = require("./node");
-const createRequest = (...args) => (0, _utils.isBrowser)() ? (0, _browser.createRequest)(...args) : (0, _node.createRequest)(...args);
-var _default = createRequest;
-exports.default = _default;
+module.exports = __toCommonJS(stdin_exports);
+var import_utils = require("@modern-js/utils");
+var import_browser = require("./browser");
+var import_node = require("./node");
+const createRequest = (...args) => (0, import_utils.isBrowser)() ? (0, import_browser.createRequest)(...args) : (0, import_node.createRequest)(...args);
+var src_default = createRequest;