utils-uniapp 1.1.1 → 1.1.4

package/lib/http/index.d.ts

@@ -1,108 +1,237 @@
-/** 请求Content-Type常量 */
-export const CONTENT_TYPES: Readonly<{
+/**
+ * 请求Content‑Type常量
+ */
+export declare const CONTENT_TYPES: Readonly<{
+  /** json格式 */
   JSON: string;
+  /** 纯文本 */
   TEXT: string;
+  /** url编码表单 */
   FORM_URLENCODED: string;
+  /** 文件上传表单 */
   FORM_DATA: string;
 }>;
 
-/** uni请求task对象 */
-interface UniTask {
-  abort: () => void;
-  [key: string]: any;
-}
+/** uni请求任务对象，依赖uni‑app全局UniApp命名空间 */
+type UniTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
+
+/**
+ * 请求取消控制器（仿axios CancelToken）
+ */
+export declare const CancelToken: {
+  caches: Record<string, UniTask | undefined>;
 
-/** 请求取消控制器（仿axios CancelToken） */
-export const CancelToken: {
-  caches: Record<string, UniTask>;
-  /** 注册任务 */
+  /**
+   * 注册任务
+   * @param token 唯一取消令牌
+   * @param task uni请求task对象
+   */
   add(token: string, task: UniTask): void;
-  /** 移除任务缓存 */
+
+  /**
+   * 移除任务缓存
+   * @param token 唯一取消令牌
+   */
   delete(token: string): void;
-  /** 取消全部请求 */
+
+  /**
+   * @internal 内部私有，请勿外部调用
+   * @param token
+   */
+  _cancel(token: string): void;
+
+  /**
+   * 取消全部请求
+   */
   cancelAll(): void;
-  /** 创建token与取消函数 */
+
+  /**
+   * 创建token与取消函数
+   * @returns { token:string, cancel:()=>void }
+   */
   source(): { token: string; cancel: () => void };
 };
 
+type UniRequestResult = UniApp.RequestSuccessCallbackResult;
+type UniUploadResult = UniApp.UploadFileSuccessCallbackResult;
+type UniDownloadResult = UniApp.DownloadFileSuccessCallbackResult;
+type UniAnyResult = UniRequestResult | UniUploadResult | UniDownloadResult;
+
 /**
  * 包装uni异步API为Promise
- * @param type uni接口名称
- * @param opts 请求参数
+ * @param type uni接口名称 request | uploadFile | downloadFile
+ * @param opts 请求参数，可以传入 cancelToken 用于请求取消
+ * @returns uni接口回调结果Promise
+ */
+export declare function promisifyRequest<T = UniAnyResult>(type: 'request' | 'uploadFile' | 'downloadFile', opts: Record<string, any>): Promise<T>;
+
+/**
+ * 开启loading计数
+ * @param title loading提示文本，默认：加载中...
  */
-export function promisifyRequest(
-  type: 'request' | 'uploadFile' | 'downloadFile',
-  opts: Record<string, any>
-): Promise<any>;
+export declare function startLoading(title?: string): void;
 
-/** 开启loading计数 @param title 提示文案，默认'加载中...' */
-export function startLoading(title?: string): void;
+/**
+ * 关闭loading计数
+ */
+export declare function endLoading(): void;
 
-/** 关闭loading计数 */
-export function endLoading(): void;
+// -------------------- 拦截器类型定义（运行时标准化后） --------------------
+/**
+ * 请求前置拦截器【标准化后】
+ * @param invokeArgs 组装完成即将传给uni的请求参数
+ * @param opts normalizeOpts合并后的完整配置
+ * @returns 处理后的请求参数
+ */
+type ReqInterceptor = (invokeArgs: Record<string, any>, opts: NormalizeOpts) => Promise<Record<string, any>>;
 
-/** 基础配置 */
-export interface RequestConfig {
-  baseURL?: string;
-  headers?: Record<string, any> | (() => Record<string, any>);
+/**
+ * 响应拦截器【标准化后】
+ * @param res uni原始响应对象
+ * @param opts normalizeOpts合并后的完整配置
+ * @param reloadFn 重发当前请求函数，返回Promise
+ * @returns 处理后业务数据
+ */
+type ResInterceptor = (res: UniAnyResult, opts: NormalizeOpts, reloadFn: () => Promise<any>) => Promise<any>;
+
+/**
+ * 错误拦截器【标准化后】
+ * @param err 捕获到的异常对象
+ * @param opts normalizeOpts合并后的完整配置
+ * @returns 返回非undefined代表错误已接管；返回undefined会继续抛出异常
+ */
+type ErrInterceptor = (err: any, opts: NormalizeOpts) => Promise<any>;
+
+/**
+ * 用户传入拦截器：支持单个函数 / 函数数组，交由 normalizeInterceptor + composeAsync合并
+ */
+type UserReqInterceptor = ReqInterceptor | ReqInterceptor[];
+type UserResInterceptor = ResInterceptor | ResInterceptor[];
+type UserErrInterceptor = ErrInterceptor | ErrInterceptor[];
+
+// 导出拦截器类型别名，供业务直接 import type 使用
+export type { ReqInterceptor, ResInterceptor, ErrInterceptor, UserReqInterceptor, UserResInterceptor, UserErrInterceptor };
+
+/**
+ * normalizeOpts标准化之后的请求额外配置对象【内部运行时】
+ */
+export interface NormalizeOpts {
+  /** post请求是否使用urlencoded表单格式 */
+  qs: boolean;
+  /** 是否开启默认错误弹窗提示 */
+  showError: boolean;
+  /** 是否开启接口缓存 */
+  isCache: boolean;
+  /** 缓存key前缀；不传/空字符串/undefined默认使用api；设置cacheKey时此配置无效 */
+  cachePrefix?: string;
+  /** 完整缓存key，传入则完全覆盖，优先级高于cachePrefix */
+  cacheKey: string;
+  /** 缓存过期时间，单位ms */
+  cacheExpire: number;
+  /** loading提示文案 */
+  loadingText: string;
+  /** 是否开启loading */
+  loading: boolean;
+  /** 请求前置拦截器（compose组合完成的单个函数） */
+  reqInterceptor: ReqInterceptor;
+  /** 响应拦截器（compose组合完成的单个函数） */
+  resInterceptor: ResInterceptor;
+  /** 错误拦截器（compose组合完成的单个函数） */
+  errInterceptor: ErrInterceptor;
+  /** 允许扩展自定义字段 */
   [key: string]: any;
 }
 
-/** 请求额外配置 */
-export interface RequestOptions {
-  /** 非GET请求是否使用urlencode表单（默认true） */
+/**
+ * 业务侧传入配置【外部用户参数，支持拦截器数组】
+ * 经过内部 normalizeOpts 之后转换为 NormalizeOpts
+ */
+export interface UserRequestOpts {
+  /** post请求是否使用urlencoded表单格式 */
   qs?: boolean;
-  /** 是否展示错误提示 */
+  /** 是否开启默认错误弹窗提示 */
   showError?: boolean;
-  /** 是否启用缓存 */
+  /** 是否开启接口缓存 */
   isCache?: boolean;
-  /** 缓存键名 */
+  /** 缓存key前缀；不传/空字符串/undefined默认使用api；设置cacheKey时此配置无效 */
+  cachePrefix?: string;
+  /** 完整缓存key，传入则完全覆盖，优先级高于cachePrefix */
   cacheKey?: string;
-  /** 缓存过期时间（毫秒），默认1小时 */
+  /** 缓存过期时间，单位ms */
   cacheExpire?: number;
-  /** loading文案 */
+  /** loading提示文案 */
   loadingText?: string;
-  /** 是否展示loading，默认true */
+  /** 是否开启loading */
   loading?: boolean;
-  /** 请求前置拦截器 */
-  reqInterceptor?: ((args: any) => any) | ((args: any) => any)[];
-  /** 响应拦截器 */
-  resInterceptor?: ((res: any, opts: any, reload: (() => any) | null) => any) | Array<(res: any, opts: any, reload: (() => any) | null) => any>;
-  /** 错误拦截器 */
-  errInterceptor?: ((err: any) => any) | ((err: any) => any)[];
+  /** 请求前置拦截器，支持单个函数或函数数组 */
+  reqInterceptor?: UserReqInterceptor;
+  /** 响应拦截器，支持单个函数或函数数组 */
+  resInterceptor?: UserResInterceptor;
+  /** 错误拦截器，支持单个函数或函数数组 */
+  errInterceptor?: UserErrInterceptor;
+  /** 允许扩展自定义字段 */
   [key: string]: any;
 }
 
-/** 常规http请求实例（get/post） */
-export type RequestFn = {
-  (url: string, method: string, params?: any, config?: RequestConfig, options?: RequestOptions): Promise<any>;
-  get(url: string, params?: any, config?: RequestConfig, options?: RequestOptions): Promise<any>;
-  post(url: string, params?: any, config?: RequestConfig, options?: RequestOptions): Promise<any>;
-};
+/**
+ * createRequest返回的请求实例对象
+ */
+interface RequestInstance {
+  /**
+   * 基础请求方法
+   * @param url 请求地址
+   * @param method 请求方法，如 GET / POST / PUT 等，支持自定义method字符串
+   * @param params 请求参数，允许传null
+   * @param config uni底层请求配置（header、timeout等）
+   * @param options 请求扩展配置（loading、缓存、拦截器等，支持拦截器数组）
+   */
+  (url: string, method: string, params?: any | null, config?: Record<string, any>, options?: UserRequestOpts): Promise<any>;
+
+  /**
+   * get快捷方法
+   * @param url 请求地址
+   * @param params 请求参数，允许传null
+   * @param config uni底层请求配置
+   * @param options 请求扩展配置
+   */
+  get(url: string, params?: any | null, config?: Record<string, any>, options?: UserRequestOpts): Promise<any>;
+
+  /**
+   * post快捷方法
+   * @param url 请求地址
+   * @param params 请求参数，允许传null
+   * @param config uni底层请求配置
+   * @param options 请求扩展配置
+   */
+  post(url: string, params?: any | null, config?: Record<string, any>, options?: UserRequestOpts): Promise<any>;
+}
 
 /**
  * 创建常规http请求实例（get/post）
- * @param defaultConfig 默认基础配置（baseURL、headers等）
- * @param defaultOpts 默认额外配置（拦截器、缓存、loading等）
+ * @param defaultConfig 全局基础配置 baseURL、headers等
+ * @param defaultOpts 全局默认扩展配置 loading、缓存、拦截器等，拦截器支持数组
+ * @returns RequestInstance 请求实例
  */
-export function createRequest(defaultConfig?: RequestConfig, defaultOpts?: RequestOptions): RequestFn;
+export declare function createRequest(defaultConfig: Record<string, any>, defaultOpts?: UserRequestOpts): RequestInstance;
 
 /**
  * 创建上传文件实例
- * @param defaultConfig 默认基础配置
- * @param defaultOpts 默认额外配置
+ * @param defaultConfig 全局基础配置 baseURL、headers等
+ * @param defaultOpts 全局默认扩展配置 loading、缓存、拦截器等，拦截器支持数组
+ * @returns 上传函数
  */
-export function createUploadFile(
-  defaultConfig?: RequestConfig,
-  defaultOpts?: RequestOptions
-): (url: string, params: { filePath: string; keyName?: string; [key: string]: any }, config?: RequestConfig, options?: RequestOptions) => Promise<any>;
+export declare function createUploadFile(
+  defaultConfig: Record<string, any>,
+  defaultOpts?: UserRequestOpts
+): (url: string, params: { filePath: string; keyName?: string; [key: string]: any }, config?: Record<string, any>, options?: UserRequestOpts) => Promise<any>;
 
 /**
  * 创建下载文件实例
- * @param defaultConfig 默认基础配置
- * @param defaultOpts 默认额外配置
+ * @param defaultConfig 全局基础配置 baseURL、headers等
+ * @param defaultOpts 全局默认扩展配置 loading、缓存、拦截器等，拦截器支持数组
+ * @returns 下载函数
  */
-export function createDownloadFile(
-  defaultConfig?: RequestConfig,
-  defaultOpts?: RequestOptions
-): (url: string, params?: Record<string, any>, config?: RequestConfig, options?: RequestOptions) => Promise<any>;
+export declare function createDownloadFile(
+  defaultConfig: Record<string, any>,
+  defaultOpts?: UserRequestOpts
+): (url: string, params?: Record<string, any>, config?: Record<string, any>, options?: UserRequestOpts) => Promise<any>;

package/lib/http/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../index-b81565a7.js"),A=require("../object/index.js"),O=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"}),m={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()}-${C.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function b(e,t){return new Promise((r,c)=>{const o=uni[e]({...t,success(n){if(n.statusCode>=200&&n.statusCode<300)return r(n);c({type:"fail",res:n})},fail(n){c({type:"fail",res:n})},complete(){t.cancelToken&&m.delete(t.cancelToken)}});t.cancelToken&&m.add(t.cancelToken,o)})}let R=0,v=!1;function N(e){v||(v=!0,uni.showLoading({title:e,mask:!0}))}function S(){v&&(v=!1,uni.hideLoading())}function j(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";R++,R===1&&N(e)}function D(){R>0&&R--,R===0&&S()}function _(e,t){return function(r,c,o,n){return e(r,t,c,o,n)}}function w(e){return typeof e=="function"?e:()=>e||{}}function k(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const c=w(t.headers)(),o=w(r.headers)(),n={...t,...r,headers:{...c,...o}},{headers:a,...s}=n;return{urlRes:e.startsWith("http")?e:n.baseURL?n.baseURL+e:e,headers:a,configRes:s}}function U(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}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 c={qs:!0,showError:!0,isCache:!1,cacheKey:`api:${e.url}`,cacheExpire:1e3*60*60*1,loadingText:e.loadingText,loading:!0,reqInterceptor:o=>o,resInterceptor:o=>o,errInterceptor:()=>{},...t,...r};return["reqInterceptor","resInterceptor","errInterceptor"].forEach(o=>{const n=[...U(t[o]),...U(r[o])];c[o]=n.length?C.composeAsync(...n):a=>a}),c}function q(e,t){const r=Array.from(t);return()=>e(...A.cloneDeepWithDescriptors(r))}function E(e,t,r,c,o){return x.apply(this,arguments)}function x(){return x=C._asyncToGenerator(function*(e,t,r,c,o){let n;c.loading&&(j(c.loadingText),n=()=>{D(),n=null});try{var a;const u=yield c.reqInterceptor(r),l=yield e(t,u);return(a=n)===null||a===void 0||a(),yield c.resInterceptor(l,c,o)}catch(u){var s;(s=n)===null||s===void 0||s();const l=yield c.errInterceptor(u);return l!==void 0?l:Promise.reject(u)}}),x.apply(this,arguments)}function L(e,t){function r(c,o,n,a,s){const u=m.source(),l=q(r,arguments),i=F({url:c,loadingText:"加载中..."},t,s),{urlRes:y,headers:T,configRes:g}=k(c,e,a);if(i.isCache){const d=C.getCache(i.cacheKey);if(d)return Promise.resolve(d)}const p=o.toUpperCase()==="GET"?O.JSON:i.qs?O.FORM_URLENCODED:O.JSON,h={cancelToken:u.token,method:o,url:y,data:n,header:{"Content-Type":p,...T},...g};return E(b,"request",h,i,l).then(d=>(i.isCache&&C.setCache(i.cacheKey,d,i.cacheExpire),d))}return r.get=_(r,"get"),r.post=_(r,"post"),r}function P(e,t){return function r(c,o,n,a){const s=m.source(),u=q(r,arguments),l=F({loadingText:"上传中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(c,e,n),{keyName:g="file",filePath:f,...p}={keyName:"file",...o};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const h={cancelToken:s.token,url:i,filePath:f,name:g,formData:p,header:{...y},...T};return E(b,"uploadFile",h,l,u)}}function z(e,t){return function r(c,o,n,a){const s=m.source(),u=q(r,arguments),l=F({loadingText:"下载中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(c,e,n);let g=i;if(o&&typeof o=="object"){const p=Object.entries(o).filter(h=>{let[,d]=h;return d!=null&&d!==""}).map(h=>{let[d,I]=h;return`${encodeURIComponent(d)}=${encodeURIComponent(I)}`}).join("&");p&&(g+=(g.includes("?")?"&":"?")+p)}const f={cancelToken:s.token,url:g,header:{...y},...T};return E(b,"downloadFile",f,l,u)}}exports.CONTENT_TYPES=O;exports.CancelToken=m;exports.createDownloadFile=z;exports.createRequest=L;exports.createUploadFile=P;exports.endLoading=D;exports.promisifyRequest=b;exports.startLoading=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../index-b81565a7.js"),A=require("../object/index.js"),O=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"}),m={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()}-${C.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function x(e,t){return new Promise((c,n)=>{const r=uni[e]({...t,success(o){if(o.statusCode>=200&&o.statusCode<300)return c(o);n({type:"fail",res:o})},fail(o){n({type:"fail",res:o})},complete(){t.cancelToken&&m.delete(t.cancelToken)}});t.cancelToken&&m.add(t.cancelToken,r)})}let R=0,v=!1;function N(e){v||(v=!0,uni.showLoading({title:e,mask:!0}))}function P(){v&&(v=!1,uni.hideLoading())}function j(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";R++,R===1&&N(e)}function D(){R>0&&R--,R===0&&P()}function _(e,t){return function(c,n,r,o){return e(c,t,n,r,o)}}function w(e){return typeof e=="function"?e:()=>e||{}}function k(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n=w(t.headers)(),r=w(c.headers)(),o={...t,...c,headers:{...n,...r}},{headers:a,...s}=o;return{urlRes:e.startsWith("http")?e:o.baseURL?o.baseURL+e:e,headers:a,configRes:s}}function U(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}function F(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const n={qs:!0,showError:!0,isCache:!1,cacheExpire:1e3*60*60*1,loadingText:e.loadingText,loading:!0,reqInterceptor:r=>r,resInterceptor:r=>r,errInterceptor:()=>{},...t,...c};if(!n.cacheKey){const r=(n.cachePrefix||"api").replace(/:$/,"");n.cacheKey=`${r}:${e.url}`}return["reqInterceptor","resInterceptor","errInterceptor"].forEach(r=>{const o=[...U(t[r]),...U(c[r])];n[r]=o.length?C.composeAsync(...o):a=>a}),n}function q(e,t){const c=Array.from(t);return()=>e(...A.cloneDeepWithDescriptors(c))}function E(e,t,c,n,r){return b.apply(this,arguments)}function b(){return b=C._asyncToGenerator(function*(e,t,c,n,r){let o;n.loading&&(j(n.loadingText),o=()=>{D(),o=null});try{var a;const u=yield n.reqInterceptor(c,n),l=yield e(t,u);return(a=o)===null||a===void 0||a(),yield n.resInterceptor(l,n,r)}catch(u){var s;(s=o)===null||s===void 0||s();const l=yield n.errInterceptor(u,n);return l!==void 0?l:Promise.reject(u)}}),b.apply(this,arguments)}function S(e,t){function c(n,r,o,a,s){const u=m.source(),l=q(c,arguments),i=F({url:n,loadingText:"加载中..."},t,s),{urlRes:y,headers:T,configRes:h}=k(n,e,a);if(i.isCache){const d=C.getCache(i.cacheKey);if(d)return Promise.resolve(d)}const p=r.toUpperCase()==="GET"?O.JSON:i.qs?O.FORM_URLENCODED:O.JSON,g={cancelToken:u.token,method:r,url:y,data:o,header:{"Content-Type":p,...T},...h};return E(x,"request",g,i,l).then(d=>(i.isCache&&C.setCache(i.cacheKey,d,i.cacheExpire),d))}return c.get=_(c,"get"),c.post=_(c,"post"),c}function L(e,t){return function c(n,r,o,a){const s=m.source(),u=q(c,arguments),l=F({loadingText:"上传中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(n,e,o),{keyName:h="file",filePath:f,...p}={keyName:"file",...r};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const g={cancelToken:s.token,url:i,filePath:f,name:h,formData:p,header:{...y},...T};return E(x,"uploadFile",g,l,u)}}function $(e,t){return function c(n,r,o,a){const s=m.source(),u=q(c,arguments),l=F({loadingText:"下载中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(n,e,o);let h=i;if(r&&typeof r=="object"){const p=Object.entries(r).filter(g=>{let[,d]=g;return d!=null&&d!==""}).map(g=>{let[d,I]=g;return`${encodeURIComponent(d)}=${encodeURIComponent(I)}`}).join("&");p&&(h+=(h.includes("?")?"&":"?")+p)}const f={cancelToken:s.token,url:h,header:{...y},...T};return E(x,"downloadFile",f,l,u)}}exports.CONTENT_TYPES=O;exports.CancelToken=m;exports.createDownloadFile=$;exports.createRequest=S;exports.createUploadFile=L;exports.endLoading=D;exports.promisifyRequest=x;exports.startLoading=j;

package/lib/index.d.ts

@@ -7,5 +7,6 @@ export * from './http';
 export * from './lodash';
 export * from './magic';
 export * from './object';
+export * from './pageStack';
 export * from './validate';
 export * as wx from './wx';

package/lib/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./aliPay/index.js"),a=require("./array/index.js"),n=require("./date/index.js"),t=require("./fs/index.js"),s=require("./getLocation/index.js"),r=require("./http/index.js"),e=require("./index-b81565a7.js"),i=require("./object/index.js"),o=require("./validate/index.js"),d=require("./index-9456b3d9.js"),m=require("./lodash");Object.assign(exports,m);exports.alipaySubmit=c.alipaySubmit;exports.exchangeArrP=a.exchangeArrP;exports.filterTree=a.filterTree;exports.findTreeItem=a.findTreeItem;exports.flatWithKey=a.flatWithKey;exports.getTreePath=a.getTreePath;exports.groupBy=a.groupBy;exports.reverseForEach=a.reverseForEach;exports.treeItemSetParent=a.treeItemSetParent;exports.dateFormat=n.dateFormat;exports.getDate=n.getDate;exports.$fs=t.$fs;exports.chooseImg=t.chooseImg;exports.getArraybufferTempPath=t.getArraybufferTempPath;exports.getImgBase64Prefix=t.getImgBase64Prefix;exports.readFile=t.readFile;exports.saveImageToPhotosAlbum=t.saveImageToPhotosAlbum;exports.writeFile=t.writeFile;exports.getLocation=s.getLocation;exports.openLocation=s.openLocation;exports.CONTENT_TYPES=r.CONTENT_TYPES;exports.CancelToken=r.CancelToken;exports.createDownloadFile=r.createDownloadFile;exports.createRequest=r.createRequest;exports.createUploadFile=r.createUploadFile;exports.endLoading=r.endLoading;exports.promisifyRequest=r.promisifyRequest;exports.startLoading=r.startLoading;exports.compareVersion=e.compareVersion;exports.compose=e.compose;exports.composeAsync=e.composeAsync;exports.debounce=e.debounce;exports.debouncePromise=e.debouncePromise;exports.decodeURIParams=e.decodeURIParams;exports.encodeURIParams=e.encodeURIParams;exports.getCache=e.getCache;exports.getOnLoadParams=e.getOnLoadParams;exports.getPascalCase=e.getPascalCase;exports.getQueryParams=e.getQueryParams;exports.getQueryParamsFromHash=e.getQueryParamsFromHash;exports.getQueryParamsFromSearch=e.getQueryParamsFromSearch;exports.getRandom=e.getRandom;exports.getRandomStr=e.getRandomStr;exports.pipe=e.pipe;exports.pipeAsync=e.pipeAsync;exports.randomColor=e.randomColor;exports.removeCache=e.removeCache;exports.renewCache=e.renewCache;exports.setCache=e.setCache;exports.throttle=e.throttle;exports.toQueryString=e.toQueryString;exports.cloneDeepWithDescriptors=i.cloneDeepWithDescriptors;exports.getRawType=i.getRawType;exports.hasOwnProperty=i.hasOwnProperty;exports.isExternal=o.isExternal;exports.validDate=o.validDate;exports.validIDCard=o.validIDCard;exports.validPhone=o.validPhone;exports.validPostalCode=o.validPostalCode;exports.validURL=o.validURL;exports.wx=d.index;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./aliPay/index.js"),a=require("./array/index.js"),s=require("./date/index.js"),o=require("./fs/index.js"),g=require("./getLocation/index.js"),r=require("./http/index.js"),e=require("./index-b81565a7.js"),n=require("./object/index.js"),t=require("./pageStack/index.js"),i=require("./validate/index.js"),d=require("./index-9456b3d9.js"),m=require("./lodash");Object.assign(exports,m);exports.alipaySubmit=c.alipaySubmit;exports.exchangeArrP=a.exchangeArrP;exports.filterTree=a.filterTree;exports.findTreeItem=a.findTreeItem;exports.flatWithKey=a.flatWithKey;exports.getTreePath=a.getTreePath;exports.groupBy=a.groupBy;exports.reverseForEach=a.reverseForEach;exports.treeItemSetParent=a.treeItemSetParent;exports.dateFormat=s.dateFormat;exports.getDate=s.getDate;exports.$fs=o.$fs;exports.chooseImg=o.chooseImg;exports.getArraybufferTempPath=o.getArraybufferTempPath;exports.getImgBase64Prefix=o.getImgBase64Prefix;exports.readFile=o.readFile;exports.saveImageToPhotosAlbum=o.saveImageToPhotosAlbum;exports.writeFile=o.writeFile;exports.getLocation=g.getLocation;exports.openLocation=g.openLocation;exports.CONTENT_TYPES=r.CONTENT_TYPES;exports.CancelToken=r.CancelToken;exports.createDownloadFile=r.createDownloadFile;exports.createRequest=r.createRequest;exports.createUploadFile=r.createUploadFile;exports.endLoading=r.endLoading;exports.promisifyRequest=r.promisifyRequest;exports.startLoading=r.startLoading;exports.compareVersion=e.compareVersion;exports.compose=e.compose;exports.composeAsync=e.composeAsync;exports.debounce=e.debounce;exports.debouncePromise=e.debouncePromise;exports.decodeURIParams=e.decodeURIParams;exports.encodeURIParams=e.encodeURIParams;exports.getCache=e.getCache;exports.getOnLoadParams=e.getOnLoadParams;exports.getPascalCase=e.getPascalCase;exports.getQueryParams=e.getQueryParams;exports.getQueryParamsFromHash=e.getQueryParamsFromHash;exports.getQueryParamsFromSearch=e.getQueryParamsFromSearch;exports.getRandom=e.getRandom;exports.getRandomStr=e.getRandomStr;exports.pipe=e.pipe;exports.pipeAsync=e.pipeAsync;exports.randomColor=e.randomColor;exports.removeCache=e.removeCache;exports.renewCache=e.renewCache;exports.setCache=e.setCache;exports.throttle=e.throttle;exports.toQueryString=e.toQueryString;exports.cloneDeepWithDescriptors=n.cloneDeepWithDescriptors;exports.getRawType=n.getRawType;exports.hasOwnProperty=n.hasOwnProperty;exports.backToRoute=t.backToRoute;exports.findPageByRoute=t.findPageByRoute;exports.getCurrentPage=t.getCurrentPage;exports.getCurrentPageOptions=t.getCurrentPageOptions;exports.getCurrentRoute=t.getCurrentRoute;exports.getPageStack=t.getPageStack;exports.getPageVm=t.getPageVm;exports.getPrevPage=t.getPrevPage;exports.getPrevRoute=t.getPrevRoute;exports.isExternal=i.isExternal;exports.validDate=i.validDate;exports.validIDCard=i.validIDCard;exports.validPhone=i.validPhone;exports.validPostalCode=i.validPostalCode;exports.validURL=i.validURL;exports.wx=d.index;

package/lib/pageStack/index.d.ts

@@ -0,0 +1,57 @@
+/**
+ * 获取当前页面实例
+ * @returns 当前页面对象，栈空返回 null
+ */
+export declare function getCurrentPage(): UniApp.PageInstance | null;
+
+/**
+ * 获取上一页页面实例
+ * @returns 上一页实例，无则 null
+ */
+export declare function getPrevPage(): UniApp.PageInstance | null;
+
+/**
+ * 获取完整页面栈副本
+ * @returns 页面实例数组副本
+ */
+export declare function getPageStack(): UniApp.PageInstance[];
+
+/**
+ * 获取当前页面路由（不带 query 参数）
+ * @returns 路由字符串，栈空返回 null
+ */
+export declare function getCurrentRoute(): string | null;
+
+/**
+ * 获取当前页面 onLoad options 参数
+ * @returns 页面启动参数，栈空返回 null
+ */
+export declare function getCurrentPageOptions(): Record<string, string | undefined> | null;
+
+/**
+ * 获取上一页路由
+ * @returns 路由字符串，无上一页返回 null
+ */
+export declare function getPrevRoute(): string | null;
+
+/**
+ * 根据路由在页面栈中查找页面对象
+ * @param route 页面路由，支持带/不带开头 /
+ * @returns 找到返回页面对象，否则 null
+ */
+export declare function findPageByRoute(route: string): UniApp.PageInstance | null;
+
+/**
+ * 回退到指定路由页面（封装 navigateBack Promise）
+ * @param targetRoute 目标页面路由，支持带/不带 /
+ * @param useReLaunchFallback 找不到页面是否开启reLaunch兜底，默认false；reLaunch会清空整个页面栈
+ * @returns true 使用navigateBack回退；false 未找到页面或执行兜底跳转
+ */
+export declare function backToRoute(targetRoute: string, useReLaunchFallback?: boolean): Promise<boolean>;
+
+/**
+ * 安全获取页面Vue组件$vm实例
+ * @param pageIns 页面对象实例
+ * @returns Vue组件实例，不存在/已销毁返回null
+ */
+export declare function getPageVm(pageIns: UniApp.PageInstance | null | undefined): any | null;

package/lib/pageStack/index.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function a(){try{const t=getCurrentPages();return t.length?t[t.length-1]:null}catch{return null}}function g(){try{const t=getCurrentPages();return t.length<2?null:t[t.length-2]}catch{return null}}function c(){try{return[...getCurrentPages()]}catch{return[]}}function s(){try{var t;const n=a();return(t=n==null?void 0:n.route)!==null&&t!==void 0?t:null}catch{return null}}function P(){try{var t;const n=a();return(t=n==null?void 0:n.options)!==null&&t!==void 0?t:null}catch{return null}}function d(){try{var t;const n=g();return(t=n==null?void 0:n.route)!==null&&t!==void 0?t:null}catch{return null}}function i(t){return typeof t!="string"?"":t.replace(/^\/+/,"")}function h(t){try{var n;const e=c(),r=i(t);return r&&(n=e.find(u=>u.route===r))!==null&&n!==void 0?n:null}catch{return null}}function y(t){let n=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;return new Promise(e=>{try{const r=c(),u=i(t);if(!u){e(!1);return}const l=r.findIndex(f=>f.route===u);if(l===r.length-1){e(!0);return}if(l===-1){n?uni.reLaunch({url:`/${u}`,success:()=>e(!1),fail:()=>e(!1)}):e(!1);return}const o=r.length-1-l;uni.navigateBack({delta:o,success:()=>e(!0),fail:()=>e(!1)})}catch{e(!1)}})}function v(t){try{var n;return t&&(n=t.$vm)!==null&&n!==void 0?n:null}catch{return null}}exports.backToRoute=y;exports.findPageByRoute=h;exports.getCurrentPage=a;exports.getCurrentPageOptions=P;exports.getCurrentRoute=s;exports.getPageStack=c;exports.getPageVm=v;exports.getPrevPage=g;exports.getPrevRoute=d;

package/package.json

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