wenay-common2 1.0.29 → 1.0.31

package/lib/Common/events/Listen.js

@@ -124,13 +124,35 @@ function UseListen(data = { fast: true }) {
     t = a.func;
     return [t, a];
 }
+let referenceKeys = null;
+let referenceTypes = null;
+function getReferenceData() {
+    if (!referenceKeys || !referenceTypes) {
+        const demo = funcListenCallbackBase(() => { });
+        referenceKeys = Object.keys(demo).sort();
+        referenceTypes = new Map();
+        for (const key of referenceKeys) {
+            referenceTypes.set(key, typeof demo[key]);
+        }
+    }
+    return { keys: referenceKeys, types: referenceTypes };
+}
 function isListenCallback(obj) {
     if (obj == null || typeof obj !== "object")
         return false;
-    const obj2 = obj;
-    return (typeof obj2.addListen === "function" &&
-        typeof obj2.removeListen === "function" &&
-        typeof obj2.eventClose === "function" &&
-        typeof obj2.func === "function" &&
-        typeof obj2.count === "function");
+    const objKeys = Object.keys(obj).sort();
+    const { keys: refKeys, types: refTypes } = getReferenceData();
+    if (objKeys.length !== refKeys.length)
+        return false;
+    for (let i = 0; i < refKeys.length; i++) {
+        if (objKeys[i] !== refKeys[i])
+            return false;
+    }
+    for (const key of refKeys) {
+        const expectedType = refTypes.get(key);
+        const actualType = typeof obj[key];
+        if (actualType !== expectedType)
+            return false;
+    }
+    return true;
 }

package/lib/Exchange/CParams.d.ts

@@ -218,5 +218,5 @@ export type SimpleParamsMutable<T> = T extends const_Date ? const_Date : Mutable
 };
 export type SimpleParams<T = IParams> = ReadonlyFull<SimpleParamsMutable<T>>;
 export declare function GetSimpleParams<T extends ReadonlyFull<IParams>>(params: T): SimpleParamsMutable<T>;
-export declare function mergeParamValuesToInfos<TParams extends IParamsReadonly, TParams2 extends IParamsReadonly>(srcObj: TParams, valuesObj: SimpleParams<TParams2> | TParams2): TParams;
+export declare function mergeParamValuesToInfos<TParams extends IParamsReadonly | IParams, TParams2 extends IParamsReadonly | IParams>(srcObj: TParams, valuesObj: SimpleParams<TParams2> | TParams2): TParams;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",