wenay-common2 1.0.37 → 1.0.38

package/lib/Common/rcp/rpc-client-auto.d.ts

@@ -1,12 +1,12 @@
 import { funcListenCallbackBase } from "../events/Listen";
 import type { DeepSocketListen } from "./listen-deep";
-import type { ClientAPI } from "./rpc-client";
+import type { ClientAPIStrict } from "./rpc-client";
 type ClientAutoOptions = {
     readonly mode?: "smart" | "first" | "all";
     readonly status?: () => boolean;
     readonly addListenClose?: ReturnType<typeof funcListenCallbackBase<any>>;
 };
 export type ClientAutoResult<T> = DeepSocketListen<T>;
-export type AutoClientAPI<T> = ClientAPI<DeepSocketListen<T>>;
+export type AutoClientAPI<T> = ClientAPIStrict<DeepSocketListen<T>>;
 export declare function createRpcClientAuto<T>(api: T, options?: ClientAutoOptions): ClientAutoResult<T>;
 export {};

package/lib/Common/rcp/rpc-client.d.ts

@@ -3,8 +3,12 @@ type UnwrapPromise<T> = T extends Promise<infer R> ? R : T;
 export type DeepDataOnly<T> = T extends Function ? never : T extends Array<infer U> ? Array<DeepDataOnly<U>> : T extends object ? {
     [K in keyof T as T[K] extends Function ? never : K]: DeepDataOnly<T[K]>;
 } : T;
-export type ClientAPI<T> = {
-    [K in keyof T as T[K] extends Function ? K : T[K] extends object ? K : never]: T[K] extends (...args: infer A) => infer R ? (...args: A) => Promise<DeepDataOnly<UnwrapPromise<R>>> : T[K] extends object ? ClientAPI<T[K]> : never;
+export type ClientAPIAll<T> = {
+    [K in keyof T as T[K] extends Function ? K : T[K] extends object ? K : never]: T[K] extends (...args: infer A) => infer R ? (...args: A) => Promise<DeepDataOnly<UnwrapPromise<R>>> : T[K] extends object ? ClientAPIAll<T[K]> : never;
+};
+type NonFalsy<T> = Exclude<T, false | null | 0 | "" | undefined>;
+export type ClientAPIStrict<T> = {
+    [K in keyof T as NonFalsy<T[K]> extends Function ? K : NonFalsy<T[K]> extends object ? K : never]: NonFalsy<T[K]> extends (...args: infer A) => infer R ? (...args: A) => Promise<DeepDataOnly<UnwrapPromise<R>>> : NonFalsy<T[K]> extends object ? ClientAPIStrict<NonFalsy<T[K]>> : never;
 };
 export interface PipeArrayAPI<T> extends Promise<DeepDataOnly<T[]>> {
     [index: number]: PipeAPI<T>;
@@ -22,12 +26,12 @@ type ClientApiHandle = {
     end: (fn: Function) => void;
 };
 export type RpcClientReturn<T extends object> = {
-    func: ClientAPI<T>;
+    func: ClientAPIAll<T>;
     pipe: PipeAPI<T>;
     pipeStrict: PipeAPI<T>;
-    space: ClientAPI<T>;
-    all: ClientAPI<T>;
-    strict: ClientAPI<T>;
+    space: ClientAPIAll<T>;
+    all: ClientAPIAll<T>;
+    strict: ClientAPIStrict<T>;
     api: ClientApiHandle;
     abortAll: (reason: string) => void;
     schema: () => any;

package/package.json

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