@ibiz-template/core 0.0.1-alpha.6 → 0.0.1-beta.130

package/out/utils/net/net.d.ts

@@ -1,4 +1,5 @@
-import { AxiosRequestHeaders } from 'axios';
+import { RawAxiosRequestHeaders, AxiosResponse, AxiosRequestConfig, AxiosInstance, CreateAxiosDefaults } from 'axios';
+import { Interceptor } from '../interceptor/interceptor';
 import { IHttpResponse } from './http-response';
 /**
  * 全局请求工具类
@@ -10,73 +11,150 @@ import { IHttpResponse } from './http-response';
  */
 export declare class Net {
     /**
-     * 标准请求前缀
+     * axios实例
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:18
+     * @protected
+     * @type {AxiosInstance}
+     */
+    protected instance: AxiosInstance;
+    /**
+     * 是否为 http || https 开头
      *
      * @author chitanda
-     * @date 2022-07-21 10:07:48
+     * @date 2022-11-07 14:11:28
      * @protected
-     * @type {string}
      */
-    protected _prefix: string;
-    get prefix(): string;
+    protected urlReg: RegExp;
     /**
      * Creates an instance of Net.
+     * @author lxm
+     * @date 2022-10-27 16:10:05
+     * @param {CreateAxiosDefaults} [config] 创建实例用的默认配置
+     */
+    constructor(config?: CreateAxiosDefaults);
+    /**
+     * 注册的拦截器
      *
-     * @author chitanda
-     * @date 2022-07-21 10:07:27
-     * @param {string} [prefix] 请求前缀
+     * @author lxm
+     * @date 2022-10-27 17:10:18
+     * @type {Map<string, Interceptor>}
+     */
+    interceptors: Map<string, Interceptor>;
+    /**
+     * 添加拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:42
+     * @param {string} name 唯一标识
+     * @param {Interceptor} interceptor 拦截器
+     */
+    addInterceptor(name: string, interceptor: Interceptor): void;
+    /**
+     * 删除拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {string} name 唯一标识
+     */
+    removeInterceptor(name: string): void;
+    /**
+     * 预置config,绑定动态的配置
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:48
+     * @readonly
+     * @protected
+     * @type {AxiosRequestConfig}
+     */
+    protected get presetConfig(): AxiosRequestConfig;
+    /**
+     * 从左到右递归合并配置参数（内置第一个合并的预置参数）
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:09
+     * @protected
+     * @param {...AxiosRequestConfig[]} configs
+     * @returns {*}
      */
-    constructor(prefix?: string);
+    protected mergeConfig(...configs: AxiosRequestConfig[]): any;
     /**
      * Post 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:01
+     * @date 2022-10-19 11:10:30
      * @param {string} url
+     * @param {IData} data
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    post(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    post(url: string, data: IData, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Get 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:08
+     * @date 2022-10-19 11:10:24
      * @param {string} url
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
+     * @param {IParams} [option={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    get(url: string, params?: IParams, headers?: AxiosRequestHeaders, option?: IParams): Promise<IHttpResponse>;
+    get(url: string, params?: IParams, headers?: RawAxiosRequestHeaders, option?: AxiosRequestConfig): Promise<IHttpResponse>;
     /**
      * Delete 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:43
+     * @date 2022-10-19 11:10:17
      * @param {string} url
      * @param {IParams} [params]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    delete(url: string, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    delete(url: string, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Put 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:49
+     * @date 2022-10-19 11:10:11
      * @param {string} url
      * @param {IData} data
+     * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    put(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    put(url: string, data: IData, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * 获取模型数据
      *
      * @author chitanda
      * @date 2022-07-14 15:07:15
      * @param {string} url
-     * @param {AxiosRequestHeaders} [headers={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    getModel(url: string, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    getModel(url: string, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
+    /**
+     * 基础请求方法，会合并预置配置
+     *
+     * @author lxm
+     * @date 2022-10-27 14:10:06
+     * @param {string} url
+     * @param {AxiosRequestConfig} [config={}]
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    request(url: string, config?: AxiosRequestConfig): Promise<IHttpResponse>;
+    /**
+     * 创建标准 axios 请求
+     *
+     * @author chitanda
+     * @date 2023-01-30 15:01:27
+     * @param {AxiosRequestConfig<IData>} config
+     * @return {*}
+     */
+    axios(config: AxiosRequestConfig<IData>): Promise<AxiosResponse<any, any>>;
     /**
      * 统一处理请求返回
      *
@@ -109,15 +187,5 @@ export declare class Net {
      * @return {*}  {string}
      */
     private attachUrlParam;
-    /**
-     * 处理 url 参数
-     *
-     * @author chitanda
-     * @date 2022-07-20 20:07:17
-     * @private
-     * @param {string} url
-     * @return {*}  {string}
-     */
-    private attachUrl;
 }
 //# sourceMappingURL=net.d.ts.map

package/out/utils/net/net.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAAc,mBAAmB,EAAiB,MAAM,OAAO,CAAC;AAI9E,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAM;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;gBACS,MAAM,CAAC,EAAE,MAAM;IAM3B;;;;;;;;OAQG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAmBzB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,EACjC,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;IAiBtB;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAEZ,sBAAsB,EACtB,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACpB,MAAM,OAAO,CAAC;AAMf,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,SAA0B;IAE1C;;;;;OAKG;gBACS,MAAM,CAAC,EAAE,mBAAmB;IAKxC;;;;;;OAMG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW;IAKrD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM;IAQ9B;;;;;;;;OAQG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,CAS/C;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,OAAO,EAAE,kBAAkB,EAAE;IAYtD;;;;;;;;;;OAUG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;;;OAUG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,EACpC,MAAM,GAAE,kBAAuB,GAC9B,OAAO,CAAC,aAAa,CAAC;IAiBzB;;;;;;;;;OASG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;;;OAUG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,kBAAuB,GAC9B,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAIvC;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;CAevB"}

package/out/utils/net/net.js

@@ -1,7 +1,9 @@
 import axios from 'axios';
+import { merge } from 'lodash-es';
 import { stringify } from 'qs';
 import { notNilEmpty } from 'qx-util';
 import { HttpError } from '../../error';
+import { CoreInterceptor } from '../interceptor';
 /**
  * 全局请求工具类
  *
@@ -13,45 +15,113 @@ import { HttpError } from '../../error';
 export class Net {
     /**
      * Creates an instance of Net.
-     *
-     * @author chitanda
-     * @date 2022-07-21 10:07:27
-     * @param {string} [prefix] 请求前缀
+     * @author lxm
+     * @date 2022-10-27 16:10:05
+     * @param {CreateAxiosDefaults} [config] 创建实例用的默认配置
      */
-    constructor(prefix) {
+    constructor(config) {
         /**
-         * 标准请求前缀
+         * 是否为 http || https 开头
          *
          * @author chitanda
-         * @date 2022-07-21 10:07:48
+         * @date 2022-11-07 14:11:28
          * @protected
-         * @type {string}
          */
-        this._prefix = '';
-        if (prefix) {
-            this._prefix = prefix;
+        this.urlReg = /^http[s]?:\/\/[^\s]*/;
+        /**
+         * 注册的拦截器
+         *
+         * @author lxm
+         * @date 2022-10-27 17:10:18
+         * @type {Map<string, Interceptor>}
+         */
+        this.interceptors = new Map();
+        this.instance = axios.create(config);
+        this.addInterceptor('Default', new CoreInterceptor());
+    }
+    /**
+     * 添加拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:42
+     * @param {string} name 唯一标识
+     * @param {Interceptor} interceptor 拦截器
+     */
+    addInterceptor(name, interceptor) {
+        interceptor.use(this.instance);
+        this.interceptors.set(name, interceptor);
+    }
+    /**
+     * 删除拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {string} name 唯一标识
+     */
+    removeInterceptor(name) {
+        const interceptor = this.interceptors.get(name);
+        if (interceptor) {
+            interceptor.eject(this.instance);
+            this.interceptors.delete(name);
         }
     }
-    get prefix() {
-        return this._prefix || ibiz.env.baseUrl;
+    /**
+     * 预置config,绑定动态的配置
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:48
+     * @readonly
+     * @protected
+     * @type {AxiosRequestConfig}
+     */
+    get presetConfig() {
+        return {
+            // 请求前缀路径
+            baseURL: ibiz.env.baseUrl,
+            headers: {
+                'Content-Type': 'application/json;charset=UTF-8',
+                Accept: 'application/json',
+            },
+        };
+    }
+    /**
+     * 从左到右递归合并配置参数（内置第一个合并的预置参数）
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:09
+     * @protected
+     * @param {...AxiosRequestConfig[]} configs
+     * @returns {*}
+     */
+    mergeConfig(...configs) {
+        const config = this.presetConfig;
+        if (configs.length === 0) {
+            return config;
+        }
+        const { url } = configs[0];
+        if (url && this.urlReg.test(url)) {
+            delete config.baseURL;
+        }
+        return merge(config, ...configs);
     }
     /**
      * Post 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:01
+     * @date 2022-10-19 11:10:30
      * @param {string} url
+     * @param {IData} data
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async post(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios({
+            const response = await this.request(url, {
                 method: 'post',
-                url,
                 data,
-                headers: Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', Accept: 'application/json' }, headers),
+                headers,
             });
             return this.doResponseResult(response);
         }
@@ -63,9 +133,11 @@ export class Net {
      * Get 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:08
+     * @date 2022-10-19 11:10:24
      * @param {string} url
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
+     * @param {IParams} [option={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async get(url, params = {}, headers = {}, option = {}) {
@@ -75,7 +147,7 @@ export class Net {
         // }
         url = this.attachUrlParam(url, params);
         try {
-            const response = await axios.get(url, Object.assign({ headers }, option));
+            const response = await this.request(url, merge({ method: 'get', headers }, option));
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -86,15 +158,16 @@ export class Net {
      * Delete 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:43
+     * @date 2022-10-19 11:10:17
      * @param {string} url
      * @param {IParams} [params]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async delete(url, params, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios.delete(url, { headers });
+            const response = await this.request(url, { method: 'delete', headers });
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -105,15 +178,21 @@ export class Net {
      * Put 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:49
+     * @date 2022-10-19 11:10:11
      * @param {string} url
      * @param {IData} data
+     * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async put(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios.put(url, data, { headers });
+            const response = await this.request(url, {
+                method: 'put',
+                data,
+                headers,
+            });
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -126,12 +205,12 @@ export class Net {
      * @author chitanda
      * @date 2022-07-14 15:07:15
      * @param {string} url
-     * @param {AxiosRequestHeaders} [headers={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async getModel(url, headers = {}) {
         try {
-            const response = await axios.get(url, {
+            const response = await this.instance.get(url, {
                 headers,
             });
             return this.doResponseResult(response);
@@ -140,6 +219,35 @@ export class Net {
             throw new HttpError(error);
         }
     }
+    /**
+     * 基础请求方法，会合并预置配置
+     *
+     * @author lxm
+     * @date 2022-10-27 14:10:06
+     * @param {string} url
+     * @param {AxiosRequestConfig} [config={}]
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async request(url, config = {}) {
+        try {
+            const response = await this.instance.request(this.mergeConfig({ url }, config));
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
+    }
+    /**
+     * 创建标准 axios 请求
+     *
+     * @author chitanda
+     * @date 2023-01-30 15:01:27
+     * @param {AxiosRequestConfig<IData>} config
+     * @return {*}
+     */
+    axios(config) {
+        return axios(config);
+    }
     /**
      * 统一处理请求返回
      *
@@ -190,7 +298,6 @@ export class Net {
      * @return {*}  {string}
      */
     attachUrlParam(url, params) {
-        url = this.attachUrl(url);
         const strParams = stringify(params);
         if (notNilEmpty(strParams)) {
             if (url.endsWith('?')) {
@@ -208,16 +315,4 @@ export class Net {
         }
         return url;
     }
-    /**
-     * 处理 url 参数
-     *
-     * @author chitanda
-     * @date 2022-07-20 20:07:17
-     * @private
-     * @param {string} url
-     * @return {*}  {string}
-     */
-    attachUrl(url) {
-        return `${this.prefix}${url}`;
-    }
 }

package/out/utils/plural/plural.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plural.d.ts","sourceRoot":"","sources":["../../../src/utils/plural/plural.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C"}
+{"version":3,"file":"plural.d.ts","sourceRoot":"","sources":["../../../src/utils/plural/plural.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C"}

package/out/utils/plural/plural.js

@@ -1,4 +1,6 @@
 import pluralize from 'pluralize';
+// 补充特殊转换规则
+pluralize.addPluralRule(/(matr|vert|ind)ix|ex$/, '$1ices');
 /**
  * 英文转复数写法
  *

package/out/utils/string-util/string-util.d.ts

@@ -0,0 +1,46 @@
+/**
+ * 字符串工具类
+ *
+ * @author chitanda
+ * @date 2021-04-23 20:04:27
+ * @export
+ * @class StringUtil
+ */
+export declare class StringUtil {
+    /**
+     * 上下文替换正则
+     *
+     * @author chitanda
+     * @date 2021-04-23 20:04:01
+     * @static
+     */
+    static contextReg: RegExp;
+    /**
+     * 数据替换正则
+     *
+     * @author chitanda
+     * @date 2021-04-23 20:04:09
+     * @static
+     */
+    static dataReg: RegExp;
+    /**
+     * 填充字符串中的数据
+     *
+     * @author chitanda
+     * @date 2021-04-23 20:04:17
+     * @static
+     * @param {string} str
+     * @param {*} [context]
+     * @param {*} [data]
+     * @return {*}  {string}
+     */
+    static fill(str: string, context?: IContext, data?: IData): string;
+    /**
+     * 动态匹配${}
+     *
+     * @param str
+     * @param values
+     */
+    static dynamicMatch(str: string, values: any): string;
+}
+//# sourceMappingURL=string-util.d.ts.map

package/out/utils/string-util/string-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"string-util.d.ts","sourceRoot":"","sources":["../../../src/utils/string-util/string-util.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,SAAgD;IAEjE;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,SAA6C;IAE3D;;;;;;;;;;OAUG;IACH,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,MAAM;IAoBlE;;;;;OAKG;IAEH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM;CAOtD"}

package/out/utils/string-util/string-util.js

@@ -0,0 +1,71 @@
+import { notNilEmpty } from 'qx-util';
+/**
+ * 字符串工具类
+ *
+ * @author chitanda
+ * @date 2021-04-23 20:04:27
+ * @export
+ * @class StringUtil
+ */
+export class StringUtil {
+    /**
+     * 填充字符串中的数据
+     *
+     * @author chitanda
+     * @date 2021-04-23 20:04:17
+     * @static
+     * @param {string} str
+     * @param {*} [context]
+     * @param {*} [data]
+     * @return {*}  {string}
+     */
+    static fill(str, context, data) {
+        if (notNilEmpty(str)) {
+            if (notNilEmpty(context)) {
+                const strArr = str.match(this.contextReg);
+                strArr === null || strArr === void 0 ? void 0 : strArr.forEach(_key => {
+                    const key = _key.slice(10, _key.length - 1);
+                    str = str.replace(`\${context.${key}}`, context[key] || '');
+                });
+            }
+            if (notNilEmpty(data)) {
+                const strArr = str.match(this.dataReg);
+                strArr === null || strArr === void 0 ? void 0 : strArr.forEach(_key => {
+                    const key = _key.slice(7, _key.length - 1);
+                    str = str.replace(`\${data.${key}}`, data[key] || '');
+                });
+            }
+        }
+        return str;
+    }
+    /**
+     * 动态匹配${}
+     *
+     * @param str
+     * @param values
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static dynamicMatch(str, values) {
+        return str.replace(/\${(.*?)}/g, (_, key) => {
+            const [objKey, propName] = key.split('.');
+            const obj = values[objKey];
+            return obj ? obj[propName] : '';
+        });
+    }
+}
+/**
+ * 上下文替换正则
+ *
+ * @author chitanda
+ * @date 2021-04-23 20:04:01
+ * @static
+ */
+StringUtil.contextReg = /\$\{context.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;
+/**
+ * 数据替换正则
+ *
+ * @author chitanda
+ * @date 2021-04-23 20:04:09
+ * @static
+ */
+StringUtil.dataReg = /\$\{data.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;

package/out/utils/sync/await-timeout.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 设置延迟wait毫米后执行fun方法，返回fun的返回值
+ *
+ * @author lxm
+ * @date 2023-03-06 08:20:57
+ * @export
+ * @template T
+ * @param {number} wait
+ * @param {T} fun
+ * @param {any[]} params
+ * @returns {*}  {Promise<ReturnType<T>>}
+ */
+export declare function awaitTimeout<T extends (...args: any) => any>(wait: number, fun?: T, params?: any[]): Promise<ReturnType<T> | undefined>;
+//# sourceMappingURL=await-timeout.d.ts.map

package/out/utils/sync/await-timeout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"await-timeout.d.ts","sourceRoot":"","sources":["../../../src/utils/sync/await-timeout.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,EAChE,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,CAAC,EACP,MAAM,CAAC,EAAE,GAAG,EAAE,GACb,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CASpC"}

package/out/utils/sync/await-timeout.js

@@ -0,0 +1,23 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * 设置延迟wait毫米后执行fun方法，返回fun的返回值
+ *
+ * @author lxm
+ * @date 2023-03-06 08:20:57
+ * @export
+ * @template T
+ * @param {number} wait
+ * @param {T} fun
+ * @param {any[]} params
+ * @returns {*}  {Promise<ReturnType<T>>}
+ */
+export async function awaitTimeout(wait, fun, params) {
+    await new Promise(resolve => {
+        setTimeout(() => {
+            resolve(true);
+        }, wait);
+    });
+    if (fun) {
+        return fun(...(params || []));
+    }
+}