light-h5-core-lib 2.10.6 → 2.10.7

package/common/util/StringUtil.js

@@ -5,122 +5,109 @@ exports.StringUtil = void 0;
  * 字符串工具
  * @author Aonaufly
  */
-var StringUtil = /** @class */ (function () {
-    function StringUtil() {
-    }
+class StringUtil {
     /**
      * 字符串的格式化 , 使用 {index = 0}的模式
      * @param str 源字符串
      * @param args 填充参数
      */
-    StringUtil.format = function (str) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
+    static format(str, ...args) {
         if (!args || args.length == 0)
             return str;
-        for (var i = 0, j = args.length; i < j; i++) {
-            str = str.replace("{".concat(i, "}"), args[i]);
+        for (let i = 0, j = args.length; i < j; i++) {
+            str = str.replace(`{${i}}`, args[i]);
         }
         return str;
-    };
+    }
     /**
      * 字符串的格式化 , 从1开始
      * @param str 源字符串
      * @param args 填充参数
      */
-    StringUtil.formatWithStart1 = function (str) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
+    static formatWithStart1(str, ...args) {
         if (!args || args.length == 0)
             return str;
-        for (var i = 1, j = args.length; i <= j; i++) {
-            str = str.replace("{".concat(i, "}"), args[i - 1]);
+        for (let i = 1, j = args.length; i <= j; i++) {
+            str = str.replace(`{${i}}`, args[i - 1]);
         }
         return str;
-    };
+    }
     /**
      * 单个替换
      */
-    StringUtil.replace = function (text, searchValue, replaceValue, ignoreCase) {
-        if (ignoreCase === void 0) { ignoreCase = false; }
-        var flags = ignoreCase ? 'gi' : 'g';
-        var esc = searchValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    static replace(text, searchValue, replaceValue, ignoreCase = false) {
+        const flags = ignoreCase ? 'gi' : 'g';
+        const esc = searchValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
         return text.replace(new RegExp(esc, flags), replaceValue);
-    };
+    }
     /**
      * 批量替换
      */
-    StringUtil.replaceBatch = function (text, map, ignoreCase) {
-        if (ignoreCase === void 0) { ignoreCase = false; }
+    static replaceBatch(text, map, ignoreCase = false) {
         if (!Object.keys(map).length)
             return text;
-        var flags = ignoreCase ? 'gi' : 'g';
-        var keys = Object.keys(map).sort(function (a, b) { return b.length - a.length; }); // 长优先
-        var pattern = keys.map(function (k) { return k.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); }).join('|');
-        return text.replace(new RegExp(pattern, flags), function (m) { var _a; return (_a = map[m]) !== null && _a !== void 0 ? _a : m; });
-    };
+        const flags = ignoreCase ? 'gi' : 'g';
+        const keys = Object.keys(map).sort((a, b) => b.length - a.length); // 长优先
+        const pattern = keys.map(k => k.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
+        return text.replace(new RegExp(pattern, flags), m => map[m] ?? m);
+    }
     /**
      * 将字符串中所有的\/替换成/
      */
-    StringUtil.replaceBackslash = function (input) {
+    static replaceBackslash(input) {
         // 使用正则表达式替换所有的 \\/ 为 /
         return input.replace(/\\\//g, '/');
-    };
-    StringUtil.code2utf8 = function (uni) {
-        var uni2 = uni.toString(2);
+    }
+    static code2utf8(uni) {
+        let uni2 = uni.toString(2);
         if (uni < 128) {
             return uni.toString(16);
         }
         else if (uni < 2048) {
             uni2 = ("00000000000000000" + uni2).slice(-11);
-            var s1 = parseInt("110" + uni2.substring(0, 5), 2);
-            var s2 = parseInt("10" + uni2.substring(5), 2);
+            const s1 = parseInt("110" + uni2.substring(0, 5), 2);
+            const s2 = parseInt("10" + uni2.substring(5), 2);
             return s1.toString(16) + "," + s2.toString(16);
         }
         else {
             uni2 = ("00000000000000000" + uni2).slice(-16);
-            var s1 = parseInt("1110" + uni2.substring(0, 4), 2);
-            var s2 = parseInt("10" + uni2.substring(4, 10), 2);
-            var s3 = parseInt("10" + uni2.substring(10), 2);
+            const s1 = parseInt("1110" + uni2.substring(0, 4), 2);
+            const s2 = parseInt("10" + uni2.substring(4, 10), 2);
+            const s3 = parseInt("10" + uni2.substring(10), 2);
             return s1.toString(16) + "," + s2.toString(16) + "," + s3.toString(16);
         }
-    };
+    }
     /**
      * 将字符串转化成UTF8的Buffer
      * @param str 字符串
      */
-    StringUtil.string2UTF8Buffer = function (str) {
-        var val = "";
-        for (var i = 0; i < str.length; i++) {
+    static string2UTF8Buffer(str) {
+        let val = "";
+        for (let i = 0; i < str.length; i++) {
             val += "," + StringUtil.code2utf8(str.charCodeAt(i));
         }
         val += ",00";
         // 将16进制转化为ArrayBuffer
-        return new Uint8Array(val.match(/[\da-f]{2}/gi).map(function (h) {
+        return new Uint8Array(val.match(/[\da-f]{2}/gi).map((h) => {
             return parseInt(h, 16);
         })).buffer;
-    };
-    // /**
-    //  * 将buffer转化成UTF8
-    //  * @param buffer
-    //  */
-    // public static buffer2UTF8String(buffer: ArrayBuffer): string {
-    //     const encodedString: string = String.fromCharCode.apply(null, new Uint8Array(buffer));
-    //     // const decodedString: string = decodeURIComponent(escape(atob(encodedString)));
-    //     return encodedString;
-    // }
-    /* 将buffer转化成UTF8
-     * @param buffer
-     */
-    StringUtil.buffer2UTF8String = function (buffer) {
-        var uint8Array = new Uint8Array(buffer);
-        var data = uint8Array.reduce(function (acc, i) { return (acc += String.fromCharCode.apply(null, [i])); }, "");
-        return data;
-    };
-    return StringUtil;
-}());
+    }
+}
 exports.StringUtil = StringUtil;
+// /**
+//  * 将buffer转化成UTF8
+//  * @param buffer
+//  */
+// public static buffer2UTF8String(buffer: ArrayBuffer): string {
+//     const encodedString: string = String.fromCharCode.apply(null, new Uint8Array(buffer));
+//     // const decodedString: string = decodeURIComponent(escape(atob(encodedString)));
+//     return encodedString;
+// }
+/* 将buffer转化成UTF8
+ * @param buffer
+ */
+StringUtil.buffer2UTF8String = (buffer) => {
+    const uint8Array = new Uint8Array(buffer);
+    const data = uint8Array.reduce((acc, i) => (acc += String.fromCharCode.apply(null, [i])), "");
+    return data;
+};

package/common/util/UniqueIDUtil.js

@@ -5,17 +5,14 @@ exports.UniqueIDUtil = void 0;
  * 唯一ID生成器
  * @author Aonaufly
  */
-var UniqueIDUtil = /** @class */ (function () {
-    function UniqueIDUtil() {
-    }
+class UniqueIDUtil {
     /**生成唯一ID值*/
-    UniqueIDUtil.getUniqueId = function () {
+    static getUniqueId() {
         return new Date().getTime() + Math.random().toString(36).substring(2);
-    };
+    }
     /**生成复合的Key值*/
-    UniqueIDUtil.getCompositeKey = function (key, uniqueId) {
-        return "".concat(key, "-id:").concat(uniqueId);
-    };
-    return UniqueIDUtil;
-}());
+    static getCompositeKey(key, uniqueId) {
+        return `${key}-id:${uniqueId}`;
+    }
+}
 exports.UniqueIDUtil = UniqueIDUtil;

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "light-h5-core-lib",
-  "version": "2.10.6",
-  "description": "light core lib",
-  "main": "./LightCore.js",
-  "types": "./type/index.d.ts",
-  "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-      "core",
-      "h5",
-      "lib"
-  ],
-  "author": "Aonaufly",
-  "license": "ISC",
-  "dependencies": {}
-}
+{
+  "name": "light-h5-core-lib",
+  "version": "2.10.7",
+  "description": "light core lib",
+  "main": "./LightCore.js",
+  "types": "./type/index.d.ts",
+  "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+      "core",
+      "h5",
+      "lib"
+  ],
+  "author": "Aonaufly",
+  "license": "ISC",
+  "dependencies": {}
+}

package/pool/PoolObj.js

@@ -5,7 +5,7 @@ exports.PoolObj = void 0;
  * 对象池（泛型）
  * @author Aonaufly
  */
-var PoolObj = /** @class */ (function () {
+class PoolObj {
     /**
      * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b>
      * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b>
@@ -13,12 +13,7 @@ var PoolObj = /** @class */ (function () {
      * @param clearCallback Item清理函数
      * @param destroyCallback Item销毁函数
      */
-    function PoolObj(cap, initCreateNum, createCallback, clearCallback, destroyCallback) {
-        if (cap === void 0) { cap = 5; }
-        if (initCreateNum === void 0) { initCreateNum = 0; }
-        if (createCallback === void 0) { createCallback = null; }
-        if (clearCallback === void 0) { clearCallback = null; }
-        if (destroyCallback === void 0) { destroyCallback = null; }
+    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null) {
         this._cap = cap == null ? 5 : cap;
         this._createCallback = createCallback;
         this._clearCallback = clearCallback;
@@ -29,21 +24,21 @@ var PoolObj = /** @class */ (function () {
     /**
      * 初始化一些数量的item
      */
-    PoolObj.prototype.initCreate = function (initCreateNum) {
+    initCreate(initCreateNum) {
         if (initCreateNum <= 0)
             return;
         if (!this._createCallback)
             return;
-        var maxNum = this._cap > 0 ? Math.min(this._cap, initCreateNum) : initCreateNum;
-        for (var i = 0; i < maxNum; i++) {
+        const maxNum = this._cap > 0 ? Math.min(this._cap, initCreateNum) : initCreateNum;
+        for (let i = 0; i < maxNum; i++) {
             this._pool.push(this._createCallback());
         }
-    };
+    }
     /**
      * 放入到对象池
      * @return 放入到对象池是否成功
      */
-    PoolObj.prototype.put = function (obj) {
+    put(obj) {
         if (!obj)
             return false;
         if (this._cap > 0 && this._pool.length >= this._cap) {
@@ -53,82 +48,63 @@ var PoolObj = /** @class */ (function () {
         this._clearCallback && this._clearCallback(obj);
         this._pool.push(obj);
         return true;
-    };
+    }
     /**
      * 获得一个Item<br>
      * <div style="color: #FF0000;">⚠️友情提示：如果有createCallback需要判断是否是New的item则提前使用 this.size == 0保存句柄</div><br>
      * <b style="color:#FFFF00">⚠️如果size==0，则自动使用createCallback创建 ,如果size==0 && createCallback==null,则返回null</b>
+     * @return { item: T; isCreate: boolean } isCreate: 是否是new出来的
      */
-    PoolObj.prototype.one = function () {
+    one() {
         if (this._pool.length == 0) {
             if (!this._createCallback)
                 return null;
-            return this._createCallback();
+            return { item: this._createCallback(), isCreate: true };
         }
-        return this._pool.shift();
-    };
-    Object.defineProperty(PoolObj.prototype, "isExistCreateCallback", {
-        /**
-         * 是否存在Item创建方法
-         */
-        get: function () {
-            return this._createCallback != null;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(PoolObj.prototype, "isExistClearCallback", {
-        /**
-         * 是否存在Item的清理函数
-         */
-        get: function () {
-            return this._clearCallback != null;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(PoolObj.prototype, "isExistDestroyCallback", {
-        /**
-         * 是否存在Item的销毁函数
-         */
-        get: function () {
-            return this._destroyCallback != null;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(PoolObj.prototype, "cap", {
-        /**
-         * 获取容量(容积)
-         */
-        get: function () {
-            return this._cap;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(PoolObj.prototype, "size", {
-        /**
-         * 获取当前数量（已经保存的元素个数）
-         */
-        get: function () {
-            if (!this._pool)
-                return 0;
-            return this._pool.length;
-        },
-        enumerable: false,
-        configurable: true
-    });
+        return { item: this._pool.shift(), isCreate: true };
+    }
+    /**
+     * 是否存在Item创建方法
+     */
+    get isExistCreateCallback() {
+        return this._createCallback != null;
+    }
+    /**
+     * 是否存在Item的清理函数
+     */
+    get isExistClearCallback() {
+        return this._clearCallback != null;
+    }
+    /**
+     * 是否存在Item的销毁函数
+     */
+    get isExistDestroyCallback() {
+        return this._destroyCallback != null;
+    }
+    /**
+     * 获取容量(容积)
+     */
+    get cap() {
+        return this._cap;
+    }
+    /**
+     * 获取当前数量（已经保存的元素个数）
+     */
+    get size() {
+        if (!this._pool)
+            return 0;
+        return this._pool.length;
+    }
     /**
      * 清理对象池
      */
-    PoolObj.prototype.clear = function () {
+    clear() {
         if (!this._pool)
             return;
         if (this._pool.length == 0)
             return;
-        var obj;
-        for (var i = 0, j = this._pool.length; i < j; i++) {
+        let obj;
+        for (let i = 0, j = this._pool.length; i < j; i++) {
             obj = this._pool[i];
             if (obj) {
                 this._destroyCallback && this._destroyCallback(obj);
@@ -136,8 +112,8 @@ var PoolObj = /** @class */ (function () {
             }
         }
         this._pool.length = 0;
-    };
-    PoolObj.prototype.destroy = function (isCleared) {
+    }
+    destroy(isCleared) {
         if (!isCleared) {
             this.clear();
         }
@@ -145,7 +121,6 @@ var PoolObj = /** @class */ (function () {
         this._clearCallback = null;
         this._destroyCallback = null;
         this._pool && (this._pool = null);
-    };
-    return PoolObj;
-}());
+    }
+}
 exports.PoolObj = PoolObj;

package/type/index.d.ts

@@ -37,8 +37,12 @@ export declare class PoolObj<T> implements IClear {
 	 * 获得一个Item<br>
 	 * <div style="color: #FF0000;">⚠️友情提示：如果有createCallback需要判断是否是New的item则提前使用 this.size == 0保存句柄</div><br>
 	 * <b style="color:#FFFF00">⚠️如果size==0，则自动使用createCallback创建 ,如果size==0 && createCallback==null,则返回null</b>
+	 * @return { item: T; isCreate: boolean } isCreate: 是否是new出来的
 	 */
-	one(): T;
+	one(): {
+		item: T;
+		isCreate: boolean;
+	};
 	/**
 	 * 是否存在Item创建方法
 	 */
@@ -544,5 +548,17 @@ export declare class GetDecorateUtils {
 	 */
 	static setFieldValue<T>(classObj: any, fieldName: string, value: T): boolean;
 }
+/**
+ * Map工具
+ * @author Aonaufly
+ */
+export declare class MapUtil {
+	/**
+	 * 遍历Map中的所有元素<b style="color:red">每次执行everyCallback</b>
+	 * @param targetMap 目标Map
+	 * @param everyCallback 每次的回调
+	 */
+	static all(targetMap: Map<any, any>, everyCallback: (key: any, item: any) => void): void;
+}
 
 export {};