light-h5-core-lib 2.9.0 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-h5-core-lib",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "light core lib",
   "main": "./LightCore.js",
   "types": "./type/index.d.ts",

package/pool/PoolObj.js

@@ -8,23 +8,95 @@ exports.PoolObj = void 0;
 var PoolObj = /** @class */ (function () {
     /**
      * @param cap 容量(容积)
+     * @param initCreateNum 初始化创建的数量 （createCallback != null 有效）
+     * @param createCallback Item创建函数
+     * @param clearCallback Item清理函数
+     * @param destroyCallback Item销毁函数
      */
-    function PoolObj(cap) {
+    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; }
         this._cap = cap;
+        this._createCallback = createCallback;
+        this._clearCallback = clearCallback;
+        this._destroyCallback = destroyCallback;
         this._pool = [];
+        this.initCreate(initCreateNum);
     }
+    /**
+     * 初始化一些数量的item
+     */
+    PoolObj.prototype.initCreate = function (initCreateNum) {
+        if (initCreateNum <= 0)
+            return;
+        if (!this._createCallback)
+            return;
+        var maxNum = Math.min(this._cap, initCreateNum);
+        for (var i = 0; i < maxNum; i++) {
+            this._pool.push(this._createCallback());
+        }
+    };
+    /**
+     * 放入到对象池
+     * @return 放入到对象池是否成功
+     */
     PoolObj.prototype.put = function (obj) {
-        if (!obj || this._pool.length >= this._cap)
+        if (!obj)
+            return false;
+        if (this._pool.length >= this._cap) {
+            this._destroyCallback && this._destroyCallback(obj);
             return false;
+        }
+        this._clearCallback && this._clearCallback(obj);
         this._pool.push(obj);
         return true;
     };
+    /**
+     * 获得一个Item<br>
+     * <b style="color:green">如果size==0，则自动使用createCallback创建</b><br>
+     * <b style="color:red">⚠️如果size==0 && createCallback==null,则返回null</b>
+     */
     PoolObj.prototype.one = function () {
-        if (this._pool.length == 0)
-            return null;
+        if (this._pool.length == 0) {
+            if (!this._createCallback)
+                return null;
+            return this._createCallback();
+        }
         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", {
         /**
          * 获取容量(容积)
@@ -58,13 +130,10 @@ var PoolObj = /** @class */ (function () {
         var obj;
         for (var i = 0, j = this._pool.length; i < j; i++) {
             obj = this._pool[i];
-            if (obj.destroy) {
-                obj.destroy();
-            }
-            else if (obj.onDestroy) {
-                obj.onDestroy();
+            if (obj) {
+                this._destroyCallback && this._destroyCallback(obj);
+                obj = null;
             }
-            obj = null;
         }
         this._pool.length = 0;
     };
@@ -72,6 +141,9 @@ var PoolObj = /** @class */ (function () {
         if (!isCleared) {
             this.clear();
         }
+        this._createCallback = null;
+        this._clearCallback = null;
+        this._destroyCallback = null;
         this._pool && (this._pool = null);
     };
     return PoolObj;

package/type/index.d.ts

@@ -13,12 +13,44 @@ export interface IClear extends IDestroy {
 export declare class PoolObj<T> implements IClear {
 	private _pool;
 	private _cap;
+	private _createCallback;
+	private _clearCallback;
+	private _destroyCallback;
 	/**
 	 * @param cap 容量(容积)
+	 * @param initCreateNum 初始化创建的数量 （createCallback != null 有效）
+	 * @param createCallback Item创建函数
+	 * @param clearCallback Item清理函数
+	 * @param destroyCallback Item销毁函数
+	 */
+	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void);
+	/**
+	 * 初始化一些数量的item
+	 */
+	private initCreate;
+	/**
+	 * 放入到对象池
+	 * @return 放入到对象池是否成功
 	 */
-	constructor(cap?: number);
 	put(obj: T): boolean;
+	/**
+	 * 获得一个Item<br>
+	 * <b style="color:green">如果size==0，则自动使用createCallback创建</b><br>
+	 * <b style="color:red">⚠️如果size==0 && createCallback==null,则返回null</b>
+	 */
 	one(): T;
+	/**
+	 * 是否存在Item创建方法
+	 */
+	get isExistCreateCallback(): boolean;
+	/**
+	 * 是否存在Item的清理函数
+	 */
+	get isExistClearCallback(): boolean;
+	/**
+	 * 是否存在Item的销毁函数
+	 */
+	get isExistDestroyCallback(): boolean;
 	/**
 	 * 获取容量(容积)
 	 */