utils-uniapp 1.1.12 → 1.1.15

package/lib/http/index.d.ts

@@ -15,23 +15,29 @@ export declare const CONTENT_TYPES: Readonly<{
    */
   FORM_URLENCODED: string;
   /**
-   * 文件上传表单 multipart/form‑data
+   * 文件上传表单 multipart/form-data
    */
   FORM_DATA: string;
 }>;
 
 /**
  * uni请求任务对象，依赖uni‑app全局UniApp命名空间
+ * @internal
  */
 type UniTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
 
+/** @internal */
 type UniRequestResult = UniApp.RequestSuccessCallbackResult;
+/** @internal */
 type UniUploadResult = UniApp.UploadFileSuccessCallbackResult;
+/** @internal */
 type UniDownloadResult = UniApp.DownloadFileSuccessCallbackResult;
+/** @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;
 
@@ -53,16 +59,17 @@ export interface CacheAdapter {
    * 设置缓存
    * @param key 缓存key
    * @param value 缓存存储内容
-   * @param expire 过期秒数；语义由适配器实现，约定 <=0 代表永不过期；request库仅透传数值，不做过期逻辑
+   * @param expire 过期秒数；语义由适配器实现；request库仅透传数值，不做过期逻辑
    */
   set(key: string, value: unknown, expire: number): void;
 }
 
 /**
  * 外部传入缓存配置入参（仅调用方使用，业务传入）
- * @description 开启请求缓存 isCache=true 时，必须传入对应 mode 的适配器 localAdapter / sessionAdapter
  */
 export interface CacheConfigInput {
+  /** 是否开启缓存 */
+  enable?: boolean;
   /**
    * 自定义缓存业务key；不填默认由url生成，**不包含请求参数**，同URL不同参数务必手动指定key
    */
@@ -72,33 +79,35 @@ export interface CacheConfigInput {
    */
   prefix?: string;
   /**
-   * 缓存存储模式
-   * - local：持久存储
-   * - session：会话存储(H5会话销毁；小程序降级持久)
-   */
-  mode?: 'local' | 'session';
-  /**
-   * 缓存过期时间，单位秒；语义由外部CacheAdapter实现，约定 <=0代表永不过期；库默认兜底1小时(3600s)
+   * 缓存过期时间，单位秒；库默认兜底1小时(3600s)
    */
   expire?: number;
   /**
-   * local模式对应的缓存适配器实例；mode=local且开启缓存时必填
-   */
-  localAdapter?: CacheAdapter | null;
-  /**
-   * session模式对应的缓存适配器实例；mode=session且开启缓存时必填
-   */
-  sessionAdapter?: CacheAdapter | null;
+   * 缓存适配器实例；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: Partial<UniApp.RequestOptions | UniApp.UploadFileOptions | UniApp.DownloadFileOptions>;
+    options: RequestOptions;
+    cacheConfig: CacheConfig;
+  }) => CacheAdapter | null);
 }
 
 /**
  * normalizeOpts 之后内部运行时缓存配置对象【内部类型，不对外导出】
  * @description adapter 字段由内部派生生成，外部禁止传入、禁止读取使用
+ * @internal
  */
 interface CacheConfig {
+  enable: boolean;
   key: string;
   prefix: string;
-  mode: 'local' | 'session';
   expire: number;
   readonly adapter: CacheAdapter | null;
 }
@@ -109,24 +118,28 @@ interface CacheConfig {
  * @param opts normalizeOpts合并后的完整配置
  * @returns 处理后的请求参数
  */
-type ReqInterceptor = (invokeArgs: Record<string, any>, opts: RequestOptions) => Promise<Record<string, any>> | Record<string, any>;
+type ReqInterceptor = (
+  invokeArgs: Partial<UniApp.RequestOptions | UniApp.UploadFileOptions | UniApp.DownloadFileOptions>,
+  opts: RequestOptions
+) => Promise<Partial<UniApp.RequestOptions | UniApp.UploadFileOptions | UniApp.DownloadFileOptions>> | Partial<UniApp.RequestOptions | UniApp.UploadFileOptions | UniApp.DownloadFileOptions>;
 
 /**
  * 响应拦截器【标准化后】
- * @param res uni原始响应对象
+ * @param res uni原始响应对象，实际类型为 UniAnyResult
  * @param opts normalizeOpts合并后的完整配置
  * @param reloadFn 重发当前请求函数，可为null
  * @returns 处理后业务数据
  */
-type ResInterceptor = (res: any, opts: RequestOptions, reloadFn: (() => Promise<any>) | null) => Promise<any> | any;
+type ResInterceptor = (res: unknown, opts: RequestOptions, reloadFn: (() => Promise<unknown>) | null) => Promise<unknown> | unknown;
 
 /**
  * 错误拦截器【标准化后】
  * @param err 捕获到的异常对象，可能为接口回调失败载荷 RequestFailPayload 或 JS运行异常 Error
  * @param opts normalizeOpts合并后的完整配置
+ * @param reloadFn 重发当前请求函数，可为null
  * @returns 返回非undefined代表错误已接管；返回undefined会继续抛出异常
  */
-type ErrInterceptor = (err: RequestFailPayload | Error, opts: RequestOptions) => Promise<any> | any;
+type ErrInterceptor = (err: RequestFailPayload | Error, opts: RequestOptions, reloadFn: (() => Promise<unknown>) | null) => Promise<unknown> | unknown;
 
 /**
  * 用户传入拦截器：支持单个函数 / 函数数组，交由 normalizeInterceptor + composeAsync合并
@@ -137,6 +150,7 @@ export type UserErrInterceptor = ErrInterceptor | ErrInterceptor[];
 
 /**
  * normalizeOpts标准化之后的请求额外配置对象【内部运行时】
+ * @internal
  */
 interface RequestOptions {
   /**
@@ -148,11 +162,7 @@ interface RequestOptions {
    */
   showError: boolean;
   /**
-   * 是否开启请求缓存；开启时cacheConfig必须提供对应mode的适配器
-   */
-  isCache: boolean;
-  /**
-   * 缓存配置；adapter为内部运行时派生字段，外部请勿传入、请勿访问；开启isCache:true，必须传入对应模式的适配器，否则运行时抛出异常
+   * 缓存配置；adapter为内部运行时派生字段，外部请勿传入、请勿访问；开启缓存必须传入适配器，否则运行时抛出异常
    */
   cacheConfig: CacheConfig;
   /**
@@ -176,7 +186,7 @@ interface RequestOptions {
    */
   errInterceptor: ErrInterceptor;
   /**
-   * 允许扩展自定义字段
+   * 允许扩展自定义字段；尽量避免滥用
    */
   [key: string]: any;
 }
@@ -184,7 +194,6 @@ interface RequestOptions {
 /**
  * 业务侧传入配置【外部用户参数，支持拦截器数组】
  * 经过内部 normalizeOpts 之后转换为 RequestOptions
- * @description isCache 设置为 true 时，cacheConfig 需要传入对应 mode 的适配器 localAdapter / sessionAdapter，否则运行时抛出异常
  */
 export interface UserRequestOpts {
   /**
@@ -196,11 +205,7 @@ export interface UserRequestOpts {
    */
   showError?: boolean;
   /**
-   * 是否开启请求缓存；开启时cacheConfig必须提供对应mode的适配器(localAdapter/sessionAdapter)
-   */
-  isCache?: boolean;
-  /**
-   * 缓存配置，用户传入部分字段即可；isCache=true必须传入对应mode适配器
+   * 缓存配置，用户传入部分字段即可；开启缓存时cacheConfig.adapter必须提供适配器
    */
   cacheConfig?: Partial<CacheConfigInput>;
   /**
@@ -224,7 +229,7 @@ export interface UserRequestOpts {
    */
   errInterceptor?: UserErrInterceptor;
   /**
-   * 允许扩展自定义字段
+   * 允许扩展自定义字段；尽量避免滥用
    */
   [key: string]: any;
 }
@@ -270,11 +275,6 @@ export type DownloadConfig = Partial<Omit<UniApp.DownloadFileOptions, 'url' | 'h
  * @description 注意：当前实现token由请求内部source生成，**不支持外部传入自定义cancelToken**
  */
 export declare const CancelToken: {
-  /**
-   * 保存token与uni任务映射
-   */
-  caches: Record<string, UniTask>;
-
   /**
    * 注册请求任务
    * @param token 取消令牌
@@ -291,6 +291,7 @@ export declare const CancelToken: {
   /**
    * 根据token终止请求
    * @param token 取消令牌
+   * @internal 内部方法，业务请勿直接调用
    */
   _cancel(token: string): void;
 
@@ -310,10 +311,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.UploadFileOptions | UniApp.DownloadFileOptions>
+): Promise<UniAnyResult>;
 
 /**
  * 底层直接展示loading，不做计数
@@ -337,6 +341,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指定响应类型
  */
@@ -345,32 +357,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>;
 }
 
 /**
@@ -384,24 +396,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,
@@ -411,6 +433,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 a=require("../_rollupPluginBabelHelpers-fa19b5b2.js"),x=require("../object/index.js"),E=require("../magic/index.js");var H=["headers"],M=["localAdapter","sessionAdapter"],$=["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={caches:Object.create(null),add:function(r,n){this.caches[r]=n},delete:function(r){Reflect.deleteProperty(this.caches,r)},_cancel:function(r){var n=this.caches[r];typeof(n==null?void 0:n.abort)=="function"&&n.abort()},cancelAll:function(){Object.values(this.caches).forEach(function(r){typeof(r==null?void 0:r.abort)=="function"&&r.abort()}),this.caches=Object.create(null)},source:function(){var r=this,n="".concat(Date.now(),"-").concat(E.getRandomStr(16));return{token:n,cancel:function(){return r._cancel(n)}}}};function k(e,r){return new Promise(function(n,i){var t=uni[e](a._objectSpread2(a._objectSpread2({},r),{},{success:function(c){if(c.statusCode>=200&&c.statusCode<300)return n(c);i({type:"fail",res:c})},fail:function(c){i({type:"fail",res:c})},complete:function(){r.cancelToken&&C.delete(r.cancelToken)}}));r.cancelToken&&C.add(r.cancelToken,t)})}var j=0,T=!1;function U(e){T||(T=!0,uni.showLoading({title:e,mask:!0}))}function D(){T&&(T=!1,uni.hideLoading())}function z(){var e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";j++,j===1&&U(e)}function W(){j>0&&j--,j===0&&D()}function q(e,r){return function(n,i,t,s){return e(n,r,i,t,s)}}function I(e){return typeof e=="function"?e:function(){return e||{}}}function w(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},i=I(r.headers)(),t=I(n.headers)(),s=a._objectSpread2(a._objectSpread2(a._objectSpread2({},r),n),{},{headers:a._objectSpread2(a._objectSpread2({},i),t)}),c=s.headers,p=a._objectWithoutProperties(s,H),l=e.startsWith("http")?e:s.baseURL?s.baseURL+e:e;return{urlRes:l,headers:c,configRes:p}}function N(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(function(r){return typeof r=="function"}):[]}function O(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},i=a._objectSpread2(a._objectSpread2({qs:!0,showError:!0,isCache:!1,cacheConfig:{},loadingText:e.loadingText,loading:!0,reqInterceptor:function(d){return d},resInterceptor:function(d){return d},errInterceptor:function(){}},r),n),t=a._objectSpread2(a._objectSpread2({},r.cacheConfig),n.cacheConfig),s=t.localAdapter,c=t.sessionAdapter,p=a._objectWithoutProperties(t,M),l=a._objectSpread2({key:"",prefix:"api",mode:"local",expire:60*60},p);if(!l.key){var h=(l.prefix||"api").replace(/:$/,"");l.key="".concat(h,":").concat(e.url)}if(l.adapter=l.mode==="session"?c:s,Object.defineProperty(l,"adapter",{writable:!1,configurable:!1}),i.cacheConfig=l,i.isCache){var u=l.adapter;if(!(u&&typeof u.get=="function"&&typeof u.set=="function"))throw new Error("开启缓存(isCache=true)时，请在cacheConfig传入对应mode的适配器，适配器必须实现 get(key)、set(key,value,expire) 方法")}return["reqInterceptor","resInterceptor","errInterceptor"].forEach(function(f){var d=[].concat(a._toConsumableArray(N(r[f])),a._toConsumableArray(N(n[f])));i[f]=d.length?E.composeAsync.apply(void 0,a._toConsumableArray(d)):function(o){return o}}),i}function F(e,r){var n=Array.from(r);return function(){return e.apply(void 0,a._toConsumableArray(x.cloneDeepWithDescriptors(n)))}}function L(e,r,n,i,t){return A.apply(this,arguments)}function A(){return A=a._asyncToGenerator(a._regenerator().m(function e(r,n,i,t,s){var c,p,l,h,u,f,d;return a._regenerator().w(function(o){for(;;)switch(o.p=o.n){case 0:return t.loading&&(z(t.loadingText),c=function(){W(),c=null}),o.p=1,o.n=2,t.reqInterceptor(i,t);case 2:return p=o.v,o.n=3,r(n,p);case 3:return l=o.v,o.n=4,t.resInterceptor(l,t,s);case 4:return h=o.v,o.a(2,h);case 5:return o.p=5,d=o.v,o.n=6,t.errInterceptor(d,t);case 6:if(u=o.v,u===void 0){o.n=7;break}return o.a(2,u);case 7:return o.a(2,Promise.reject(d));case 8:return o.p=8,(f=c)===null||f===void 0||f(),o.f(8);case 9:return o.a(2)}},e,null,[[1,5,8,9]])})),A.apply(this,arguments)}function G(e,r){function n(i,t,s,c,p){var l=C.source(),h=F(n,arguments),u=O({url:i,loadingText:"加载中..."},r,p),f=w(i,e,c),d=f.urlRes,o=f.headers,v=f.configRes,b=u.isCache,m=u.cacheConfig;if(b){var g=m.adapter.get(m.key);if(g)return Promise.resolve(g)}var _=t.toUpperCase()==="GET",y=_?R.JSON:u.qs?R.FORM_URLENCODED:R.JSON,S=a._objectSpread2({cancelToken:l.token,method:t,url:d,data:s,header:a._objectSpread2({"Content-Type":y},o)},v);return L(k,"request",S,u,h).then(function(P){return b&&m.adapter.set(m.key,P,m.expire),P})}return n.get=q(n,"get"),n.post=q(n,"post"),n}function J(e,r){return function n(i,t,s,c){var p=C.source(),l=F(n,arguments),h=O({loadingText:"上传中..."},r,c),u=w(i,e,s),f=u.urlRes,d=u.headers,o=u.configRes,v=a._objectSpread2({keyName:"file"},t),b=v.keyName,m=b===void 0?"file":b,g=v.filePath,_=a._objectWithoutProperties(v,$);if(!g||!g.startsWith("http://tmp")&&!g.startsWith("wxfile://tmp"))return Promise.resolve({data:g});var y=a._objectSpread2({cancelToken:p.token,url:f,filePath:g,name:m,formData:_,header:a._objectSpread2({},d)},o);return L(k,"uploadFile",y,h,l)}}function Y(e,r){return function n(i,t,s,c){var p=C.source(),l=F(n,arguments),h=O({loadingText:"下载中..."},r,c),u=w(i,e,s),f=u.urlRes,d=u.headers,o=u.configRes,v=f;if(t&&a._typeof(t)==="object"){var b=Object.entries(t).filter(function(g){var _=a._slicedToArray(g,2),y=_[1];return y!=null&&y!==""}).map(function(g){var _=a._slicedToArray(g,2),y=_[0],S=_[1];return"".concat(encodeURIComponent(y),"=").concat(encodeURIComponent(S))}).join("&");b&&(v+=(v.includes("?")?"&":"?")+b)}var m=a._objectSpread2({cancelToken:p.token,url:v,header:a._objectSpread2({},d)},o);return L(k,"downloadFile",m,h,l)}}exports.CONTENT_TYPES=R;exports.CancelToken=C;exports.createDownloadFile=Y;exports.createRequest=G;exports.createUploadFile=J;exports.endLoading=W;exports.hideLoading=D;exports.promisifyRequest=k;exports.showLoading=U;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 n=e[a];typeof(n==null?void 0:n.abort)=="function"&&n.abort()}return Object.seal({add:function(n,r){e[n]=r},delete:function(n){Reflect.deleteProperty(e,n)},_cancel:o,cancelAll:function(){Object.values(e).forEach(function(n){typeof(n==null?void 0:n.abort)=="function"&&n.abort()}),Object.keys(e).forEach(function(n){return delete e[n]})},source:function(){var n="".concat(Date.now(),"-").concat(U.getRandomStr(16));return{token:n,cancel:function(){return o(n)}}}})}());function A(e,o){return new Promise(function(a,n){var r=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));n(Object.assign(f,{type:"fail",res:i}))},fail:function(i){var f=new Error(i.errMsg||"request fail");n(Object.assign(f,{type:"fail",res:i}))},complete:function(){r&&C.delete(r)}}));r&&C.add(r,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,n,r,c){return e(a,o,n,r,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]:{},n=I(o.headers)(),r=I(a.headers)(),c=t._objectSpread2(t._objectSpread2(t._objectSpread2({},o),a),{},{headers:t._objectSpread2(t._objectSpread2({},n),r)}),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,n=a===void 0?{}:a,r=e.options,c=r===void 0?{}:r,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:n,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 q(e){var o=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},a=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},n=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(r){var c=[].concat(t._toConsumableArray(P(o[r])),t._toConsumableArray(P(a[r])));n[r]=c.length?U.composeAsync.apply(void 0,t._toConsumableArray(c)):function(l){return l}}),n}function L(e,o){var a=Array.from(o);return function(){return e.apply(void 0,t._toConsumableArray(H.cloneDeepWithDescriptors(a)))}}function F(e,o,a,n,r){return w.apply(this,arguments)}function w(){return w=t._asyncToGenerator(t._regenerator().m(function e(o,a,n,r,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,r.loading&&(z(r.loadingText),l=function(){$(),l=null}),u.p=1,u.n=2,r.reqInterceptor(n,r);case 2:return s=u.v,u.n=3,o(a,s);case 3:return i=u.v,u.n=4,r.resInterceptor(i,r,c);case 4:return f=u.v,u.a(2,f);case 5:return u.p=5,h=u.v,u.n=6,r.errInterceptor(h,r,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]])})),w.apply(this,arguments)}function B(e,o){function a(n,r,c,l,s){var i=C.source(),f=L(a,arguments),d=E(n,e,l),v=d.urlRes,h=d.headers,u=d.configRes,g=q("加载中...",o,s),k=r.toUpperCase()==="GET",R=k?S.JSON:g.qs?S.FORM_URLENCODED:S.JSON,m=t._objectSpread2({cancelToken:i.token,method:r,url:v,data:c,header:t._objectSpread2({"Content-Type":R},h)},u),p=Y({url:n,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=F(A,"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(n,r,c,l){var s=C.source(),i=L(a,arguments),f=E(n,e,c),d=f.urlRes,v=f.headers,h=f.configRes,u=q("上传中...",o,l),g=t._objectSpread2({keyName:"file"},r),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=F(A,"uploadFile",_,u,i);return y.cancel=s.cancel,y.token=s.token,y}}function X(e,o){return function a(n,r,c,l){var s=C.source(),i=L(a,arguments),f=E(n,e,c),d=f.urlRes,v=f.headers,h=f.configRes,u=q("下载中...",o,l),g=d;if(r&&t._typeof(r)==="object"&&!Array.isArray(r)){var k=Object.entries(r).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=F(A,"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=A;exports.showLoading=D;exports.startLoading=z;

package/package.json

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