utils-uniapp 1.1.13 → 1.1.16

package/lib/http/index.d.ts

@@ -22,16 +22,22 @@ export declare const CONTENT_TYPES: Readonly<{
 
 /**
  * uni请求任务对象，依赖uni‑app全局UniApp命名空间
+ * @internal
  */
 type UniTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
 
+/** @internal */
 type UniRequestResult = UniApp.RequestSuccessCallbackResult;
+/** @internal */
 type UniUploadResult = UniApp.UploadFileSuccessCallbackResult;
-type UniDownloadResult = UniApp.DownloadFileSuccessCallbackResult;
+/** @internal */
+type UniDownloadResult = UniApp.DownloadSuccessData;
+/** @internal */
 type UniAnyResult = UniRequestResult | UniUploadResult | UniDownloadResult;
 
 /**
  * 请求失败载荷【内部类型，不对外导出】
+ * @internal
  */
 type RequestFailPayload = {
   type: 'fail';
@@ -45,7 +51,7 @@ export interface CacheAdapter {
   /**
    * 获取缓存
    * @param key 缓存key
-   * @returns 缓存值，不存在返回undefined
+   * @returns 缓存值，不存在返回undefined；调用方需要自行做类型断言
    */
   get(key: string): unknown;
 
@@ -79,17 +85,24 @@ export interface CacheConfigInput {
   /**
    * 缓存适配器实例；enable=true开启缓存时必填
    * 支持直接传入实例，或同步获取实例的函数；禁止async异步函数
+   * @param ctx 上下文对象
+   * @param ctx.url 完整请求url
+   * @param ctx.config 组装完成即将传给uni的请求参数(request/upload/download)
+   * @param ctx.options normalizeOpts合并后的用户请求扩展配置
+   * @param ctx.cacheConfig 当前传入的缓存配置
    */
   adapter?: CacheAdapter | null | ((ctx: {
     url: string;
-    config: HttpRequestConfig;
-    options: UserRequestOpts;
+    config: Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>;
+    options: RequestOptions;
+    cacheConfig: CacheConfig;
   }) => CacheAdapter | null);
 }
 
 /**
  * normalizeOpts 之后内部运行时缓存配置对象【内部类型，不对外导出】
  * @description adapter 字段由内部派生生成，外部禁止传入、禁止读取使用
+ * @internal
  */
 interface CacheConfig {
   enable: boolean;
@@ -101,28 +114,49 @@ interface CacheConfig {
 
 /**
  * 请求前置拦截器【标准化后】
- * @param invokeArgs 组装完成即将传给uni的请求参数
- * @param opts normalizeOpts合并后的完整配置
+ * @param payload 拦截器入参对象
+ * @param payload.config 组装完成即将传给uni的请求参数（原invokeArgs）
+ * @param payload.opts normalizeOpts合并后的完整配置
  * @returns 处理后的请求参数
  */
-type ReqInterceptor = (invokeArgs: Record<string, any>, opts: RequestOptions) => Promise<Record<string, any>> | Record<string, any>;
+type ReqInterceptor = (
+  payload: {
+    config: Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>;
+    opts: RequestOptions;
+  }
+) => Promise<Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>> | Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>;
 
 /**
  * 响应拦截器【标准化后】
- * @param res uni原始响应对象
- * @param opts normalizeOpts合并后的完整配置
- * @param reloadFn 重发当前请求函数，可为null
+ * @param payload 拦截器入参对象
+ * @param payload.res uni原始响应对象，实际类型为 UniAnyResult
+ * @param payload.config 组装完成即将传给uni的请求参数
+ * @param payload.options normalizeOpts合并后的完整配置
+ * @param payload.reloadFn 重发当前请求函数，可为null
  * @returns 处理后业务数据
  */
-type ResInterceptor = (res: any, opts: RequestOptions, reloadFn: (() => Promise<any>) | null) => Promise<any> | any;
+type ResInterceptor = (payload: {
+  res: unknown;
+  config: Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>;
+  options: RequestOptions;
+  reloadFn: (() => Promise<unknown>) | null;
+}) => Promise<unknown> | unknown;
 
 /**
  * 错误拦截器【标准化后】
- * @param err 捕获到的异常对象，可能为接口回调失败载荷 RequestFailPayload 或 JS运行异常 Error
- * @param opts normalizeOpts合并后的完整配置
+ * @param payload 拦截器入参对象
+ * @param payload.err 捕获到的异常对象，可能为接口回调失败载荷 RequestFailPayload 或 JS运行异常 Error
+ * @param payload.config 组装完成即将传给uni的请求参数
+ * @param payload.options normalizeOpts合并后的完整配置
+ * @param payload.reloadFn 重发当前请求函数，可为null
  * @returns 返回非undefined代表错误已接管；返回undefined会继续抛出异常
  */
-type ErrInterceptor = (err: RequestFailPayload | Error, opts: RequestOptions) => Promise<any> | any;
+type ErrInterceptor = (payload: {
+  err: RequestFailPayload | Error;
+  config: Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>;
+  options: RequestOptions;
+  reloadFn: (() => Promise<unknown>) | null;
+}) => Promise<unknown> | unknown;
 
 /**
  * 用户传入拦截器：支持单个函数 / 函数数组，交由 normalizeInterceptor + composeAsync合并
@@ -133,6 +167,7 @@ export type UserErrInterceptor = ErrInterceptor | ErrInterceptor[];
 
 /**
  * normalizeOpts标准化之后的请求额外配置对象【内部运行时】
+ * @internal
  */
 interface RequestOptions {
   /**
@@ -168,7 +203,7 @@ interface RequestOptions {
    */
   errInterceptor: ErrInterceptor;
   /**
-   * 允许扩展自定义字段
+   * 允许扩展自定义字段；尽量避免滥用
    */
   [key: string]: any;
 }
@@ -211,7 +246,7 @@ export interface UserRequestOpts {
    */
   errInterceptor?: UserErrInterceptor;
   /**
-   * 允许扩展自定义字段
+   * 允许扩展自定义字段；尽量避免滥用
    */
   [key: string]: any;
 }
@@ -232,7 +267,7 @@ export type HttpRequestConfig = Partial<Omit<UniApp.RequestOptions, 'url' | 'hea
  * 上传config：uni.uploadFile配置，排除内部强制覆盖字段
  * @note baseURL 为库自定义字段，非uni.uploadFile原生API字段
  */
-export type UploadConfig = Partial<Omit<UniApp.UploadFileOptions, 'url' | 'header' | 'filePath' | 'name' | 'formData' | 'cancelToken'>> & {
+export type UploadConfig = Partial<Omit<UniApp.UploadFileOption, 'url' | 'header' | 'filePath' | 'name' | 'formData' | 'cancelToken'>> & {
   /** 库自定义：请求基础地址 */
   baseURL?: string;
   /** 库自定义：headers支持对象或者返回对象的工厂函数 */
@@ -244,7 +279,7 @@ export type UploadConfig = Partial<Omit<UniApp.UploadFileOptions, 'url' | 'heade
  * 下载config：uni.downloadFile配置，排除内部强制覆盖字段
  * @note baseURL 为库自定义字段，非uni.downloadFile原生API字段
  */
-export type DownloadConfig = Partial<Omit<UniApp.DownloadFileOptions, 'url' | 'header' | 'cancelToken'>> & {
+export type DownloadConfig = Partial<Omit<UniApp.DownloadFileOption, 'url' | 'header' | 'cancelToken'>> & {
   /** 库自定义：请求基础地址 */
   baseURL?: string;
   /** 库自定义：headers支持对象或者返回对象的工厂函数 */
@@ -273,6 +308,7 @@ export declare const CancelToken: {
   /**
    * 根据token终止请求
    * @param token 取消令牌
+   * @internal 内部方法，业务请勿直接调用
    */
   _cancel(token: string): void;
 
@@ -292,10 +328,13 @@ export declare const CancelToken: {
  * 包装uni异步API为Promise
  * @param type uni接口名称 request | uploadFile | downloadFile
  * @param opts 请求参数，可以传入 cancelToken 用于请求取消
- * @description TS 无法表达 Promise reject 类型；本泛型T仅代表resolve成功返回类型；catch捕获为 RequestFailPayload | Error
+ * @description 返回uni原始成功回调对象；catch捕获为 RequestFailPayload | Error
  * @returns uni接口回调结果Promise
  */
-export declare function promisifyRequest<T = UniAnyResult>(type: 'request' | 'uploadFile' | 'downloadFile', opts: Record<string, any>): Promise<T>;
+export declare function promisifyRequest(
+  type: 'request' | 'uploadFile' | 'downloadFile',
+  opts: Partial<UniApp.RequestOptions | UniApp.UploadFileOption | UniApp.DownloadFileOption>
+): Promise<UniAnyResult>;
 
 /**
  * 底层直接展示loading，不做计数
@@ -319,6 +358,14 @@ export declare function startLoading(title?: string): void;
  */
 export declare function endLoading(): void;
 
+/**
+ * 请求返回Promise扩展类型，携带取消能力
+ */
+export interface RequestPromise<T> extends Promise<T> {
+  cancel(): void;
+  token: string;
+}
+
 /**
  * createRequest返回的请求实例对象，支持泛型T指定响应类型
  */
@@ -327,32 +374,32 @@ export interface RequestInstance {
    * 基础请求调用
    * @param url 请求地址
    * @param method http方法 get/post/put/delete等
-   * @param params 请求参数
+   * @param params 请求body/query参数，库不做类型校验
    * @param [config] 当前请求配置，覆盖实例defaultConfig（baseURL、headers等）
    * @param [options] 当前请求扩展选项，覆盖实例defaultOpts（loading、缓存、拦截器）
-   * @returns Promise业务响应数据
+   * @returns Promise业务响应数据，附加cancel、token属性
    */
-  <T = any>(url: string, method: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
+  <T = any>(url: string, method: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): RequestPromise<T>;
 
   /**
    * get快捷方法
    * @param url 请求地址
-   * @param params 请求参数
+   * @param params 请求body/query参数，库不做类型校验
    * @param [config] 当前请求配置
    * @param [options] 当前请求扩展选项
-   * @returns Promise业务响应数据
+   * @returns Promise业务响应数据，附加cancel、token属性
    */
-  get<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
+  get<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): RequestPromise<T>;
 
   /**
    * post快捷方法
    * @param url 请求地址
-   * @param params 请求参数
+   * @param params 请求body/query参数，库不做类型校验
    * @param [config] 当前请求配置
    * @param [options] 当前请求扩展选项
-   * @returns Promise业务响应数据
+   * @returns Promise业务响应数据，附加cancel、token属性
    */
-  post<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
+  post<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): RequestPromise<T>;
 }
 
 /**
@@ -366,24 +413,34 @@ export declare function createRequest(defaultConfig: HttpRequestConfig, defaultO
 /**
  * 创建上传文件实例
  * @param defaultConfig 实例默认配置(baseURL、headers等)
- * @param defaultOpts 实例默认扩展选项
+ * @param defaultOpts 实例默认扩展选项(loading、缓存、拦截器)
  * @returns 上传调用函数
  */
 export declare function createUploadFile(
   defaultConfig: UploadConfig,
   defaultOpts?: UserRequestOpts
-): <T = any>(url: string, params: { filePath: string; keyName?: string;[key: string]: any }, config?: UploadConfig, options?: UserRequestOpts) => Promise<T>;
+): <T = any>(
+  url: string,
+  params: {
+    filePath: string;
+    /** keyName 映射到 uni uploadFile 的 name 字段 */
+    keyName?: string;
+    [key: string]: any;
+  },
+  config?: UploadConfig,
+  options?: UserRequestOpts
+) => RequestPromise<T>;
 
 /**
  * 创建下载文件实例
  * @param defaultConfig 实例默认配置(baseURL、headers等)
- * @param defaultOpts 实例默认扩展选项
+ * @param defaultOpts 实例默认扩展选项(loading、缓存、拦截器)
  * @returns 下载调用函数
  */
 export declare function createDownloadFile(
   defaultConfig: DownloadConfig,
   defaultOpts?: UserRequestOpts
-): <T = any>(url: string, params?: Record<string, any>, config?: DownloadConfig, options?: UserRequestOpts) => Promise<T>;
+): <T = any>(url: string, params?: Record<string, any>, config?: DownloadConfig, options?: UserRequestOpts) => RequestPromise<T>;
 
 export type {
   CacheAdapter,
@@ -393,6 +450,7 @@ export type {
   UserErrInterceptor,
   UserRequestOpts,
   RequestInstance,
+  RequestPromise,
   HttpRequestConfig,
   UploadConfig,
   DownloadConfig

package/lib/http/index.js

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

package/package.json

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