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

package/dist/js/treeshaking/handleRes.js

@@ -1,58 +1,187 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-var handleRes = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-    var contentType, data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            contentType = res.headers.get('content-type'); // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
-            if (res.ok) {
-              _context.next = 7;
-              break;
+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);
             }
-            _context.next = 4;
-            return res.json();
-          case 4:
-            data = _context.sent;
-            res.data = data;
-            throw res;
-          case 7:
-            if (!(contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json'))) {
-              _context.next = 9;
-              break;
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
             }
-            return _context.abrupt("return", res.json());
-          case 9:
-            if (!(contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain'))) {
-              _context.next = 11;
-              break;
+            _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;
+    }
+}
+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;
             }
-            return _context.abrupt("return", res.text());
-          case 11:
-            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)) {
-              _context.next = 13;
-              break;
-            }
-            return _context.abrupt("return", res.formData());
-          case 13:
-            if (!(contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream'))) {
-              _context.next = 15;
-              break;
-            }
-            return _context.abrupt("return", res.arrayBuffer());
-          case 15:
-            return _context.abrupt("return", res.text());
-          case 16:
-          case "end":
-            return _context.stop();
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return function handleRes(_x) {
-    return _ref.apply(this, arguments);
-  };
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+var handleRes = function() {
+    var _ref = _asyncToGenerator(function(res) {
+        var contentType, data;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    contentType = res.headers.get("content-type");
+                    if (!!res.ok) return [
+                        3,
+                        2
+                    ];
+                    return [
+                        4,
+                        res.json()
+                    ];
+                case 1:
+                    data = _state.sent();
+                    res.data = data;
+                    throw res;
+                case 2:
+                    if ((contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/json")) || (contentType === null || contentType === void 0 ? void 0 : contentType.includes("text/json"))) {
+                        return [
+                            2,
+                            res.json()
+                        ];
+                    }
+                    if ((contentType === null || contentType === void 0 ? void 0 : contentType.includes("text/html")) || (contentType === null || contentType === void 0 ? void 0 : contentType.includes("text/plain"))) {
+                        return [
+                            2,
+                            res.text()
+                        ];
+                    }
+                    if (((contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/x-www-form-urlencoded")) || (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data"))) && _instanceof(res, Response)) {
+                        return [
+                            2,
+                            res.formData()
+                        ];
+                    }
+                    if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/octet-stream")) {
+                        return [
+                            2,
+                            res.arrayBuffer()
+                        ];
+                    }
+                    return [
+                        2,
+                        res.text()
+                    ];
+            }
+        });
+    });
+    return function handleRes(res) {
+        return _ref.apply(this, arguments);
+    };
 }();
-export { handleRes };
+export { handleRes };

package/dist/js/treeshaking/index.js

@@ -1,7 +1,36 @@
-import { isBrowser } from '@modern-js/utils';
+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 _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);
+}
+import { isBrowser } from "@modern-js/utils";
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";
-var createRequest = function createRequest() {
-  return isBrowser() ? browser.apply(void 0, arguments) : node.apply(void 0, arguments);
+var createRequest = function() {
+    for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
+        args[_key] = arguments[_key];
+    }
+    return isBrowser() ? browser.apply(void 0, _toConsumableArray(args)) : node.apply(void 0, _toConsumableArray(args));
 };
-export default createRequest;
+var src_default = createRequest;
+export { src_default as default };

package/dist/js/treeshaking/node.js

@@ -1,98 +1,126 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import nodeFetch from 'node-fetch';
-import { compile, pathToRegexp } from 'path-to-regexp';
-import { useHeaders } from '@modern-js/utils/ssr';
-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 _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);
+}
+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";
 var realRequest;
 var realAllowedHeaders = [];
-var originFetch = function originFetch() {
-  return nodeFetch.apply(void 0, arguments).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(nodeFetch);
-  }
-  if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
-  }
-};
-export var createRequest = function createRequest(path, method, port) {
-  var fetch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : nodeFetch;
-  var getFinalPath = compile(path, {
-    encode: encodeURIComponent
-  });
-  var keys = [];
-  pathToRegexp(path, keys);
-  var sender = function sender() {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    var webRequestHeaders = useHeaders();
-    var payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
-    payload.params = payload.params || {};
-    var requestParams = args[0];
-    // 这种场景下是使用 schema，所以 params 要从 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];
-      });
+var originFetch = function() {
+    for(var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++){
+        params[_key] = arguments[_key];
     }
-    var plainPath = getFinalPath(payload.params);
-    var finalPath = payload.query ? "".concat(plainPath, "?").concat(qs.stringify(payload.query)) : plainPath;
-    var headers = payload.headers || {};
-    var body;
-    var _iterator = _createForOfIteratorHelper(realAllowedHeaders),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var key = _step.value;
-        if (typeof webRequestHeaders[key] !== 'undefined') {
-          headers[key] = webRequestHeaders[key];
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    return nodeFetch.apply(void 0, _toConsumableArray(params)).then(handleRes);
+};
+var configure = function(options) {
+    var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders;
+    realRequest = request || originFetch;
+    if (interceptor && !request) {
+        realRequest = interceptor(nodeFetch);
     }
-    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 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 = qs.stringify(payload.formUrlencoded);
-      } else {
-        body = payload.formUrlencoded;
-      }
+    if (Array.isArray(allowedHeaders)) {
+        realAllowedHeaders = allowedHeaders;
     }
-    var url = "http://localhost:".concat(port).concat(finalPath);
-    var fetcher = realRequest || originFetch;
-    return fetcher(url, {
-      method: method,
-      body: body,
-      headers: headers
+};
+var createRequest = function(path, method, port) {
+    var fetch = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : nodeFetch;
+    var getFinalPath = compile(path, {
+        encode: encodeURIComponent
     });
-  };
-  return sender;
-};
+    var keys = [];
+    pathToRegexp(path, keys);
+    var sender = function() {
+        for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
+            args[_key] = arguments[_key];
+        }
+        var webRequestHeaders = useHeaders();
+        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];
+            });
+        }
+        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];
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                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;
+            }
+        }
+        var url = "http://localhost:".concat(port).concat(finalPath);
+        var fetcher = realRequest || originFetch;
+        return fetcher(url, {
+            method: method,
+            body: body,
+            headers: headers
+        });
+    };
+    return sender;
+};
+export { configure, createRequest };

package/dist/js/treeshaking/types.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -66,7 +66,7 @@
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0",
     "query-string": "^7.1.1",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -76,8 +76,8 @@
     "jest": "^27",
     "nock": "^13.2.1",
     "typescript": "^4",
-    "@scripts/build": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "publishConfig": {