wenay-common 1.0.170 → 1.0.172

package/lib/Common/Listen.d.ts

@@ -68,9 +68,12 @@ type obj = {
     [k: string]: any;
 };
 export declare function CompareKeys<T extends obj, T2 extends obj>(obj1: T, obj2: T2): boolean;
-export declare function DeepCompareKeys<T, T2 extends obj, T3 extends unknown>(obj1: T, obj2: T2, func: (a: T2) => T3): any;
-export declare function deepModifyByListenSocket<T>(obj: T, status: () => boolean): tDeepKeys<T, ReturnType<typeof UseListen>[1], ReturnType<typeof funcListenBySocket1>>;
-export declare function deepModifyByListenSocket2<T>(obj: T, status: () => boolean): tDeepKeys<T, ReturnType<typeof UseListen>[1], ReturnType<typeof funcListenBySocket1>>;
+export declare function CompareKeys2<T extends obj>(obj1: T, keys: string[]): boolean;
+export declare function DeepCompareKeys2<T, T3 extends unknown>(obj1: T, keys: string[], func: (a: any) => T3): any;
+export declare function DeepCompareKeys<T, T2 extends obj, T3 extends unknown>(obj1: T, obj2: T2, func: (a: T2) => T3): {
+    [k: string]: any;
+} | T3 | NonNullable<T> | null;
+export declare function deepModifyByListenSocket<T>(obj: T, status: () => boolean): tDeepKeys<T, ReturnType<typeof funcListenCallbackBase>, ReturnType<typeof funcListenBySocket1>>;
 export declare const funcListenBySocketObj: typeof deepModifyByListenSocket;
 export declare function PromiseArrayListen<T extends any = unknown>(array: ((() => Promise<T>) | (() => any) | Promise<T>)[]): {
     listenOk: (a: (...d: [data: T, i: number, countOk: number, countError: number, count: number]) => any) => () => void;

package/lib/Common/Listen.js

@@ -9,9 +9,10 @@ exports.funcListenBySocket2 = funcListenBySocket2;
 exports.funcListenBySocket = funcListenBySocket;
 exports.UseListen = UseListen;
 exports.CompareKeys = CompareKeys;
+exports.CompareKeys2 = CompareKeys2;
+exports.DeepCompareKeys2 = DeepCompareKeys2;
 exports.DeepCompareKeys = DeepCompareKeys;
 exports.deepModifyByListenSocket = deepModifyByListenSocket;
-exports.deepModifyByListenSocket2 = deepModifyByListenSocket2;
 exports.PromiseArrayListen = PromiseArrayListen;
 exports.socketBuffer3 = socketBuffer3;
 exports.funcListenCallbackSnapshot = funcListenCallbackSnapshot;
@@ -154,24 +155,44 @@ function UseListen(data) {
     return [(...e) => t?.(...e), a];
 }
 function CompareKeys(obj1, obj2) {
-    return (new Set([...Object.keys(obj1), ...Object.keys(obj2)])).size == Object.keys(obj2).length;
+    const k1 = Object.keys(obj1);
+    const k2 = Object.keys(obj2);
+    return k1.length == k2.length && ((new Set([...k1, ...k2])).size == k2.length);
+}
+function CompareKeys2(obj1, keys) {
+    const k1 = Object.keys(obj1);
+    return k1.length == keys.length && ((new Set([...k1, ...keys])).size == keys.length);
+}
+function DeepCompareKeys2(obj1, keys, func) {
+    if (obj1 == null)
+        return null;
+    if (typeof obj1 == "function")
+        return obj1;
+    if (obj1 instanceof Function)
+        return obj1;
+    if (typeof obj1 != "object")
+        return obj1;
+    if (CompareKeys2(obj1, keys)) {
+        return func(obj1);
+    }
+    return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, DeepCompareKeys2(v, keys, func)]));
 }
 function DeepCompareKeys(obj1, obj2, func) {
     if (obj1 == null)
         return null;
     if (typeof obj1 == "function")
         return obj1;
+    if (obj1 instanceof Function)
+        return obj1;
     if (typeof obj1 != "object")
         return obj1;
-    if (CompareKeys(obj1, obj2))
+    const keys = Object.keys(obj2);
+    if (CompareKeys2(obj1, keys))
         return func(obj1);
-    return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, DeepCompareKeys(v, obj2, func)]));
+    return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, DeepCompareKeys2(v, keys, func)]));
 }
 function deepModifyByListenSocket(obj, status) {
-    return DeepCompareKeys(obj, UseListen()[1], e => (0, exports.funcListenBySocket1)(e, status));
-}
-function deepModifyByListenSocket2(obj, status) {
-    return DeepCompareKeys(obj, UseListen()[1], e => (0, exports.funcListenBySocket1)(e, status));
+    return DeepCompareKeys(obj, funcListenCallbackBase(e => { }), e => (0, exports.funcListenBySocket1)(e, status));
 }
 exports.funcListenBySocketObj = deepModifyByListenSocket;
 function PromiseArrayListen(array) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.170",
+  "version": "1.0.172",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",