utils-uniapp 1.1.8 → 1.1.10

package/lib/cache/index.d.ts

@@ -5,6 +5,7 @@
  */
 type StorageMode = 'session' | 'local';
 
+
 /**
  * 底层存储适配器接口，抹平uni‑storage与sessionStorage API差异
  */
@@ -41,6 +42,7 @@ interface IStorageAdapter {
   clear(): void;
 }
 
+
 /**
  * StorageCache实例构造配置项
  */
@@ -51,11 +53,18 @@ interface StorageCacheOptions {
   version?: string | number;
   /** 实例隔离前缀，内部自动追加下划线分隔，默认空字符串 */
   prefix?: string;
+  /**
+   * 实例默认过期秒数；set不传expire时使用该值
+   * <=0代表永不过期，默认0
+   */
+  defaultExpire?: number;
 }
 
+
 /**
  * 多端缓存工具类
  * 特性：过期控制、版本校验、实例key隔离前缀；适配uni‑app、H5‑sessionStorage
+ * 优先级说明：set传入expire > 实例defaultExpire；仅不传参(undefined)才使用实例默认配置
  * 注意：
  * 1. 业务传入key为业务key，内部自动拼接实例prefix
  * 2. clear仅删除本实例前缀key，无prefix时不执行删除
@@ -72,7 +81,7 @@ export declare class StorageCache {
    * 设置缓存，支持过期
    * @param key 业务缓存key
    * @param data 缓存数据
-   * @param expire 过期时间，单位秒；<=0永不过期，默认3600
+   * @param expire 过期时间，单位秒；不传使用实例defaultExpire；<=0永不过期
    * @returns true成功，false异常失败
    */
   set(key: string, data: any, expire?: number): boolean;
@@ -113,16 +122,19 @@ export declare class StorageCache {
   removeByPrefix(prefix: string): boolean;
 }
 
+
 /**
- * 全局默认local缓存实例，无实例隔离前缀，直接操作原始key
+ * 全局默认local缓存实例，无实例隔离前缀，直接操作原始key，默认永不过期
  * @type {StorageCache}
  */
 export declare const localCache: StorageCache;
 
+
 /**
- * 全局默认session缓存实例，无实例隔离前缀；小程序/App自动降级为local
+ * 全局默认session缓存实例，无实例隔离前缀；小程序/App自动降级为local，默认永不过期
  * @type {StorageCache}
  */
 export declare const sessionCache: StorageCache;
 
+
 export default StorageCache;

package/lib/cache/index.js

@@ -1 +1 @@
-"use strict";var w=(i,t,r)=>{if(!t.has(i))throw TypeError("Cannot "+r)};var n=(i,t,r)=>(w(i,t,"read from private field"),r?r.call(i):t.get(i)),g=(i,t,r)=>{if(t.has(i))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(i):t.set(i,r)},y=(i,t,r,s)=>(w(i,t,"write to private field"),s?s.call(i,r):t.set(i,r),r);var l=(i,t,r)=>(w(i,t,"access private method"),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var o,h,c,d,p,u,m;const v=class v{constructor(){g(this,u);g(this,o,void 0);g(this,h,void 0);g(this,c,void 0);var a;let t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};const{mode:r="local",version:s="v1",prefix:e=""}=t;y(this,o,l(a=v,d,p).call(a,r)),y(this,h,String(s)),y(this,c,e?e+"_":""),Object.seal(this)}set(t,r){let s=arguments.length>2&&arguments[2]!==void 0?arguments[2]:3600;try{let e=Number(s);Number.isFinite(e)||(e=0);const a=e>0?Math.round(e)*1e3:e,S=l(this,u,m).call(this,t);return n(this,o).set(S,{time:Date.now(),expire:a,version:n(this,h),data:r}),!0}catch(e){return console.error(`设置缓存[${t}]失败：`,e),!1}}get(t){let r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:null;try{const s=l(this,u,m).call(this,t),e=n(this,o).get(s);return!e||typeof e!="object"||Array.isArray(e)||!("time"in e)||!("expire"in e)||!("version"in e)?(e&&n(this,o).remove(s),r):e.version!==n(this,h)?(n(this,o).remove(s),r):e.expire>0&&Date.now()-e.time>=e.expire?(n(this,o).remove(s),r):e.data}catch(s){return console.error(`获取缓存[${t}]失败：`,s),r}}renew(t){try{const r=l(this,u,m).call(this,t),s=n(this,o).get(r);if(!s||typeof s!="object"||Array.isArray(s)||!("time"in s)||!("expire"in s)||!("version"in s))return!1;if(s.version!==n(this,h))return n(this,o).remove(r),!1;if(s.expire>0){if(Date.now()-s.time>=s.expire)return n(this,o).remove(r),!1;s.time=Date.now(),n(this,o).set(r,s)}return!0}catch(r){return console.error(`续期缓存[${t}]失败：`,r),!1}}remove(t){try{const r=l(this,u,m).call(this,t);return n(this,o).remove(r),!0}catch(r){return console.error(`删除缓存[${t}]失败：`,r),!1}}clear(){try{return n(this,o).keys().forEach(r=>{n(this,c)&&r.startsWith(n(this,c))&&n(this,o).remove(r)}),!0}catch(t){return console.error("清空实例缓存失败：",t),!1}}removeByPrefix(t){if(!t)return!1;if(!n(this,c))return console.warn("StorageCache: 当前实例无隔离前缀，禁止调用removeByPrefix，避免误删"),!1;try{const r=l(this,u,m).call(this,t);return n(this,o).keys().forEach(e=>{e.startsWith(r)&&n(this,o).remove(e)}),!0}catch(r){return console.error(`按前缀删除缓存[${t}]失败：`,r),!1}}};o=new WeakMap,h=new WeakMap,c=new WeakMap,d=new WeakSet,p=function(){let t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"local";const r=typeof window<"u"&&window.sessionStorage,s={set(e,a){uni.setStorageSync(e,a)},get(e){return uni.getStorageSync(e)},remove(e){uni.removeStorageSync(e)},keys(){try{return uni.getStorageInfoSync().keys||[]}catch(e){return console.error("uni getStorageInfoSync error",e),[]}},clear(){uni.clearStorageSync()}};return r&&t==="session"?{set(e,a){try{window.sessionStorage.setItem(e,JSON.stringify(a))}catch(S){console.error("sessionStorage set error",S)}},get(e){const a=window.sessionStorage.getItem(e);if(a===null)return null;try{return JSON.parse(a)}catch{return window.sessionStorage.removeItem(e),null}},remove(e){window.sessionStorage.removeItem(e)},keys(){return Object.keys(window.sessionStorage)},clear(){window.sessionStorage.clear()}}:s},u=new WeakSet,m=function(t){return n(this,c)+t},g(v,d);let f=v;const x=new f,I=new f({mode:"session"});exports.StorageCache=f;exports.default=f;exports.localCache=x;exports.sessionCache=I;
+"use strict";var p=(i,r,e)=>{if(!r.has(i))throw TypeError("Cannot "+e)};var n=(i,r,e)=>(p(i,r,"read from private field"),e?e.call(i):r.get(i)),l=(i,r,e)=>{if(r.has(i))throw TypeError("Cannot add the same private member more than once");r instanceof WeakSet?r.add(i):r.set(i,e)},y=(i,r,e,s)=>(p(i,r,"write to private field"),s?s.call(i,e):r.set(i,e),e);var h=(i,r,e)=>(p(i,r,"access private method"),e);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var o,f,c,v,S,x,u,m;const w=class w{constructor(){l(this,u);l(this,o,void 0);l(this,f,void 0);l(this,c,void 0);l(this,v,void 0);var g;let r=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};const{mode:e="local",version:s="v1",prefix:t="",defaultExpire:a=0}=r;y(this,o,h(g=w,S,x).call(g,e)),y(this,f,String(s)),y(this,c,t?t+"_":""),y(this,v,Number(a)),Object.seal(this)}set(r,e,s){try{const t=s!==void 0?s:n(this,v);let a=Number(t);Number.isFinite(a)||(a=0);const g=a>0?Math.round(a)*1e3:a,I=h(this,u,m).call(this,r);return n(this,o).set(I,{time:Date.now(),expire:g,version:n(this,f),data:e}),!0}catch(t){return console.error(`设置缓存[${r}]失败：`,t),!1}}get(r){let e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:null;try{const s=h(this,u,m).call(this,r),t=n(this,o).get(s);return!t||typeof t!="object"||Array.isArray(t)||!("time"in t)||!("expire"in t)||!("version"in t)?(t&&n(this,o).remove(s),e):t.version!==n(this,f)?(n(this,o).remove(s),e):t.expire>0&&Date.now()-t.time>=t.expire?(n(this,o).remove(s),e):t.data}catch(s){return console.error(`获取缓存[${r}]失败：`,s),e}}renew(r){try{const e=h(this,u,m).call(this,r),s=n(this,o).get(e);if(!s||typeof s!="object"||Array.isArray(s)||!("time"in s)||!("expire"in s)||!("version"in s))return!1;if(s.version!==n(this,f))return n(this,o).remove(e),!1;if(s.expire>0){if(Date.now()-s.time>=s.expire)return n(this,o).remove(e),!1;s.time=Date.now(),n(this,o).set(e,s)}return!0}catch(e){return console.error(`续期缓存[${r}]失败：`,e),!1}}remove(r){try{const e=h(this,u,m).call(this,r);return n(this,o).remove(e),!0}catch(e){return console.error(`删除缓存[${r}]失败：`,e),!1}}clear(){try{return n(this,o).keys().forEach(e=>{n(this,c)&&e.startsWith(n(this,c))&&n(this,o).remove(e)}),!0}catch(r){return console.error("清空实例缓存失败：",r),!1}}removeByPrefix(r){if(!r)return!1;if(!n(this,c))return console.warn("StorageCache: 当前实例无隔离前缀，禁止调用removeByPrefix，避免误删"),!1;try{const e=h(this,u,m).call(this,r);return n(this,o).keys().forEach(t=>{t.startsWith(e)&&n(this,o).remove(t)}),!0}catch(e){return console.error(`按前缀删除缓存[${r}]失败：`,e),!1}}};o=new WeakMap,f=new WeakMap,c=new WeakMap,v=new WeakMap,S=new WeakSet,x=function(){let r=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"local";const e=typeof window<"u"&&window.sessionStorage,s={set(t,a){uni.setStorageSync(t,a)},get(t){return uni.getStorageSync(t)},remove(t){uni.removeStorageSync(t)},keys(){try{return uni.getStorageInfoSync().keys||[]}catch(t){return console.error("uni getStorageInfoSync error",t),[]}},clear(){uni.clearStorageSync()}};return e&&r==="session"?{set(t,a){try{window.sessionStorage.setItem(t,JSON.stringify(a))}catch(g){console.error("sessionStorage set error",g)}},get(t){const a=window.sessionStorage.getItem(t);if(a===null)return null;try{return JSON.parse(a)}catch{return window.sessionStorage.removeItem(t),null}},remove(t){window.sessionStorage.removeItem(t)},keys(){return Object.keys(window.sessionStorage)},clear(){window.sessionStorage.clear()}}:s},u=new WeakSet,m=function(r){return n(this,c)+r},l(w,S);let d=w;const b=new d,K=new d({mode:"session"});exports.StorageCache=d;exports.default=d;exports.localCache=b;exports.sessionCache=K;

package/lib/http/index.d.ts

@@ -1,19 +1,28 @@
 /**
- * 依赖说明：需要安装 @types/uni‑app，提供 UniApp.* 命名空间类型
  * 请求Content‑Type常量
  */
 export declare const CONTENT_TYPES: Readonly<{
-  /** json格式 application/json;charset=UTF-8 */
+  /**
+   * json格式 application/json;charset=UTF-8
+   */
   JSON: string;
-  /** 纯文本 text/plain;charset=UTF-8 */
+  /**
+   * 纯文本 text/plain;charset=UTF-8
+   */
   TEXT: string;
-  /** url编码表单 application/x-www-form-urlencoded;charset=UTF-8 */
+  /**
+   * url编码表单 application/x-www-form-urlencoded;charset=UTF-8
+   */
   FORM_URLENCODED: string;
-  /** 文件上传表单 multipart/form‑data */
+  /**
+   * 文件上传表单 multipart/form‑data
+   */
   FORM_DATA: string;
 }>;
 
-/** uni请求任务对象，依赖uni‑app全局UniApp命名空间 */
+/**
+ * uni请求任务对象，依赖uni‑app全局UniApp命名空间
+ */
 type UniTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
 
 type UniRequestResult = UniApp.RequestSuccessCallbackResult;
@@ -21,46 +30,77 @@ type UniUploadResult = UniApp.UploadFileSuccessCallbackResult;
 type UniDownloadResult = UniApp.DownloadFileSuccessCallbackResult;
 type UniAnyResult = UniRequestResult | UniUploadResult | UniDownloadResult;
 
-export type RequestFailPayload = {
+/**
+ * 请求失败载荷【内部类型，不对外导出】
+ */
+type RequestFailPayload = {
   type: 'fail';
   res: UniApp.GeneralCallbackResult;
 };
 
+/**
+ * 缓存适配器抽象接口，对接外部缓存实现
+ */
 export interface CacheAdapter {
+  /**
+   * 获取缓存
+   * @param key 缓存key
+   * @returns 缓存值，不存在返回undefined
+   */
   get(key: string): unknown;
+
+  /**
+   * 设置缓存
+   * @param key 缓存key
+   * @param value 缓存存储内容
+   * @param expire 过期秒数；语义由适配器实现，约定 <=0 代表永不过期；request库仅透传数值，不做过期逻辑
+   */
   set(key: string, value: unknown, expire: number): void;
 }
 
 /**
- * 外部传入缓存配置入参（仅调用方使用）
+ * 外部传入缓存配置入参（仅调用方使用，业务传入）
+ * @description 开启请求缓存 isCache=true 时，必须传入对应 mode 的适配器 localAdapter / sessionAdapter
  */
 export interface CacheConfigInput {
+  /**
+   * 自定义缓存业务key；不填默认由url生成，**不包含请求参数**，同URL不同参数务必手动指定key
+   */
   key?: string;
+  /**
+   * 缓存key前缀，用于业务隔离，会拼接在业务key前面
+   */
   prefix?: string;
+  /**
+   * 缓存存储模式
+   * - local：持久存储
+   * - session：会话存储(H5会话销毁；小程序降级持久)
+   */
   mode?: 'local' | 'session';
+  /**
+   * 缓存过期时间，单位秒；语义由外部CacheAdapter实现，约定 <=0代表永不过期；库默认兜底1小时(3600s)
+   */
   expire?: number;
+  /**
+   * local模式对应的缓存适配器实例；mode=local且开启缓存时必填
+   */
   localAdapter?: CacheAdapter | null;
+  /**
+   * session模式对应的缓存适配器实例；mode=session且开启缓存时必填
+   */
   sessionAdapter?: CacheAdapter | null;
 }
 
 /**
- * normalizeOpts 之后内部运行时缓存配置对象
+ * normalizeOpts 之后内部运行时缓存配置对象【内部类型，不对外导出】
+ * @description adapter 字段由内部派生生成，外部禁止传入、禁止读取使用
  */
-export interface CacheConfig {
-  /** 缓存key；默认仅由url生成，**不包含请求参数**，同URL不同参数需手动指定key */
+interface CacheConfig {
   key: string;
-  /** 缓存key前缀 */
   prefix: string;
-  /** 缓存模式 */
   mode: 'local' | 'session';
-  /** 过期时间，单位秒 */
   expire: number;
-  /**
-   * ⚠️ adapter 为内部运行时派生字段，**外部禁止传入、禁止访问**；
-   * 开启 isCache:true，必须传入 CacheConfigInput 对应模式的适配器，否则运行时抛出异常
-   */
-  adapter: CacheAdapter | null;
-  [key: string]: unknown;
+  readonly adapter: CacheAdapter | null;
 }
 
 /**
@@ -69,7 +109,7 @@ export interface CacheConfig {
  * @param opts normalizeOpts合并后的完整配置
  * @returns 处理后的请求参数
  */
-export type ReqInterceptor = (invokeArgs: Record<string, unknown>, opts: RequestOptions) => Promise<Record<string, unknown>> | Record<string, unknown>;
+type ReqInterceptor = (invokeArgs: Record<string, any>, opts: RequestOptions) => Promise<Record<string, any>> | Record<string, any>;
 
 /**
  * 响应拦截器【标准化后】
@@ -78,15 +118,15 @@ export type ReqInterceptor = (invokeArgs: Record<string, unknown>, opts: Request
  * @param reloadFn 重发当前请求函数，可为null
  * @returns 处理后业务数据
  */
-export type ResInterceptor = (res: unknown, opts: RequestOptions, reloadFn: (() => Promise<unknown>) | null) => Promise<unknown> | unknown;
+type ResInterceptor = (res: any, opts: RequestOptions, reloadFn: (() => Promise<any>) | null) => Promise<any> | any;
 
 /**
  * 错误拦截器【标准化后】
- * @param err 捕获到的异常对象
+ * @param err 捕获到的异常对象，可能为接口回调失败载荷 RequestFailPayload 或 JS运行异常 Error
  * @param opts normalizeOpts合并后的完整配置
  * @returns 返回非undefined代表错误已接管；返回undefined会继续抛出异常
  */
-export type ErrInterceptor = (err: RequestFailPayload | Error, opts: RequestOptions) => Promise<unknown> | unknown;
+type ErrInterceptor = (err: RequestFailPayload | Error, opts: RequestOptions) => Promise<any> | any;
 
 /**
  * 用户传入拦截器：支持单个函数 / 函数数组，交由 normalizeInterceptor + composeAsync合并
@@ -98,27 +138,47 @@ export type UserErrInterceptor = ErrInterceptor | ErrInterceptor[];
 /**
  * normalizeOpts标准化之后的请求额外配置对象【内部运行时】
  */
-export interface RequestOptions {
-  /** 是否使用表单编码 */
+interface RequestOptions {
+  /**
+   * 是否使用url‑encoded表单编码
+   */
   qs: boolean;
-  /** 是否展示错误提示 */
+  /**
+   * 是否展示错误toast提示
+   */
   showError: boolean;
-  /** 是否开启缓存；开启时cacheConfig必须提供对应mode的适配器 */
+  /**
+   * 是否开启请求缓存；开启时cacheConfig必须提供对应mode的适配器
+   */
   isCache: boolean;
-  /** 缓存配置；adapter为内部运行时派生字段，外部请勿传入、请勿访问；开启isCache:true，必须传入对应模式的适配器，否则运行时抛出异常 */
+  /**
+   * 缓存配置；adapter为内部运行时派生字段，外部请勿传入、请勿访问；开启isCache:true，必须传入对应模式的适配器，否则运行时抛出异常
+   */
   cacheConfig: CacheConfig;
-  /** loading提示文字 */
+  /**
+   * loading提示文字
+   */
   loadingText: string;
-  /** 是否开启loading */
+  /**
+   * 是否开启全局loading弹窗
+   */
   loading: boolean;
-  /** 请求拦截器 */
+  /**
+   * 请求前置拦截器（已合并为单个函数）
+   */
   reqInterceptor: ReqInterceptor;
-  /** 响应拦截器 */
+  /**
+   * 响应拦截器（已合并为单个函数）
+   */
   resInterceptor: ResInterceptor;
-  /** 错误拦截器 */
+  /**
+   * 错误拦截器（已合并为单个函数）
+   */
   errInterceptor: ErrInterceptor;
-  /** 允许扩展自定义字段 */
-  [key: string]: unknown;
+  /**
+   * 允许扩展自定义字段
+   */
+  [key: string]: any;
 }
 
 /**
@@ -127,33 +187,71 @@ export interface RequestOptions {
  * @description isCache 设置为 true 时，cacheConfig 需要传入对应 mode 的适配器 localAdapter / sessionAdapter，否则运行时抛出异常
  */
 export interface UserRequestOpts {
-  /** 是否使用表单编码 */
+  /**
+   * 是否使用url‑encoded表单编码
+   */
   qs?: boolean;
-  /** 是否展示错误提示 */
+  /**
+   * 是否展示错误toast提示
+   */
   showError?: boolean;
-  /** 是否开启缓存；开启时cacheConfig必须提供对应mode的适配器(localAdapter/sessionAdapter) */
+  /**
+   * 是否开启请求缓存；开启时cacheConfig必须提供对应mode的适配器(localAdapter/sessionAdapter)
+   */
   isCache?: boolean;
-  /** 缓存配置，用户传入部分字段即可；isCache=true必须传入对应mode适配器 */
+  /**
+   * 缓存配置，用户传入部分字段即可；isCache=true必须传入对应mode适配器
+   */
   cacheConfig?: Partial<CacheConfigInput>;
-  /** loading提示文字 */
+  /**
+   * loading提示文字
+   */
   loadingText?: string;
-  /** 是否开启loading */
+  /**
+   * 是否开启全局loading弹窗
+   */
   loading?: boolean;
-  /** 请求前置拦截器，支持单个函数或函数数组 */
+  /**
+   * 请求前置拦截器，支持单个函数或函数数组
+   */
   reqInterceptor?: UserReqInterceptor;
-  /** 响应拦截器，支持单个函数或函数数组 */
+  /**
+   * 响应拦截器，支持单个函数或函数数组
+   */
   resInterceptor?: UserResInterceptor;
-  /** 错误拦截器，支持单个函数或函数数组 */
+  /**
+   * 错误拦截器，支持单个函数或函数数组
+   */
   errInterceptor?: UserErrInterceptor;
-  /** 允许扩展自定义字段 */
-  [key: string]: unknown;
+  /**
+   * 允许扩展自定义字段
+   */
+  [key: string]: any;
 }
 
+/**
+ * 请求config：uni.request配置，排除内部强制覆盖字段，允许业务扩展
+ */
+export type HttpRequestConfig = Omit<UniApp.RequestOptions, 'url'|'header'|'method'|'data'|'cancelToken'> & {[key:string]:any};
+
+/**
+ * 上传config：uni.uploadFile配置，排除内部强制覆盖字段
+ */
+export type UploadConfig = Omit<UniApp.UploadFileOptions, 'url'|'header'|'filePath'|'name'|'formData'|'cancelToken'> & {[key:string]:any};
+
+/**
+ * 下载config：uni.downloadFile配置，排除内部强制覆盖字段
+ */
+export type DownloadConfig = Omit<UniApp.DownloadFileOptions, 'url'|'header'|'cancelToken'> & {[key:string]:any};
+
 /**
  * 请求取消控制器（仿axios CancelToken）
- * 注意：当前实现token由请求内部source生成，**不支持外部传入自定义cancelToken**
+ * @description 注意：当前实现token由请求内部source生成，**不支持外部传入自定义cancelToken**
  */
 export declare const CancelToken: {
+  /**
+   * 保存token与uni任务映射
+   */
   caches: Record<string, UniTask>;
 
   /**
@@ -187,51 +285,51 @@ export declare const CancelToken: {
   source(): { token: string; cancel: () => void };
 };
 
-
 /**
  * 包装uni异步API为Promise
  * @param type uni接口名称 request | uploadFile | downloadFile
  * @param opts 请求参数，可以传入 cancelToken 用于请求取消
- * @description 泛型仅为类型断言，运行时不会做类型转换
+ * @description TS 无法表达 Promise reject 类型；本泛型T仅代表resolve成功返回类型；catch捕获为 RequestFailPayload | Error
  * @returns uni接口回调结果Promise
  */
-export declare function promisifyRequest<T = UniAnyResult>(type: 'request' | 'uploadFile' | 'downloadFile', opts: Record<string, unknown>): Promise<T>;
+export declare function promisifyRequest<T = UniAnyResult>(type: 'request' | 'uploadFile' | 'downloadFile', opts: Record<string, any>): Promise<T>;
 
 /**
- * 底层展示loading
- * @param {string} title loading提示文字
+ * 底层直接展示loading，不做计数
+ * @param title loading提示文字
  */
 export declare function showLoading(title: string): void;
 
 /**
- * 底层隐藏loading
+ * 底层直接隐藏loading，不做计数
  */
 export declare function hideLoading(): void;
 
 /**
- * 开启loading计数，计数>0时展示loading
+ * 开启loading计数，计数>0时展示loading；多次调用会叠加计数
  * @param [title='加载中...'] loading提示文案
  */
 export declare function startLoading(title?: string): void;
 
 /**
- * 关闭loading计数，计数归0则隐藏loading
+ * 关闭loading计数，计数归0则真正隐藏loading弹窗
  */
 export declare function endLoading(): void;
 
 /**
- * createRequest返回的请求实例对象
+ * createRequest返回的请求实例对象，支持泛型T指定响应类型
  */
 export interface RequestInstance {
   /**
+   * 基础请求调用
    * @param url 请求地址
-   * @param method get/post等http方法
+   * @param method http方法 get/post/put/delete等
    * @param params 请求参数
-   * @param [config] 当前请求配置，覆盖defaultConfig
-   * @param [options] 当前请求扩展选项，覆盖defaultOpts
-   * @returns {Promise<unknown>}
+   * @param [config] 当前请求配置，覆盖实例defaultConfig（baseURL、headers等）
+   * @param [options] 当前请求扩展选项，覆盖实例defaultOpts（loading、缓存、拦截器）
+   * @returns Promise业务响应数据
    */
-  (url: string, method: string, params?: unknown, config?: Record<string, unknown>, options?: UserRequestOpts): Promise<unknown>;
+  <T = any>(url: string, method: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
 
   /**
    * get快捷方法
@@ -239,8 +337,9 @@ export interface RequestInstance {
    * @param params 请求参数
    * @param [config] 当前请求配置
    * @param [options] 当前请求扩展选项
+   * @returns Promise业务响应数据
    */
-  get(url: string, params?: unknown, config?: Record<string, unknown>, options?: UserRequestOpts): Promise<unknown>;
+  get<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
 
   /**
    * post快捷方法
@@ -248,53 +347,60 @@ export interface RequestInstance {
    * @param params 请求参数
    * @param [config] 当前请求配置
    * @param [options] 当前请求扩展选项
+   * @returns Promise业务响应数据
    */
-  post(url: string, params?: unknown, config?: Record<string, unknown>, options?: UserRequestOpts): Promise<unknown>;
+  post<T = any>(url: string, params: any, config?: HttpRequestConfig, options?: UserRequestOpts): Promise<T>;
 }
 
 /**
  * 创建常规http请求实例（get/post）
  * @param defaultConfig 实例默认配置(baseURL、headers等)
  * @param defaultOpts 实例默认扩展选项(loading、缓存、拦截器)
- * @returns {RequestInstance}
+ * @returns RequestInstance 请求实例
  */
-export declare function createRequest(defaultConfig: Record<string, unknown>, defaultOpts?: UserRequestOpts): RequestInstance;
+export declare function createRequest(defaultConfig: HttpRequestConfig, defaultOpts?: UserRequestOpts): RequestInstance;
 
 /**
  * 创建上传文件实例
  * @param defaultConfig 实例默认配置(baseURL、headers等)
  * @param defaultOpts 实例默认扩展选项
- * @returns 上传函数
+ * @returns 上传调用函数
  */
 export declare function createUploadFile(
-  defaultConfig: Record<string, unknown>,
+  defaultConfig: UploadConfig,
   defaultOpts?: UserRequestOpts
-): (url: string, params: { filePath: string; keyName?: string; [key: string]: unknown }, config?: Record<string, unknown>, options?: UserRequestOpts) => Promise<unknown>;
+): <T = any>(
+  url: string,
+  params: { filePath: string; keyName?: string; [key: string]: any },
+  config?: UploadConfig,
+  options?: UserRequestOpts
+) => Promise<T>;
 
 /**
  * 创建下载文件实例
  * @param defaultConfig 实例默认配置(baseURL、headers等)
  * @param defaultOpts 实例默认扩展选项
- * @returns 下载函数
+ * @returns 下载调用函数
  */
 export declare function createDownloadFile(
-  defaultConfig: Record<string, unknown>,
+  defaultConfig: DownloadConfig,
   defaultOpts?: UserRequestOpts
-): (url: string, params?: Record<string, unknown>, config?: Record<string, unknown>, options?: UserRequestOpts) => Promise<unknown>;
+): <T = any>(
+  url: string,
+  params?: Record<string, any>,
+  config?: DownloadConfig,
+  options?: UserRequestOpts
+) => Promise<T>;
 
-// 导出全部业务可用类型
 export type {
-  ReqInterceptor,
-  ResInterceptor,
-  ErrInterceptor,
+  CacheAdapter,
+  CacheConfigInput,
   UserReqInterceptor,
   UserResInterceptor,
   UserErrInterceptor,
-  CacheAdapter,
-  CacheConfigInput,
-  CacheConfig,
-  RequestFailPayload,
-  RequestOptions,
   UserRequestOpts,
-  RequestInstance
+  RequestInstance,
+  HttpRequestConfig,
+  UploadConfig,
+  DownloadConfig
 };

package/lib/http/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("../index-1b48ae95.js"),P=require("../object/index.js"),k=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"}),y={caches:Object.create(null),add(e,t){this.caches[e]=t},delete(e){Reflect.deleteProperty(this.caches,e)},_cancel(e){const t=this.caches[e];typeof(t==null?void 0:t.abort)=="function"&&t.abort()},cancelAll(){Object.values(this.caches).forEach(e=>{typeof(e==null?void 0:e.abort)=="function"&&e.abort()}),this.caches=Object.create(null)},source(){const e=`${Date.now()}-${w.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function O(e,t){return new Promise((r,n)=>{const i=uni[e]({...t,success(o){if(o.statusCode>=200&&o.statusCode<300)return r(o);n({type:"fail",res:o})},fail(o){n({type:"fail",res:o})},complete(){t.cancelToken&&y.delete(t.cancelToken)}});t.cancelToken&&y.add(t.cancelToken,i)})}let R=0,x=!1;function U(e){x||(x=!0,uni.showLoading({title:e,mask:!0}))}function D(){x&&(x=!1,uni.hideLoading())}function L(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";R++,R===1&&U(e)}function N(){R>0&&R--,R===0&&D()}function j(e,t){return function(r,n,i,o){return e(r,t,n,i,o)}}function A(e){return typeof e=="function"?e:()=>e||{}}function F(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n=A(t.headers)(),i=A(r.headers)(),o={...t,...r,headers:{...n,...i}},{headers:s,...u}=o;return{urlRes:e.startsWith("http")?e:o.baseURL?o.baseURL+e:e,headers:s,configRes:u}}function I(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}function q(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n={qs:!0,showError:!0,isCache:!1,cacheConfig:{},loadingText:e.loadingText,loading:!0,reqInterceptor:a=>a,resInterceptor:a=>a,errInterceptor:()=>{},...t,...r},i={...t.cacheConfig,...r.cacheConfig},{localAdapter:o,sessionAdapter:s,...u}=i,c={key:"",prefix:"api",mode:"local",expire:60*60,...u};if(!c.key){const a=(c.prefix||"api").replace(/:$/,"");c.key=`${a}:${e.url}`}if(c.adapter=c.mode==="session"?s:o,Object.defineProperty(c,"adapter",{writable:!1,configurable:!1}),n.cacheConfig=c,n.isCache){const a=c.adapter;if(!(a&&typeof a.get=="function"&&typeof a.set=="function"))throw new Error("开启缓存(isCache=true)时，请在cacheConfig传入对应mode的适配器，适配器必须实现 get(key)、set(key,value,expire) 方法")}return["reqInterceptor","resInterceptor","errInterceptor"].forEach(a=>{const l=[...I(t[a]),...I(r[a])];n[a]=l.length?w.composeAsync(...l):g=>g}),n}function E(e,t){const r=Array.from(t);return()=>e(...P.cloneDeepWithDescriptors(r))}function _(e,t,r,n,i){return v.apply(this,arguments)}function v(){return v=w._asyncToGenerator(function*(e,t,r,n,i){let o;n.loading&&(L(n.loadingText),o=()=>{N(),o=null});try{var s;const c=yield n.reqInterceptor(r,n),a=yield e(t,c);return(s=o)===null||s===void 0||s(),yield n.resInterceptor(a,n,i)}catch(c){var u;(u=o)===null||u===void 0||u();const a=yield n.errInterceptor(c,n);return a!==void 0?a:Promise.reject(c)}}),v.apply(this,arguments)}function S(e,t){function r(n,i,o,s,u){const c=y.source(),a=E(r,arguments),l=q({url:n,loadingText:"加载中..."},t,u),{urlRes:g,headers:C,configRes:h}=F(n,e,s),f=l.isCache,d=l.cacheConfig;if(f){const T=d.adapter.get(d.key);if(T)return Promise.resolve(T)}const m=i.toUpperCase()==="GET"?k.JSON:l.qs?k.FORM_URLENCODED:k.JSON,b={cancelToken:c.token,method:i,url:g,data:o,header:{"Content-Type":m,...C},...h};return _(O,"request",b,l,a).then(T=>(f&&d.adapter.set(d.key,T,d.expire),T))}return r.get=j(r,"get"),r.post=j(r,"post"),r}function $(e,t){return function r(n,i,o,s){const u=y.source(),c=E(r,arguments),a=q({loadingText:"上传中..."},t,s),{urlRes:l,headers:g,configRes:C}=F(n,e,o),{keyName:h="file",filePath:f,...d}={keyName:"file",...i};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const p={cancelToken:u.token,url:l,filePath:f,name:h,formData:d,header:{...g},...C};return _(O,"uploadFile",p,a,c)}}function z(e,t){return function r(n,i,o,s){const u=y.source(),c=E(r,arguments),a=q({loadingText:"下载中..."},t,s),{urlRes:l,headers:g,configRes:C}=F(n,e,o);let h=l;if(i&&typeof i=="object"){const d=Object.entries(i).filter(p=>{let[,m]=p;return m!=null&&m!==""}).map(p=>{let[m,b]=p;return`${encodeURIComponent(m)}=${encodeURIComponent(b)}`}).join("&");d&&(h+=(h.includes("?")?"&":"?")+d)}const f={cancelToken:u.token,url:h,header:{...g},...C};return _(O,"downloadFile",f,a,c)}}exports.CONTENT_TYPES=k;exports.CancelToken=y;exports.createDownloadFile=z;exports.createRequest=S;exports.createUploadFile=$;exports.endLoading=N;exports.hideLoading=D;exports.promisifyRequest=O;exports.showLoading=U;exports.startLoading=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../index-1b48ae95.js"),P=require("../object/index.js"),k=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"}),y={caches:Object.create(null),add(e,t){this.caches[e]=t},delete(e){Reflect.deleteProperty(this.caches,e)},_cancel(e){const t=this.caches[e];typeof(t==null?void 0:t.abort)=="function"&&t.abort()},cancelAll(){Object.values(this.caches).forEach(e=>{typeof(e==null?void 0:e.abort)=="function"&&e.abort()}),this.caches=Object.create(null)},source(){const e=`${Date.now()}-${v.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function O(e,t){return new Promise((r,n)=>{const i=uni[e]({...t,success(o){if(o.statusCode>=200&&o.statusCode<300)return r(o);n({type:"fail",res:o})},fail(o){n({type:"fail",res:o})},complete(){t.cancelToken&&y.delete(t.cancelToken)}});t.cancelToken&&y.add(t.cancelToken,i)})}let R=0,x=!1;function L(e){x||(x=!0,uni.showLoading({title:e,mask:!0}))}function U(){x&&(x=!1,uni.hideLoading())}function D(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";R++,R===1&&L(e)}function N(){R>0&&R--,R===0&&U()}function j(e,t){return function(r,n,i,o){return e(r,t,n,i,o)}}function A(e){return typeof e=="function"?e:()=>e||{}}function F(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n=A(t.headers)(),i=A(r.headers)(),o={...t,...r,headers:{...n,...i}},{headers:l,...s}=o;return{urlRes:e.startsWith("http")?e:o.baseURL?o.baseURL+e:e,headers:l,configRes:s}}function I(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}function _(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n={qs:!0,showError:!0,isCache:!1,cacheConfig:{},loadingText:e.loadingText,loading:!0,reqInterceptor:c=>c,resInterceptor:c=>c,errInterceptor:()=>{},...t,...r},i={...t.cacheConfig,...r.cacheConfig},{localAdapter:o,sessionAdapter:l,...s}=i,a={key:"",prefix:"api",mode:"local",expire:60*60,...s};if(!a.key){const c=(a.prefix||"api").replace(/:$/,"");a.key=`${c}:${e.url}`}if(a.adapter=a.mode==="session"?l:o,Object.defineProperty(a,"adapter",{writable:!1,configurable:!1}),n.cacheConfig=a,n.isCache){const c=a.adapter;if(!(c&&typeof c.get=="function"&&typeof c.set=="function"))throw new Error("开启缓存(isCache=true)时，请在cacheConfig传入对应mode的适配器，适配器必须实现 get(key)、set(key,value,expire) 方法")}return["reqInterceptor","resInterceptor","errInterceptor"].forEach(c=>{const u=[...I(t[c]),...I(r[c])];n[c]=u.length?v.composeAsync(...u):g=>g}),n}function q(e,t){const r=Array.from(t);return()=>e(...P.cloneDeepWithDescriptors(r))}function E(e,t,r,n,i){return w.apply(this,arguments)}function w(){return w=v._asyncToGenerator(function*(e,t,r,n,i){let o;n.loading&&(D(n.loadingText),o=()=>{N(),o=null});try{const s=yield n.reqInterceptor(r,n),a=yield e(t,s);return yield n.resInterceptor(a,n,i)}catch(s){const a=yield n.errInterceptor(s,n);return a!==void 0?a:Promise.reject(s)}finally{var l;(l=o)===null||l===void 0||l()}}),w.apply(this,arguments)}function S(e,t){function r(n,i,o,l,s){const a=y.source(),c=q(r,arguments),u=_({url:n,loadingText:"加载中..."},t,s),{urlRes:g,headers:C,configRes:h}=F(n,e,l),f=u.isCache,d=u.cacheConfig;if(f){const T=d.adapter.get(d.key);if(T)return Promise.resolve(T)}const m=i.toUpperCase()==="GET"?k.JSON:u.qs?k.FORM_URLENCODED:k.JSON,b={cancelToken:a.token,method:i,url:g,data:o,header:{"Content-Type":m,...C},...h};return E(O,"request",b,u,c).then(T=>(f&&d.adapter.set(d.key,T,d.expire),T))}return r.get=j(r,"get"),r.post=j(r,"post"),r}function $(e,t){return function r(n,i,o,l){const s=y.source(),a=q(r,arguments),c=_({loadingText:"上传中..."},t,l),{urlRes:u,headers:g,configRes:C}=F(n,e,o),{keyName:h="file",filePath:f,...d}={keyName:"file",...i};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const p={cancelToken:s.token,url:u,filePath:f,name:h,formData:d,header:{...g},...C};return E(O,"uploadFile",p,c,a)}}function z(e,t){return function r(n,i,o,l){const s=y.source(),a=q(r,arguments),c=_({loadingText:"下载中..."},t,l),{urlRes:u,headers:g,configRes:C}=F(n,e,o);let h=u;if(i&&typeof i=="object"){const d=Object.entries(i).filter(p=>{let[,m]=p;return m!=null&&m!==""}).map(p=>{let[m,b]=p;return`${encodeURIComponent(m)}=${encodeURIComponent(b)}`}).join("&");d&&(h+=(h.includes("?")?"&":"?")+d)}const f={cancelToken:s.token,url:h,header:{...g},...C};return E(O,"downloadFile",f,c,a)}}exports.CONTENT_TYPES=k;exports.CancelToken=y;exports.createDownloadFile=z;exports.createRequest=S;exports.createUploadFile=$;exports.endLoading=N;exports.hideLoading=U;exports.promisifyRequest=O;exports.showLoading=L;exports.startLoading=D;

package/package.json

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