@noah-libjs/request 0.0.7 → 0.0.9

package/dist/Request.d.ts

@@ -41,3 +41,4 @@ export declare class Request extends EventEmitter<{
     post: TRequest_PreReq;
     put: TRequest_PreReq;
 }
+export declare const request: Request;

package/dist/helper.d.ts

@@ -0,0 +1,9 @@
+import { ICommonOption } from "@noah-libjs/utils";
+import { FormInstance } from "antd";
+export type T_FETCH_OPTIONS = ((f?: FormInstance) => (Promise<ICommonOption[]> | ICommonOption[])) | {
+    url: string | (() => string);
+    labelKey?: string;
+    valueKey?: string;
+    method?: 'get' | 'post';
+};
+export declare function safe_fetch_options(cb: T_FETCH_OPTIONS, f?: FormInstance): Promise<ICommonOption[]>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { AxiosInstance } from 'axios';
-import { Request } from './Request';
+import { Request, request } from './Request';
 export * from './types';
+export * from './helper';
 export { codeMessage } from './constant';
 declare function createInstance(defaultConfig?: {}): AxiosInstance;
-declare const request: Request;
 export { Request, createInstance, request };

package/dist/index.js

@@ -1,13 +1,15 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import axios, { Axios } from 'axios';
 import utils from 'axios/lib/utils';
-import { MyLog, EventEmitter } from '@noah-libjs/utils';
+import { MyLog, EventEmitter, getSearchParamsAll, isFunction, safe_async_call, expect_array, isString, cache_fetch, get } from '@noah-libjs/utils';
 import bind from 'axios/lib/helpers/bind';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -133,9 +135,18 @@ var Request = /*#__PURE__*/function (_EventEmitter) {
         return onRejected(e);
       };
       ins.interceptors.request.use(function (config) {
+        var _a;
+        var args = getSearchParamsAll();
+        var headers = (_a = config.headers) !== null && _a !== void 0 ? _a : config.headers = {};
+        Object.entries(args).forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+          headers["X-Arg-".concat(k)] = encodeURI(v);
+        });
         _this2.emit('request', config);
         // TODO: remove
-        config.headers.Authorization = config.headers.Authorization || _this2.token || '';
+        headers.Authorization = headers.Authorization || _this2.token || '';
         // params.pathname = location.pathname
         return onRequest(config);
       });
@@ -220,11 +231,11 @@ var Request = /*#__PURE__*/function (_EventEmitter) {
     key: "getMsg",
     value: function getMsg(res) {
       if (!res) return '';
-      var _ref = res === null || res === void 0 ? void 0 : res.config,
-        _ref$showMsg = _ref.showMsg,
-        showMsg = _ref$showMsg === void 0 ? true : _ref$showMsg,
-        successText = _ref.successText,
-        errText = _ref.errText;
+      var _ref3 = res === null || res === void 0 ? void 0 : res.config,
+        _ref3$showMsg = _ref3.showMsg,
+        showMsg = _ref3$showMsg === void 0 ? true : _ref3$showMsg,
+        successText = _ref3.successText,
+        errText = _ref3.errText;
       var remoteMsg = showMsg ? Request.getRemoteMessage(res) : '';
       var isSuccessful = Request.checkRTCode(res);
       var configMsg = isSuccessful ? successText : errText;
@@ -262,6 +273,7 @@ Object.defineProperty(Request, "logger", {
   writable: true,
   value: new MyLog('Request')
 });
+var request = new Request();
 function doUnboxing(res) {
   var isBoxing = typeof (res === null || res === void 0 ? void 0 : res.code) === 'number' && !!res.data;
   if (isBoxing) {
@@ -269,6 +281,90 @@ function doUnboxing(res) {
   }
   return res;
 }
+
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+function __awaiter(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+}
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+function safe_fetch_options(cb, f) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var arr, _cb$method, method, _cb$valueKey, valueKey, _cb$labelKey, labelKey, url, _url;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!isFunction(cb)) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 3;
+          return safe_async_call(cb, f);
+        case 3:
+          arr = _context.sent;
+          return _context.abrupt("return", expect_array(arr));
+        case 7:
+          _cb$method = cb.method, method = _cb$method === void 0 ? 'get' : _cb$method, _cb$valueKey = cb.valueKey, valueKey = _cb$valueKey === void 0 ? 'value' : _cb$valueKey, _cb$labelKey = cb.labelKey, labelKey = _cb$labelKey === void 0 ? 'label' : _cb$labelKey, url = cb.url;
+          _url = isString(url) ? url : url();
+          return _context.abrupt("return", cache_fetch(_url, function () {
+            return request.ins({
+              method: method,
+              url: _url
+            });
+          }).then(function (res) {
+            return expect_array(res.data).map(function (_) {
+              return {
+                label: get(_, labelKey),
+                value: get(_, valueKey)
+              };
+            });
+          }));
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+}
 function createInstance() {
   var defaultConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var instance = bind(Axios.prototype.request, request.ins);
@@ -276,5 +372,4 @@ function createInstance() {
   utils.extend(instance, request.ins);
   return instance;
 }
-var request = new Request();
-export { Request, codeMessage, createInstance, request };
+export { Request, codeMessage, createInstance, request, safe_fetch_options };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noah-libjs/request",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -21,7 +21,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@noah-libjs/utils": "0.0.7",
+        "@noah-libjs/utils": "0.0.9",
         "axios": "^0.26.1",
         "store": "2.x"
     },
@@ -32,5 +32,5 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "gitHead": "fcd560c4526837addb257776124afb9381853236"
+    "gitHead": "bb49d078600e65d77b842887c63be3b254faf999"
 }