wenay-common2 1.0.6 → 1.0.7

package/lib/Common/rcp/listen-deep.d.ts

@@ -1,20 +1,33 @@
-import { funcListenCallbackBase } from "../events/Listen";
 import { listenSocket, listenSocketFirst, listenSocketAll, listenSocketSmart } from "./listen-socket";
 type Obj = Record<string, any>;
-type ListenBase<T extends any[]> = ReturnType<typeof funcListenCallbackBase<T>>;
-type InferArgs<T> = T extends ListenBase<infer R> ? R : never;
-type SocketResult<T extends any[]> = ReturnType<typeof listenSocket<T>>;
-type TransformValue<V> = V extends ListenBase<any> ? SocketResult<InferArgs<V>> : V extends typeof Promise ? V : V extends (...a: any) => any ? V : V extends object ? {
-    [K in keyof V]: TransformValue<V[K]>;
-} : V;
+type InferArgs<T> = T extends {
+    addListen: (cb: (...args: infer R) => void, ...rest: any[]) => any;
+} ? R : never;
 export type DeepSocketListen<T> = {
-    [K in keyof T]: TransformValue<T[K]>;
+    [K in keyof T]: T[K] extends {
+        addListen: Function;
+    } ? ReturnType<typeof listenSocket<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListen<T[K]> : T[K];
+};
+export type DeepSocketListenFirst<T> = {
+    [K in keyof T]: T[K] extends {
+        addListen: Function;
+    } ? ReturnType<typeof listenSocketFirst<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenFirst<T[K]> : T[K];
+};
+export type DeepSocketListenAll<T> = {
+    [K in keyof T]: T[K] extends {
+        addListen: Function;
+    } ? ReturnType<typeof listenSocketAll<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenAll<T[K]> : T[K];
+};
+export type DeepSocketListenSmart<T> = {
+    [K in keyof T]: T[K] extends {
+        addListen: Function;
+    } ? ReturnType<typeof listenSocketSmart<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenSmart<T[K]> : T[K];
 };
 export declare function matchKeys<T extends Obj, T2 extends Obj>(obj1: T, obj2: T2): boolean;
 export declare function matchKeysList<T extends Obj>(obj1: T, keys: string[]): boolean;
 export declare function deepMapByKeysList<T, T3>(obj1: T, keys: string[], func: (a: any) => T3): T | T3 | null;
 export declare function deepMapByKeys<T, T2 extends Obj, T3>(obj1: T, obj2: T2, func: (a: T2) => T3): T3 | T | null;
-export declare function deepListenFirst<T>(obj: T, data?: Parameters<typeof listenSocketFirst>[1]): DeepSocketListen<T>;
-export declare function deepListenAll<T>(obj: T, data?: Parameters<typeof listenSocketAll>[1]): DeepSocketListen<T>;
-export declare function deepListenSmart<T>(obj: T, data?: Parameters<typeof listenSocketSmart>[1]): DeepSocketListen<T>;
+export declare function deepListenFirst<T>(obj: T, data?: Parameters<typeof listenSocketFirst>[1]): DeepSocketListenFirst<T>;
+export declare function deepListenAll<T>(obj: T, data?: Parameters<typeof listenSocketAll>[1]): DeepSocketListenAll<T>;
+export declare function deepListenSmart<T>(obj: T, data?: Parameters<typeof listenSocketSmart>[1]): DeepSocketListenSmart<T>;
 export {};

package/lib/Common/rcp/listen-socket.d.ts

@@ -1,5 +1,5 @@
-import { funcListenCallback, type Listener } from "../events/Listen";
-type ListenCallbackResult<T extends any[] = any[]> = ReturnType<typeof funcListenCallback<T>>;
+import { funcListenCallbackBase, type Listener } from "../events/Listen";
+type ListenCallbackResult<T extends any[] = any[]> = ReturnType<typeof funcListenCallbackBase<T>>;
 export declare function listenSocket<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, d?: {
     readonly status?: () => boolean;
     readonly addListenClose?: ListenCallbackResult<any>;

package/package.json

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