utils-uniapp 1.1.26 → 1.1.29

package/lib/http/index.d.ts

@@ -103,14 +103,17 @@ export interface CacheConfigInput {
    * @param ctx.options normalizeOpts合并后的用户请求扩展配置
    * @param ctx.cacheConfig 当前待生成的运行时缓存配置
    */
-  adapter?: CacheAdapter | null | ((ctx: { url: string; invokeArgs: NormalizeReqConfig; options: RequestOptions; cacheConfig: CacheConfig }) => Promise<CacheAdapter | null> | CacheAdapter | null);
+  adapter?:
+    | CacheAdapter
+    | null
+    | ((ctx: { url: string; invokeArgs: NormalizeReqConfig; options: RequestOptions; cacheConfig: CacheConfig }) => Promise<CacheAdapter | null> | CacheAdapter | null);
 }
 
 /**
  * 重载请求函数类型
  * @template T
  */
-type ReloadFn = <T>(...newArgvs: any[]) => RequestPromise<T>;
+type ReloadFn = <T>(...newArgvs: Partial<Parameters<RequestInstance>>) => RequestPromise<T>;
 
 /**
  * normalizeOpts 之后内部运行时缓存配置对象【内部类型，不对外导出】
@@ -286,7 +289,7 @@ export interface UserRequestOpts {
   loading?: boolean;
   /**
    * 请求前置拦截器
-   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行
+   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行，支持异步函数
    * - 拦截器返回 null / undefined 时，自动沿用原始 invokeArgs
    * @param ctx 上下文
    * @param ctx.invokeArgs 组装完成即将传给uni的请求参数
@@ -297,7 +300,7 @@ export interface UserRequestOpts {
   reqInterceptor?: UserReqInterceptor;
   /**
    * 响应拦截器
-   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行
+   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行，支持异步函数
    * - 拦截器返回 null / undefined 时，自动沿用原始响应res
    * @param ctx 上下文
    * @param ctx.res uni原始响应对象
@@ -310,7 +313,7 @@ export interface UserRequestOpts {
   resInterceptor?: UserResInterceptor;
   /**
    * 错误拦截器
-   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行
+   * - 支持单个拦截器函数 / 拦截器函数数组，多个拦截器按顺序链式执行，支持异步函数
    * - 拦截器返回 null / undefined 时，自动抛出原始err
    * @param ctx 上下文
    * @param ctx.err 捕获到的异常对象（RequestFailPayload | Error）
@@ -345,7 +348,7 @@ export type RuntimeHeadersCtx<T = {}> = {
 export type HttpRequestConfig = Partial<Omit<UniApp.RequestOptions, 'url' | 'header' | 'method' | 'data' | 'cancelToken'>> & {
   /** 库自定义：请求基础地址，非uni.request原生参数 */
   baseURL?: string;
-  /** 库自定义：headers支持对象或者返回对象的工厂函数 */
+  /** 库自定义：headers支持对象或者返回对象的工厂函数（同步/异步） */
   headers?: Record<string, string> | ((ctx: RuntimeHeadersCtx<HttpRequestConfig>) => Record<string, string> | Promise<Record<string, string>>);
   /** 自定义扩展字段 */
   [key: string]: any;
@@ -358,7 +361,7 @@ export type HttpRequestConfig = Partial<Omit<UniApp.RequestOptions, 'url' | 'hea
 export type UploadConfig = Partial<Omit<UniApp.UploadFileOption, 'url' | 'header' | 'filePath' | 'name' | 'formData' | 'cancelToken'>> & {
   /** 库自定义：请求基础地址 */
   baseURL?: string;
-  /** 库自定义：headers支持对象或者返回对象的工厂函数 */
+  /** 库自定义：headers支持对象或者返回对象的工厂函数（同步/异步） */
   headers?: Record<string, string> | ((ctx: RuntimeHeadersCtx<UploadConfig>) => Record<string, string> | Promise<Record<string, string>>);
   /** 自定义扩展字段 */
   [key: string]: any;
@@ -371,7 +374,7 @@ export type UploadConfig = Partial<Omit<UniApp.UploadFileOption, 'url' | 'header
 export type DownloadConfig = Partial<Omit<UniApp.DownloadFileOption, 'url' | 'header' | 'cancelToken'>> & {
   /** 库自定义：请求基础地址 */
   baseURL?: string;
-  /** 库自定义：headers支持对象或者返回对象的工厂函数 */
+  /** 库自定义：headers支持对象或者返回对象的工厂函数（同步/异步） */
   headers?: Record<string, string> | ((ctx: RuntimeHeadersCtx<DownloadConfig>) => Record<string, string> | Promise<Record<string, string>>);
   /** 自定义扩展字段 */
   [key: string]: any;

package/lib/http/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../_rollupPluginBabelHelpers-fa19b5b2.js"),X=require("../object/index.js"),K=require("../magic/index.js");var Q=["cancelToken"],Z=["keyName","filePath"],x=["headers"],ee=["adapter"];function re(){for(var t=arguments.length,o=new Array(t),u=0;u<t;u++)o[u]=arguments[u];if(o.some(function(r){return typeof r!="function"}))throw new TypeError("composeAsync 参数必须是函数");return o.length===0?e._asyncToGenerator(e._regenerator().m(function r(){var n,a,i,l=arguments;return e._regenerator().w(function(c){for(;;)switch(c.n){case 0:for(n=l.length,a=new Array(n),i=0;i<n;i++)a[i]=l[i];return c.a(2,a.length===1?a[0]:a)}},r)})):o.reduce(function(r,n){return e._asyncToGenerator(e._regenerator().m(function a(){var i=this,l,c,s,g=arguments;return e._regenerator().w(function(d){for(;;)switch(d.n){case 0:for(l=g.length,c=new Array(l),s=0;s<l;s++)c[s]=g[s];return d.a(2,n.call.apply(n,[this].concat(c,[e._asyncToGenerator(e._regenerator().m(function h(){return e._regenerator().w(function(p){for(;;)switch(p.n){case 0:return p.a(2,r.apply(i,c))}},h)}))])))}},a,this)}))},e._asyncToGenerator(e._regenerator().m(function r(){var n,a,i,l=arguments;return e._regenerator().w(function(c){for(;;)switch(c.n){case 0:for(n=l.length,a=new Array(n),i=0;i<n;i++)a[i]=l[i];return c.a(2,a.length===1?a[0]:a)}},r)})))}var E=Object.freeze({JSON:"application/json;charset=UTF-8",TEXT:"text/plain;charset=UTF-8",FORM_URLENCODED:"application/x-www-form-urlencoded;charset=UTF-8",FORM_DATA:"multipart/form-data"}),O=Object.seal(function(){var t=Object.create(null);function o(u){var r=t[u];typeof(r==null?void 0:r.abort)=="function"&&r.abort()}return Object.seal({add:function(r,n){t[r]=n},delete:function(r){Reflect.deleteProperty(t,r)},_cancel:o,cancelAll:function(){Object.values(t).forEach(function(r){typeof(r==null?void 0:r.abort)=="function"&&r.abort()}),Object.keys(t).forEach(function(r){return delete t[r]})},source:function(){var r="".concat(Date.now(),"-").concat(K.getRandomStr(16));return{token:r,cancel:function(){return o(r)}}}})}());function L(t,o){return new Promise(function(u,r){var n=o.cancelToken,a=e._objectWithoutProperties(o,Q),i=uni[t](e._objectSpread2(e._objectSpread2({},a),{},{success:function(c){if(c.statusCode>=200&&c.statusCode<300)return u(c);var s=Object.assign(new Error("HTTP status ".concat(c.statusCode)),{type:"fail",res:c});r(s)},fail:function(c){var s=Object.assign(new Error(c.errMsg||"request fail"),{type:"fail",res:c});r(s)},complete:function(){n&&O.delete(n)}}));n&&O.add(n,i)})}var q=0,F=!1;function J(t){F||(F=!0,uni.showLoading({title:t,mask:!0}))}function V(){F&&(F=!1,uni.hideLoading())}function Y(){var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";q++,q===1&&J(t)}function B(){q>0&&q--,q===0&&V()}function W(t,o){return function(u,r,n,a){return t(u,o,r,n,a)}}function H(t){return function(){var o=e._asyncToGenerator(e._regenerator().m(function u(r){var n,a;return e._regenerator().w(function(i){for(;;)switch(i.n){case 0:if(typeof t!="function"){i.n=2;break}return i.n=1,t(r);case 1:a=i.v,i.n=3;break;case 2:a=t;case 3:return n=a,i.a(2,n||{})}},u)}));return function(u){return o.apply(this,arguments)}}()}function D(t){return N.apply(this,arguments)}function N(){return N=e._asyncToGenerator(e._regenerator().m(function t(o){var u,r,n,a,i,l,c,s,g=arguments;return e._regenerator().w(function(d){for(;;)switch(d.n){case 0:return u=g.length>1&&g[1]!==void 0?g[1]:{},r=g.length>2&&g[2]!==void 0?g[2]:{},n=e._objectSpread2(e._objectSpread2({},u),r),n.headers,a=e._objectWithoutProperties(n,x),d.n=1,H(u.headers)(e._objectSpread2({url:o},a));case 1:return i=d.v,d.n=2,H(r.headers)(e._objectSpread2(e._objectSpread2({url:o},a),{},{headers:e._objectSpread2({},i)}));case 2:return l=d.v,c=e._objectSpread2(e._objectSpread2({},i),l),s=o.startsWith("http")?o:a.baseURL?"".concat(a.baseURL.replace(/\/+$/,""),"/").concat(o.replace(/^\/+/,"")):o,d.a(2,{urlRes:s,headers:c,configRes:a})}},t)})),N.apply(this,arguments)}function M(t){return typeof t=="function"?[t]:Array.isArray(t)?t.filter(function(o){return typeof o=="function"}):[]}function G(t){return I.apply(this,arguments)}function I(){return I=e._asyncToGenerator(e._regenerator().m(function t(o){var u,r,n,a,i,l,c,s,g,d,h;return e._regenerator().w(function(p){for(;;)switch(p.n){case 0:if(u=o.url,r=o.invokeArgs,n=r===void 0?{}:r,a=o.options,i=a===void 0?{}:a,l=o.cacheConfig,c=l===void 0?{}:l,s=c.adapter,g=e._objectWithoutProperties(c,ee),d=e._objectSpread2({enable:!1,key:"",prefix:"api",expire:60*60,adapter:null},g),d.key||(h=(d.prefix||"api").replace(/:$/,""),d.key="".concat(h,":").concat(u)),!d.enable){p.n=3;break}if(typeof s!="function"){p.n=2;break}return p.n=1,s({url:u,invokeArgs:n,options:i,cacheConfig:d});case 1:s=p.v;case 2:if(s&&typeof s.get=="function"&&typeof s.set=="function"){p.n=3;break}throw new Error("开启缓存(cacheConfig.enable=true)时，请在cacheConfig传入对应adapter的适配器，适配器必须实现 get(key)、set(key,value,expire) 方法");case 3:return p.a(2,Object.freeze(e._objectSpread2(e._objectSpread2({},d),{},{adapter:s})))}},t)})),I.apply(this,arguments)}function U(t){var o=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},u=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},r=e._objectSpread2(e._objectSpread2({qs:!0,showError:!0,cacheConfig:{enable:!1},loadingText:t,loading:!0,reqInterceptor:function(a){return a.invokeArgs},resInterceptor:function(a){return a.res},errInterceptor:function(a){return a.err}},o),u);return["reqInterceptor","resInterceptor","errInterceptor"].forEach(function(n){var a=[].concat(e._toConsumableArray(M(o[n])),e._toConsumableArray(M(u[n])));a.length&&(r[n]=re.apply(void 0,e._toConsumableArray(a)))}),r}function z(t,o){var u=Array.from(o);return function(){for(var r=arguments.length,n=new Array(r),a=0;a<r;a++)n[a]=arguments[a];return t.apply(void 0,e._toConsumableArray(X.cloneDeepWithDescriptors(n.length?n:u)))}}function $(t,o,u,r,n){return P.apply(this,arguments)}function P(){return P=e._asyncToGenerator(e._regenerator().m(function t(o,u,r,n,a){var i,l,c,s,g,d,h,p,b,_,m,v,y;return e._regenerator().w(function(f){for(;;)switch(f.p=f.n){case 0:if(i=n.loading,l=n.cacheConfig,c=null,i&&(Y(n.loadingText),c=function(){B(),c=null}),f.p=1,s=l==null?void 0:l.enable,l.key,!s){f.n=3;break}return f.n=2,l.adapter.get(l.key);case 2:if(g=f.v,!g){f.n=3;break}return(d=c)===null||d===void 0||d(),f.a(2,g);case 3:return f.n=4,n.reqInterceptor({invokeArgs:r,options:n});case 4:return h=f.v,f.n=5,o(u,h!=null?h:r);case 5:return p=f.v,f.n=6,n.resInterceptor({res:p,invokeArgs:r,options:n,reload:a});case 6:if(b=f.v,_=b!=null?b:p,!s){f.n=7;break}return f.n=7,l.adapter.set(l.key,_,l.expire);case 7:return f.a(2,_);case 8:return f.p=8,y=f.v,f.n=9,n.errInterceptor({err:y,invokeArgs:r,options:n,reload:a});case 9:return m=f.v,f.a(2,Promise.reject(m!=null?m:y));case 10:return f.p=10,(v=c)===null||v===void 0||v(),f.f(10);case 11:return f.a(2)}},t,null,[[1,8,10,11]])})),P.apply(this,arguments)}function ne(t,o){function u(n,a,i,l,c){return r.apply(this,arguments)}function r(){return r=e._asyncToGenerator(e._regenerator().m(function n(a,i,l,c,s){var g,d,h,p,b,_,m,v,y,f,C,S,j=arguments;return e._regenerator().w(function(w){for(;;)switch(w.n){case 0:return g=O.source(),d=z(u,j),w.n=1,D(a,t,c);case 1:return h=w.v,p=h.urlRes,b=h.headers,_=h.configRes,m=U("加载中...",o,s),v=i.toUpperCase()==="GET",y=v?E.JSON:m.qs?E.FORM_URLENCODED:E.JSON,f=e._objectSpread2({cancelToken:g.token,method:i,url:p,data:l,header:e._objectSpread2({"Content-Type":y},b)},_),w.n=2,G({url:a,invokeArgs:f,options:m,cacheConfig:e._objectSpread2(e._objectSpread2({},o.cacheConfig),s==null?void 0:s.cacheConfig)});case 2:return C=w.v,S=$(L,"request",f,e._objectSpread2(e._objectSpread2({},m),{},{cacheConfig:C}),d),S.cancel=g.cancel,S.token=g.token,w.a(2,S)}},n)})),r.apply(this,arguments)}return u.get=W(u,"get"),u.post=W(u,"post"),u}function ae(t,o){return function(){var u=e._asyncToGenerator(e._regenerator().m(function n(a,i,l,c){var s,g,d,h,p,b,_,m,v,y,f,C,S,j,w,T,R=arguments;return e._regenerator().w(function(k){for(;;)switch(k.n){case 0:return S=function(A){return A?!!(A.startsWith("wxfile://tmp")||A.startsWith("http://tmp")||A.startsWith("http://temp")||A.startsWith("blob:")||A.startsWith("_doc/")):!1},s=O.source(),g=z(r,R),k.n=1,D(a,t,l);case 1:if(d=k.v,h=d.urlRes,p=d.headers,b=d.configRes,_=U("上传中...",o,c),m=e._objectSpread2({keyName:"file"},i),v=m.keyName,y=v===void 0?"file":v,f=m.filePath,C=e._objectWithoutProperties(m,Z),S(f)){k.n=2;break}return k.a(2,Promise.resolve({data:f}));case 2:return j=e._objectSpread2({cancelToken:s.token,url:h,filePath:f,name:y,formData:C,header:e._objectSpread2({},p)},b),k.n=3,G({url:a,invokeArgs:j,options:_,cacheConfig:e._objectSpread2(e._objectSpread2({},o.cacheConfig),c==null?void 0:c.cacheConfig)});case 3:return w=k.v,T=$(L,"uploadFile",j,e._objectSpread2(e._objectSpread2({},_),{},{cacheConfig:w}),g),T.cancel=s.cancel,T.token=s.token,k.a(2,T)}},n)}));function r(n,a,i,l){return u.apply(this,arguments)}return r}()}function te(t,o){return function(){var u=e._asyncToGenerator(e._regenerator().m(function n(a,i,l,c){var s,g,d,h,p,b,_,m,v,y,f,C,S=arguments;return e._regenerator().w(function(j){for(;;)switch(j.n){case 0:return s=O.source(),g=z(r,S),j.n=1,D(a,t,l);case 1:return d=j.v,h=d.urlRes,p=d.headers,b=d.configRes,_=U("下载中...",o,c),m=h,i&&e._typeof(i)==="object"&&!Array.isArray(i)&&(v=Object.entries(i).filter(function(w){var T=e._slicedToArray(w,2),R=T[1];return R!=null&&R!==""}).map(function(w){var T=e._slicedToArray(w,2),R=T[0],k=T[1];return"".concat(encodeURIComponent(R),"=").concat(encodeURIComponent(k))}).join("&"),v&&(m+=(m.includes("?")?"&":"?")+v)),y=e._objectSpread2({cancelToken:s.token,url:m,header:e._objectSpread2({},p)},b),j.n=2,G({url:a,invokeArgs:y,options:_,cacheConfig:e._objectSpread2(e._objectSpread2({},o.cacheConfig),c==null?void 0:c.cacheConfig)});case 2:return f=j.v,C=$(L,"downloadFile",y,e._objectSpread2(e._objectSpread2({},_),{},{cacheConfig:f}),g),C.cancel=s.cancel,C.token=s.token,j.a(2,C)}},n)}));function r(n,a,i,l){return u.apply(this,arguments)}return r}()}exports.CONTENT_TYPES=E;exports.CancelToken=O;exports.createDownloadFile=te;exports.createRequest=ne;exports.createUploadFile=ae;exports.endLoading=B;exports.hideLoading=V;exports.promisifyRequest=L;exports.showLoading=J;exports.startLoading=Y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../_rollupPluginBabelHelpers-fa19b5b2.js"),X=require("../object/index.js"),K=require("../magic/index.js");var Q=["cancelToken"],Z=["keyName","filePath"],x=["headers"],ee=["adapter"];function re(){for(var i=arguments.length,c=new Array(i),u=0;u<i;u++)c[u]=arguments[u];if(c.some(function(r){return typeof r!="function"}))throw new TypeError("composeAsync 参数必须是函数");return c.length===0?e._asyncToGenerator(e._regenerator().m(function r(){var a,n,t,s=arguments;return e._regenerator().w(function(o){for(;;)switch(o.n){case 0:for(a=s.length,n=new Array(a),t=0;t<a;t++)n[t]=s[t];return o.a(2,n.length===1?n[0]:n)}},r)})):c.reduce(function(r,a){return e._asyncToGenerator(e._regenerator().m(function n(){var t=this,s,o,l,g=arguments;return e._regenerator().w(function(d){for(;;)switch(d.n){case 0:for(s=g.length,o=new Array(s),l=0;l<s;l++)o[l]=g[l];return d.a(2,a.call.apply(a,[this].concat(o,[e._asyncToGenerator(e._regenerator().m(function h(){return e._regenerator().w(function(p){for(;;)switch(p.n){case 0:return p.a(2,r.apply(t,o))}},h)}))])))}},n,this)}))},e._asyncToGenerator(e._regenerator().m(function r(){var a,n,t,s=arguments;return e._regenerator().w(function(o){for(;;)switch(o.n){case 0:for(a=s.length,n=new Array(a),t=0;t<a;t++)n[t]=s[t];return o.a(2,n.length===1?n[0]:n)}},r)})))}var E=Object.freeze({JSON:"application/json;charset=UTF-8",TEXT:"text/plain;charset=UTF-8",FORM_URLENCODED:"application/x-www-form-urlencoded;charset=UTF-8",FORM_DATA:"multipart/form-data"}),O=Object.seal(function(){var i=Object.create(null);function c(u){var r=i[u];typeof(r==null?void 0:r.abort)=="function"&&r.abort()}return Object.seal({add:function(r,a){i[r]=a},delete:function(r){Reflect.deleteProperty(i,r)},_cancel:c,cancelAll:function(){Object.values(i).forEach(function(r){typeof(r==null?void 0:r.abort)=="function"&&r.abort()}),Object.keys(i).forEach(function(r){return delete i[r]})},source:function(){var r="".concat(Date.now(),"-").concat(K.getRandomStr(16));return{token:r,cancel:function(){return c(r)}}}})}());function L(i,c){return new Promise(function(u,r){var a=c.cancelToken,n=e._objectWithoutProperties(c,Q),t=uni[i](e._objectSpread2(e._objectSpread2({},n),{},{success:function(o){if(o.statusCode>=200&&o.statusCode<300)return u(o);var l=Object.assign(new Error("HTTP status ".concat(o.statusCode)),{type:"fail",res:o});r(l)},fail:function(o){var l=Object.assign(new Error(o.errMsg||"request fail"),{type:"fail",res:o});r(l)},complete:function(){a&&O.delete(a)}}));a&&O.add(a,t)})}var q=0,F=!1;function J(i){F||(F=!0,uni.showLoading({title:i,mask:!0}))}function V(){F&&(F=!1,uni.hideLoading())}function Y(){var i=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";q++,q===1&&J(i)}function B(){q>0&&q--,q===0&&V()}function W(i,c){return function(u,r,a,n){return i(u,c,r,a,n)}}function H(i){return function(){var c=e._asyncToGenerator(e._regenerator().m(function u(r){var a,n;return e._regenerator().w(function(t){for(;;)switch(t.n){case 0:if(typeof i!="function"){t.n=2;break}return t.n=1,i(r);case 1:n=t.v,t.n=3;break;case 2:n=i;case 3:return a=n,t.a(2,a||{})}},u)}));return function(u){return c.apply(this,arguments)}}()}function D(i){return N.apply(this,arguments)}function N(){return N=e._asyncToGenerator(e._regenerator().m(function i(c){var u,r,a,n,t,s,o,l,g=arguments;return e._regenerator().w(function(d){for(;;)switch(d.n){case 0:return u=g.length>1&&g[1]!==void 0?g[1]:{},r=g.length>2&&g[2]!==void 0?g[2]:{},a=e._objectSpread2(e._objectSpread2({},u),r),a.headers,n=e._objectWithoutProperties(a,x),d.n=1,H(u.headers)(e._objectSpread2({url:c},n));case 1:return t=d.v,d.n=2,H(r.headers)(e._objectSpread2(e._objectSpread2({url:c},n),{},{headers:e._objectSpread2({},t)}));case 2:return s=d.v,o=e._objectSpread2(e._objectSpread2({},t),s),l=c.startsWith("http")?c:n.baseURL?"".concat(n.baseURL.replace(/\/+$/,""),"/").concat(c.replace(/^\/+/,"")):c,d.a(2,{urlRes:l,headers:o,configRes:n})}},i)})),N.apply(this,arguments)}function M(i){return typeof i=="function"?[i]:Array.isArray(i)?i.filter(function(c){return typeof c=="function"}):[]}function G(i){return I.apply(this,arguments)}function I(){return I=e._asyncToGenerator(e._regenerator().m(function i(c){var u,r,a,n,t,s,o,l,g,d,h;return e._regenerator().w(function(p){for(;;)switch(p.n){case 0:if(u=c.url,r=c.invokeArgs,a=r===void 0?{}:r,n=c.options,t=n===void 0?{}:n,s=c.cacheConfig,o=s===void 0?{}:s,l=o.adapter,g=e._objectWithoutProperties(o,ee),d=e._objectSpread2({enable:!1,key:"",prefix:"api",expire:60*60,adapter:null},g),d.key||(h=(d.prefix||"api").replace(/:$/,""),d.key="".concat(h,":").concat(u)),!d.enable){p.n=3;break}if(typeof l!="function"){p.n=2;break}return p.n=1,l({url:u,invokeArgs:a,options:t,cacheConfig:d});case 1:l=p.v;case 2:if(l&&typeof l.get=="function"&&typeof l.set=="function"){p.n=3;break}throw new Error("开启缓存(cacheConfig.enable=true)时，请在cacheConfig传入对应adapter的适配器，适配器必须实现 get(key)、set(key,value,expire) 方法");case 3:return p.a(2,Object.freeze(e._objectSpread2(e._objectSpread2({},d),{},{adapter:l})))}},i)})),I.apply(this,arguments)}function U(i){var c=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},u=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},r=e._objectSpread2(e._objectSpread2({qs:!0,showError:!0,cacheConfig:{enable:!1},loadingText:i,loading:!0,reqInterceptor:function(n){return n.invokeArgs},resInterceptor:function(n){return n.res},errInterceptor:function(n){return n.err}},c),u);return["reqInterceptor","resInterceptor","errInterceptor"].forEach(function(a){var n=[].concat(e._toConsumableArray(M(c[a])),e._toConsumableArray(M(u[a])));n.length&&(r[a]=re.apply(void 0,e._toConsumableArray(n)))}),r}function z(i,c){var u=Array.from(X.cloneDeepWithDescriptors(c));return function(){for(var r=arguments.length,a=new Array(r),n=0;n<r;n++)a[n]=arguments[n];var t=u.map(function(s,o){return a[o]||s});return i.apply(void 0,e._toConsumableArray(t))}}function $(i,c,u,r,a){return P.apply(this,arguments)}function P(){return P=e._asyncToGenerator(e._regenerator().m(function i(c,u,r,a,n){var t,s,o,l,g,d,h,p,b,_,m,v,y;return e._regenerator().w(function(f){for(;;)switch(f.p=f.n){case 0:if(t=a.loading,s=a.cacheConfig,o=null,t&&(Y(a.loadingText),o=function(){B(),o=null}),f.p=1,l=s==null?void 0:s.enable,s.key,!l){f.n=3;break}return f.n=2,s.adapter.get(s.key);case 2:if(g=f.v,!g){f.n=3;break}return(d=o)===null||d===void 0||d(),f.a(2,g);case 3:return f.n=4,a.reqInterceptor({invokeArgs:r,options:a});case 4:return h=f.v,f.n=5,c(u,h!=null?h:r);case 5:return p=f.v,f.n=6,a.resInterceptor({res:p,invokeArgs:r,options:a,reload:n});case 6:if(b=f.v,_=b!=null?b:p,!l){f.n=7;break}return f.n=7,s.adapter.set(s.key,_,s.expire);case 7:return f.a(2,_);case 8:return f.p=8,y=f.v,f.n=9,a.errInterceptor({err:y,invokeArgs:r,options:a,reload:n});case 9:return m=f.v,f.a(2,Promise.reject(m!=null?m:y));case 10:return f.p=10,(v=o)===null||v===void 0||v(),f.f(10);case 11:return f.a(2)}},i,null,[[1,8,10,11]])})),P.apply(this,arguments)}function ne(i,c){function u(a,n,t,s,o){return r.apply(this,arguments)}function r(){return r=e._asyncToGenerator(e._regenerator().m(function a(n,t,s,o,l){var g,d,h,p,b,_,m,v,y,f,C,S,j=arguments;return e._regenerator().w(function(w){for(;;)switch(w.n){case 0:return g=O.source(),d=z(u,j),w.n=1,D(n,i,o);case 1:return h=w.v,p=h.urlRes,b=h.headers,_=h.configRes,m=U("加载中...",c,l),v=t.toUpperCase()==="GET",y=v?E.JSON:m.qs?E.FORM_URLENCODED:E.JSON,f=e._objectSpread2({cancelToken:g.token,method:t,url:p,data:s,header:e._objectSpread2({"Content-Type":y},b)},_),w.n=2,G({url:n,invokeArgs:f,options:m,cacheConfig:e._objectSpread2(e._objectSpread2({},c.cacheConfig),l==null?void 0:l.cacheConfig)});case 2:return C=w.v,S=$(L,"request",f,e._objectSpread2(e._objectSpread2({},m),{},{cacheConfig:C}),d),S.cancel=g.cancel,S.token=g.token,w.a(2,S)}},a)})),r.apply(this,arguments)}return u.get=W(u,"get"),u.post=W(u,"post"),u}function ae(i,c){return function(){var u=e._asyncToGenerator(e._regenerator().m(function a(n,t,s,o){var l,g,d,h,p,b,_,m,v,y,f,C,S,j,w,T,R=arguments;return e._regenerator().w(function(k){for(;;)switch(k.n){case 0:return S=function(A){return A?!!(A.startsWith("wxfile://tmp")||A.startsWith("http://tmp")||A.startsWith("http://temp")||A.startsWith("blob:")||A.startsWith("_doc/")):!1},l=O.source(),g=z(r,R),k.n=1,D(n,i,s);case 1:if(d=k.v,h=d.urlRes,p=d.headers,b=d.configRes,_=U("上传中...",c,o),m=e._objectSpread2({keyName:"file"},t),v=m.keyName,y=v===void 0?"file":v,f=m.filePath,C=e._objectWithoutProperties(m,Z),S(f)){k.n=2;break}return k.a(2,Promise.resolve({data:f}));case 2:return j=e._objectSpread2({cancelToken:l.token,url:h,filePath:f,name:y,formData:C,header:e._objectSpread2({},p)},b),k.n=3,G({url:n,invokeArgs:j,options:_,cacheConfig:e._objectSpread2(e._objectSpread2({},c.cacheConfig),o==null?void 0:o.cacheConfig)});case 3:return w=k.v,T=$(L,"uploadFile",j,e._objectSpread2(e._objectSpread2({},_),{},{cacheConfig:w}),g),T.cancel=l.cancel,T.token=l.token,k.a(2,T)}},a)}));function r(a,n,t,s){return u.apply(this,arguments)}return r}()}function te(i,c){return function(){var u=e._asyncToGenerator(e._regenerator().m(function a(n,t,s,o){var l,g,d,h,p,b,_,m,v,y,f,C,S=arguments;return e._regenerator().w(function(j){for(;;)switch(j.n){case 0:return l=O.source(),g=z(r,S),j.n=1,D(n,i,s);case 1:return d=j.v,h=d.urlRes,p=d.headers,b=d.configRes,_=U("下载中...",c,o),m=h,t&&e._typeof(t)==="object"&&!Array.isArray(t)&&(v=Object.entries(t).filter(function(w){var T=e._slicedToArray(w,2),R=T[1];return R!=null&&R!==""}).map(function(w){var T=e._slicedToArray(w,2),R=T[0],k=T[1];return"".concat(encodeURIComponent(R),"=").concat(encodeURIComponent(k))}).join("&"),v&&(m+=(m.includes("?")?"&":"?")+v)),y=e._objectSpread2({cancelToken:l.token,url:m,header:e._objectSpread2({},p)},b),j.n=2,G({url:n,invokeArgs:y,options:_,cacheConfig:e._objectSpread2(e._objectSpread2({},c.cacheConfig),o==null?void 0:o.cacheConfig)});case 2:return f=j.v,C=$(L,"downloadFile",y,e._objectSpread2(e._objectSpread2({},_),{},{cacheConfig:f}),g),C.cancel=l.cancel,C.token=l.token,j.a(2,C)}},a)}));function r(a,n,t,s){return u.apply(this,arguments)}return r}()}exports.CONTENT_TYPES=E;exports.CancelToken=O;exports.createDownloadFile=te;exports.createRequest=ne;exports.createUploadFile=ae;exports.endLoading=B;exports.hideLoading=V;exports.promisifyRequest=L;exports.showLoading=J;exports.startLoading=Y;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-uniapp",
-  "version": "1.1.26",
+  "version": "1.1.29",
   "description": "aubyn's utils for uniapp",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",