@modern-js/create-request 1.2.8 → 1.2.11

package/dist/js/modern/browser.js

@@ -36,9 +36,21 @@ fetch = originFetch) => {
     const fetcher = realRequest || originFetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    keys.forEach((key, index) => {
-      payload.params[key.name] = args[index];
-    });
+    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 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 finalPath = getFinalPath(payload.params);
     const finalURL = payload.query ? `${finalPath}?${qs.stringify(payload.query)}` : finalPath;
     const headers = payload.headers || {};

package/dist/js/modern/node.js

@@ -37,9 +37,21 @@ fetch = nodeFetch) => {
     const webRequestHeaders = useHeaders();
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    keys.forEach((key, index) => {
-      payload.params[key.name] = args[index];
-    });
+    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 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}?${qs.stringify(payload.query)}` : plainPath;
     const headers = payload.headers || {};

package/dist/js/node/browser.js

@@ -51,9 +51,21 @@ fetch = originFetch) => {
     const fetcher = realRequest || originFetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    keys.forEach((key, index) => {
-      payload.params[key.name] = args[index];
-    });
+    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 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 finalPath = getFinalPath(payload.params);
     const finalURL = payload.query ? `${finalPath}?${_queryString.default.stringify(payload.query)}` : finalPath;
     const headers = payload.headers || {};

package/dist/js/node/node.js

@@ -54,9 +54,21 @@ fetch = _nodeFetch.default) => {
     const webRequestHeaders = (0, _ssr.useHeaders)();
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    keys.forEach((key, index) => {
-      payload.params[key.name] = args[index];
-    });
+    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 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}?${_queryString.default.stringify(payload.query)}` : plainPath;
     const headers = payload.headers || {};

package/dist/js/treeshaking/browser.js

@@ -1,6 +1,6 @@
+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 _regeneratorRuntime from "@babel/runtime/regenerator";
 import { compile, pathToRegexp } from 'path-to-regexp';
 import qs from 'query-string';
 import { handleRes } from "./handleRes";
@@ -35,19 +35,21 @@ export var createRequest = function createRequest(path, method, port) {
   pathToRegexp(path, keys);
 
   var sender = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    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) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -58,9 +60,19 @@ export var createRequest = function createRequest(path, method, port) {
               fetcher = realRequest || originFetch;
               payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
               payload.params = payload.params || {};
-              keys.forEach(function (key, index) {
-                payload.params[key.name] = args[index];
-              });
+              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 || {};
@@ -96,7 +108,7 @@ export var createRequest = function createRequest(path, method, port) {
                 headers: headers
               }));
 
-            case 11:
+            case 12:
             case "end":
               return _context.stop();
           }

package/dist/js/treeshaking/node.js

@@ -42,9 +42,19 @@ export var createRequest = function createRequest(path, method, port) {
     var webRequestHeaders = useHeaders();
     var payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    keys.forEach(function (key, index) {
-      payload.params[key.name] = args[index];
-    });
+    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 plainPath = getFinalPath(payload.params);
     var finalPath = payload.query ? "".concat(plainPath, "?").concat(qs.stringify(payload.query)) : plainPath;
     var headers = payload.headers || {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.8",
+  "version": "1.2.11",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -62,9 +62,9 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7",
-    "@modern-js/plugin-ssr": "^1.3.2",
-    "@modern-js/utils": "^1.7.3",
+    "@babel/runtime": "^7.18.0",
+    "@modern-js/plugin-ssr": "^1.4.5",
+    "@modern-js/utils": "^1.7.6",
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0",
     "query-string": "^7.1.1"
@@ -104,7 +104,8 @@
       "files": [
         "src/**/*",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "tests/**/*"
       ],
       "output": []
     }