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

package/dist/js/node/node.js

@@ -1,53 +1,62 @@
-"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 node_exports = {};
+__export(node_exports, {
+  configure: () => configure,
+  createRequest: () => createRequest
 });
-exports.createRequest = exports.configure = void 0;
-var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-var _pathToRegexp = require("path-to-regexp");
-var _ssr = require("@modern-js/utils/ssr");
-var _queryString = _interopRequireDefault(require("query-string"));
-var _handleRes = require("./handleRes");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(node_exports);
+var import_node_fetch = __toESM(require("node-fetch"));
+var import_path_to_regexp = require("path-to-regexp");
+var import_ssr = require("@modern-js/utils/ssr");
+var import_query_string = __toESM(require("query-string"));
+var import_handleRes = require("./handleRes");
 let realRequest;
 let realAllowedHeaders = [];
-const originFetch = (...params) => (0, _nodeFetch.default)(...params).then(_handleRes.handleRes);
-const configure = options => {
-  const {
-    request,
-    interceptor,
-    allowedHeaders
-  } = options;
+const originFetch = (...params) => (0, import_node_fetch.default)(...params).then(import_handleRes.handleRes);
+const configure = (options) => {
+  const { request, interceptor, allowedHeaders } = options;
   realRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(_nodeFetch.default);
+    realRequest = interceptor(import_node_fetch.default);
   }
   if (Array.isArray(allowedHeaders)) {
     realAllowedHeaders = allowedHeaders;
   }
 };
-exports.configure = configure;
-const createRequest = (path, method, port,
-// 后续可能要修改，暂时先保留
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-fetch = _nodeFetch.default) => {
-  const getFinalPath = (0, _pathToRegexp.compile)(path, {
-    encode: encodeURIComponent
-  });
+const createRequest = (path, method, port, fetch = import_node_fetch.default) => {
+  const getFinalPath = (0, import_path_to_regexp.compile)(path, { encode: encodeURIComponent });
   const keys = [];
-  (0, _pathToRegexp.pathToRegexp)(path, keys);
+  (0, import_path_to_regexp.pathToRegexp)(path, keys);
   const sender = (...args) => {
-    const webRequestHeaders = (0, _ssr.useHeaders)();
-    const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
+    const webRequestHeaders = (0, import_ssr.useHeaders)();
+    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 {
@@ -56,42 +65,38 @@ fetch = _nodeFetch.default) => {
       });
     }
     const plainPath = getFinalPath(payload.params);
-    const finalPath = payload.query ? `${plainPath}?${_queryString.default.stringify(payload.query)}` : plainPath;
+    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') {
+      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') {
-        body = _queryString.default.stringify(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;
       }
     }
     const url = `http://localhost:${port}${finalPath}`;
     const fetcher = realRequest || originFetch;
-    return fetcher(url, {
-      method,
-      body,
-      headers
-    });
+    return fetcher(url, { method, body, headers });
   };
   return sender;
 };
-exports.createRequest = createRequest;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  configure,
+  createRequest
+});

package/dist/js/node/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/js/treeshaking/browser.js

@@ -1,112 +1,243 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { compile, pathToRegexp } from 'path-to-regexp';
-import qs from 'query-string';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { compile, pathToRegexp } from "path-to-regexp";
+import qs from "query-string";
 import { handleRes } from "./handleRes";
 var realRequest;
 var realAllowedHeaders;
-var originFetch = function originFetch() {
-  return fetch.apply(void 0, arguments).then(handleRes);
+var originFetch = function() {
+    for(var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++){
+        params[_key] = arguments[_key];
+    }
+    return fetch.apply(void 0, _toConsumableArray(params)).then(handleRes);
 };
-export var configure = function configure(options) {
-  var request = options.request,
-    interceptor = options.interceptor,
-    allowedHeaders = options.allowedHeaders;
-  realRequest = request || originFetch;
-  if (interceptor && !request) {
-    realRequest = interceptor(fetch);
-  }
-  if (Array.isArray(allowedHeaders)) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    realAllowedHeaders = allowedHeaders;
-  }
+var configure = function(options) {
+    var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders;
+    realRequest = request || originFetch;
+    if (interceptor && !request) {
+        realRequest = interceptor(fetch);
+    }
+    if (Array.isArray(allowedHeaders)) {
+        realAllowedHeaders = allowedHeaders;
+    }
 };
-export var createRequest = function createRequest(path, method, port) {
-  var fetch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : originFetch;
-  var getFinalPath = compile(path, {
-    encode: encodeURIComponent
-  });
-  var keys = [];
-  pathToRegexp(path, keys);
-  var sender = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _len,
-        args,
-        _key,
-        fetcher,
-        payload,
-        requestParams,
-        params,
-        finalPath,
-        finalURL,
-        headers,
-        body,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              for (_len = _args.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                args[_key] = _args[_key];
-              }
-              fetcher = realRequest || originFetch;
-              payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
-              payload.params = payload.params || {};
-              requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-              if (_typeof(requestParams) === 'object' && requestParams.params) {
-                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];
-                });
-              }
-              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';
-                // eslint-disable-next-line prefer-destructuring
-                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 = qs.stringify(payload.formUrlencoded);
+var createRequest = function(path, method, port) {
+    var fetch2 = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : originFetch;
+    var getFinalPath = compile(path, {
+        encode: encodeURIComponent
+    });
+    var keys = [];
+    pathToRegexp(path, keys);
+    var sender = function() {
+        var _ref = _asyncToGenerator(function() {
+            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;
+                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];
+                    });
                 } else {
-                  body = payload.formUrlencoded;
+                    keys.forEach(function(key, index) {
+                        payload.params[key.name] = args[index];
+                    });
                 }
-              }
-              return _context.abrupt("return", fetcher(finalURL, {
-                method: method,
-                body: body,
-                headers: headers
-              }));
-            case 12:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-    return function sender() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  return sender;
-};
+                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;
+                    }
+                }
+                return [
+                    2,
+                    fetcher(finalURL, {
+                        method: method,
+                        body: body,
+                        headers: headers
+                    })
+                ];
+            });
+        });
+        return function sender() {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    return sender;
+};
+export { configure, createRequest };