@akanjs/signal 0.9.55 → 0.9.57

package/src/apiInfo.d.ts

@@ -1,8 +1,8 @@
 import { Dayjs, JSON, PromiseOrObject, Type, UnType } from "@akanjs/base";
 import { ConstantFieldTypeInput, DocumentModel, FieldToValue, ParamFieldType, PlainTypeToFieldType, PurifiedModel } from "@akanjs/constant";
-import { Access, Account, ArgType, GuardType, InternalArgType, Job, Me, Req, Res, Self, SignalOption, UserIp, Ws } from "./signalDecorators";
+import { InternalParam } from "@akanjs/nest";
+import { ArgType, SignalOption } from "./signalDecorators";
 type ApiType = "query" | "mutation" | "pubsub" | "message";
-export type GetInternalArg<ArgType extends InternalArgType> = ArgType extends "Account" ? Account : ArgType extends "Me" ? Me : ArgType extends "Self" ? Self : ArgType extends "UserIp" ? UserIp : ArgType extends "Access" ? Access : ArgType extends "Req" ? Req : ArgType extends "Res" ? Res : ArgType extends "Ws" ? Ws : ArgType extends "Job" ? Job : never;
 export interface ApiArgProps<Optional extends boolean = false> {
     nullable?: Optional;
     example?: string | number | boolean | Dayjs;
@@ -11,9 +11,10 @@ export declare class ApiInfo<ReqType extends ApiType, Srvs extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}, Args extends any[] = [], InternalArgs extends any[] = [], ServerArgs extends any[] = [], Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, ServerReturns = never, Nullable extends boolean = false> {
+}, ArgNames extends string[] = [], Args extends any[] = [], InternalArgs extends any[] = [], ServerArgs extends any[] = [], Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, ServerReturns = never, Nullable extends boolean = false> {
     #private;
     readonly type: ReqType;
+    readonly argNames: ArgNames;
     readonly args: {
         type: ArgType;
         name: string;
@@ -21,21 +22,20 @@ export declare class ApiInfo<ReqType extends ApiType, Srvs extends {
         option?: ApiArgProps<boolean>;
     }[];
     readonly internalArgs: {
-        type: InternalArgType;
+        type: InternalParam;
         option?: ApiArgProps<boolean>;
     }[];
     readonly returnRef: Returns;
     readonly signalOption: SignalOption<Returns, Nullable, any>;
-    readonly guards: GuardType[];
     execFn: ((...args: [...ServerArgs, ...InternalArgs]) => any) | null;
-    constructor(type: ReqType, returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]);
-    param<Arg extends ParamFieldType, _ClientArg = FieldToValue<Arg>, _ServerArg = DocumentModel<_ClientArg>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...Args, arg: _ClientArg], InternalArgs, [...ServerArgs, arg: _ServerArg], Returns, ServerReturns, Nullable>;
-    body<ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Optional extends boolean = false, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, [...Args, arg: _ClientArg | (Optional extends true ? null : never)], InternalArgs, [...ServerArgs, arg: _ServerArg | (Optional extends true ? undefined : never)], Returns, ServerReturns, Nullable>;
-    room<ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...Args, arg: _ClientArg], InternalArgs, [...ServerArgs, arg: _ServerArg], Returns, ServerReturns, Nullable>;
-    msg<ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Optional extends boolean = false, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, [...Args, arg: _ClientArg | (Optional extends true ? null : never)], InternalArgs, [...ServerArgs, arg: _ServerArg | (Optional extends true ? undefined : never)], Returns, ServerReturns, Nullable>;
-    search<ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...Args, arg: _ClientArg | null], InternalArgs, [...ServerArgs, arg: _ServerArg | undefined], Returns, ServerReturns, Nullable>;
-    with<ArgType extends InternalArgType, Optional extends boolean = false>(argType: Exclude<ArgType, "Parent">, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, Args, [...InternalArgs, arg: GetInternalArg<ArgType> | (Optional extends true ? undefined : never)], ServerArgs, Returns, ServerReturns, Nullable>;
-    exec<ExecFn extends (this: Srvs, ...args: [...ServerArgs, ...InternalArgs]) => ReqType extends "pubsub" ? Promise<void> | void : PromiseOrObject<DocumentModel<FieldToValue<Returns>> | (Nullable extends true ? null | undefined : never)>>(execFn: ExecFn): ApiInfo<ReqType, Srvs, Args, InternalArgs, ServerArgs, Returns, ReturnType<ExecFn>, Nullable>;
+    constructor(type: ReqType, returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>);
+    param<ArgName extends string, Arg extends ParamFieldType, _ClientArg = FieldToValue<Arg>, _ServerArg = DocumentModel<_ClientArg>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...ArgNames, ArgName], [...Args, arg: _ClientArg], InternalArgs, [...ServerArgs, arg: _ServerArg], Returns, ServerReturns, Nullable>;
+    body<ArgName extends string, ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Optional extends boolean = false, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: ArgName, argRef: Arg, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, [...ArgNames, ArgName], [...Args, arg: _ClientArg | (Optional extends true ? null : never)], InternalArgs, [...ServerArgs, arg: _ServerArg | (Optional extends true ? undefined : never)], Returns, ServerReturns, Nullable>;
+    room<ArgName extends string, ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...ArgNames, ArgName], [...Args, arg: _ClientArg], InternalArgs, [...ServerArgs, arg: _ServerArg], Returns, ServerReturns, Nullable>;
+    msg<ArgName extends string, ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Optional extends boolean = false, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, [...ArgNames, ArgName], [...Args, arg: _ClientArg | (Optional extends true ? null : never)], InternalArgs, [...ServerArgs, arg: _ServerArg | (Optional extends true ? undefined : never)], Returns, ServerReturns, Nullable>;
+    search<ArgName extends string, ExplicitType = unknown, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, _ArgType = unknown extends ExplicitType ? FieldToValue<Arg> : ExplicitType, _ClientArg = PurifiedModel<_ArgType>, _ServerArg = DocumentModel<_ArgType>>(name: string, argRef: Arg, option?: Omit<ApiArgProps, "nullable">): ApiInfo<ReqType, Srvs, [...ArgNames, ArgName], [...Args, arg: _ClientArg | null], InternalArgs, [...ServerArgs, arg: _ServerArg | undefined], Returns, ServerReturns, Nullable>;
+    with<ArgType, Optional extends boolean = false>(argType: InternalParam<ArgType>, option?: ApiArgProps<Optional>): ApiInfo<ReqType, Srvs, ArgNames, Args, [...InternalArgs, arg: ArgType | (Optional extends true ? null : never)], ServerArgs, Returns, ServerReturns, Nullable>;
+    exec<ExecFn extends (this: Srvs, ...args: [...ServerArgs, ...InternalArgs]) => ReqType extends "pubsub" ? Promise<void> | void : PromiseOrObject<DocumentModel<FieldToValue<Returns>> | (Nullable extends true ? null | undefined : never)>>(execFn: ExecFn): ApiInfo<ReqType, Srvs, ArgNames, Args, InternalArgs, ServerArgs, Returns, ReturnType<ExecFn>, Nullable>;
     applyApiMeta(sigRef: Type, key: string): void;
 }
 type ApiInfoReturn<ReqType extends ApiType, Returns extends ConstantFieldTypeInput, ServerReturns, Nullable extends boolean, _ReturnValue = Returns extends typeof JSON ? Awaited<ServerReturns> : FieldToValue<Returns>> = ReqType extends "query" ? Promise<_ReturnValue | (Nullable extends true ? null : never)> : ReqType extends "mutation" ? Promise<_ReturnValue | (Nullable extends true ? null : never)> : ReqType extends "pubsub" ? (_ReturnValue | (Nullable extends true ? null : never)) & {
@@ -43,16 +43,16 @@ type ApiInfoReturn<ReqType extends ApiType, Returns extends ConstantFieldTypeInp
 } : ReqType extends "message" ? (_ReturnValue | (Nullable extends true ? null : never)) & {
     __Returns__: "Emit";
 } : never;
-export type BuildApiSignal<SigBuilder extends ApiBuilder<any>, _ApiMap = ReturnType<SigBuilder>> = {
-    [K in keyof _ApiMap]: _ApiMap[K] extends ApiInfo<infer ReqType, any, infer Args, any, any, infer Returns, infer ServerReturns, infer Nullable> ? (...args: Args) => ApiInfoReturn<ReqType, Returns, ServerReturns, Nullable> : never;
+export type BuildApiSignal<ApiInfoMap> = {
+    [K in keyof ApiInfoMap]: ApiInfoMap[K] extends ApiInfo<infer ReqType, any, any, infer Args, any, any, infer Returns, infer ServerReturns, infer Nullable> ? (...args: Args) => ApiInfoReturn<ReqType, Returns, ServerReturns, Nullable> : never;
 };
 export declare const makeApiBuilder: <Srvs extends {
     [key: string]: any;
 }>() => {
-    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]) => ApiInfo<"query", Srvs, [], [], [], Returns, never, Nullable>;
-    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_1 extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable_1> | GuardType, ...guards: GuardType[]) => ApiInfo<"mutation", Srvs, [], [], [], Returns, never, Nullable_1>;
-    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_2 extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable_2> | GuardType, ...guards: GuardType[]) => ApiInfo<"pubsub", Srvs, [], [], [], Returns, never, Nullable_2>;
-    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_3 extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable_3> | GuardType, ...guards: GuardType[]) => ApiInfo<"message", Srvs, [], [], [], Returns, never, Nullable_3>;
+    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => ApiInfo<"query", Srvs, [], [], [], [], Returns, never, Nullable>;
+    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_1 extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable_1>) => ApiInfo<"mutation", Srvs, [], [], [], [], Returns, never, Nullable_1>;
+    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_2 extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable_2>) => ApiInfo<"pubsub", Srvs, [], [], [], [], Returns, never, Nullable_2>;
+    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable_3 extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable_3>) => ApiInfo<"message", Srvs, [], [], [], [], Returns, never, Nullable_3>;
 };
 export type ApiBuilder<Srvs extends {
     [key: string]: any;
@@ -63,11 +63,11 @@ export type ApiBuilder<Srvs extends {
 } = {
     [K in keyof Srvs as K extends string ? Uncapitalize<K> : never]: UnType<Srvs[K]>;
 }> = (builder: {
-    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]) => ApiInfo<"query", _ThisSrvs, [], [], [], Returns, never, Nullable>;
-    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]) => ApiInfo<"mutation", _ThisSrvs, [], [], [], Returns, never, Nullable>;
-    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]) => ApiInfo<"pubsub", _ThisSrvs, [], [], [], Returns, never, Nullable>;
-    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: SignalOption<Returns, Nullable> | GuardType, ...guards: GuardType[]) => ApiInfo<"message", _ThisSrvs, [], [], [], Returns, never, Nullable>;
+    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => ApiInfo<"query", _ThisSrvs, [], [], [], [], Returns, never, Nullable>;
+    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => ApiInfo<"mutation", _ThisSrvs, [], [], [], [], Returns, never, Nullable>;
+    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => ApiInfo<"pubsub", _ThisSrvs, [], [], [], [], Returns, never, Nullable>;
+    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => ApiInfo<"message", _ThisSrvs, [], [], [], [], Returns, never, Nullable>;
 }) => {
-    [key: string]: ApiInfo<any, any, any, any, any, any, any, any>;
+    [key: string]: ApiInfo<any, any, any, any, any, any, any, any, any>;
 };
 export {};

package/src/base.signal.d.ts

@@ -1,134 +1,58 @@
 import { JSON } from "@akanjs/base";
-declare const BaseInternal_base: import("@akanjs/base").Type<import("./internalApiInfo").BuildInternalApiSignal<({ interval }: {
-    resolveField: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>>, "nullable"> | undefined) => import("./internalApiInfo").InternalApiInfo<"resolveField", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], Returns, import("@akanjs/document").Doc<never>, Nullable>;
-    interval: <Nullable extends boolean = false>(scheduleTime: number, signalOption?: import("./signalDecorators").SignalOption<typeof JSON, Nullable, "__Scalar__"> | undefined) => import("./internalApiInfo").InternalApiInfo<"interval", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, Nullable>;
-    cron: <Nullable extends boolean = false>(scheduleCron: string, signalOption?: import("./signalDecorators").SignalOption<typeof JSON, Nullable, "__Scalar__"> | undefined) => import("./internalApiInfo").InternalApiInfo<"cron", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, Nullable>;
-    timeout: <Nullable extends boolean = false>(timeout: number, signalOption?: import("./signalDecorators").SignalOption<typeof JSON, Nullable, "__Scalar__"> | undefined) => import("./internalApiInfo").InternalApiInfo<"timeout", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, Nullable>;
-    initialize: <Nullable extends boolean = false>(signalOption?: import("./signalDecorators").SignalOption<typeof JSON, Nullable, "__Scalar__"> | undefined) => import("./internalApiInfo").InternalApiInfo<"init", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, Nullable>;
-    destroy: <Nullable extends boolean = false>(signalOption?: import("./signalDecorators").SignalOption<typeof JSON, Nullable, "__Scalar__"> | undefined) => import("./internalApiInfo").InternalApiInfo<"destroy", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, Nullable>;
-    process: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>> | undefined) => import("./internalApiInfo").InternalApiInfo<"process", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], Returns, import("@akanjs/document").Doc<never>, Nullable>;
-}) => {
+declare const BaseInternal_base: new (...args: any[]) => {
     publishPing: import("./internalApiInfo").InternalApiInfo<"interval", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, false>;
-}, {
-    publishPing: import("./internalApiInfo").InternalApiInfo<"interval", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], typeof JSON, import("@akanjs/document").Doc<never>, false>;
-}> & {}>;
+    }, [], [], [], typeof JSON, false>;
+};
 export declare class BaseInternal extends BaseInternal_base {
 }
-declare const BaseEndpoint_base: import("@akanjs/base").Type<import("./apiInfo").BuildApiSignal<({ query, mutation, message, pubsub }: {
-    query: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput = import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: "Public" | "None" | "User" | "Admin" | "SuperAdmin" | "Every" | "Owner" | import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>> | undefined, ...guards: import("./signalDecorators").GuardType[]) => import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], Returns, never, Nullable>;
-    mutation: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput = import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: "Public" | "None" | "User" | "Admin" | "SuperAdmin" | "Every" | "Owner" | import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>> | undefined, ...guards: import("./signalDecorators").GuardType[]) => import("./apiInfo").ApiInfo<"mutation", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], Returns, never, Nullable>;
-    pubsub: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput = import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: "Public" | "None" | "User" | "Admin" | "SuperAdmin" | "Every" | "Owner" | import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>> | undefined, ...guards: import("./signalDecorators").GuardType[]) => import("./apiInfo").ApiInfo<"pubsub", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], Returns, never, Nullable>;
-    message: <Returns extends import("@akanjs/constant").ConstantFieldTypeInput = import("@akanjs/constant").ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOptionOrGuard?: "Public" | "None" | "User" | "Admin" | "SuperAdmin" | "Every" | "Owner" | import("./signalDecorators").SignalOption<Returns, Nullable, keyof import("@akanjs/base").UnType<Returns>> | undefined, ...guards: import("./signalDecorators").GuardType[]) => import("./apiInfo").ApiInfo<"message", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], Returns, never, Nullable>;
-}) => {
-    ping: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
-    pingBody: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], StringConstructor, string, false>;
-    pingParam: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], StringConstructor, string, false>;
-    pingQuery: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [arg: string | null], [], [arg: string | undefined], StringConstructor, string | undefined, true>;
-    pingEvery: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
-    pingUser: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
-    pingAdmin: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
-    getDictionary: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], typeof JSON, Record<string, Record<string, string>>, false>;
-    getAllDictionary: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], typeof JSON, Record<string, Record<string, Record<string, string>>>, false>;
-    cleanup: import("./apiInfo").ApiInfo<"mutation", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], BooleanConstructor, Promise<boolean>, false>;
-    wsPing: import("./apiInfo").ApiInfo<"message", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
-    pubsubPing: import("./apiInfo").ApiInfo<"pubsub", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, void, false>;
-    getSignals: import("./apiInfo").ApiInfo<"query", {
-        baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], typeof JSON, import("./signalInfo").SerializedSignal[], false>;
-}, {
+declare const BaseEndpoint_base: new (...args: any[]) => import("@akanjs/base").Assign<{
     ping: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
+    }, [], [], [], [], StringConstructor, string, false>;
     pingBody: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], StringConstructor, string, false>;
+    }, ["data"], [arg: string], [], [arg: string], StringConstructor, string, false>;
     pingParam: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], StringConstructor, string, false>;
+    }, [string], [arg: string], [], [arg: string], StringConstructor, string, false>;
     pingQuery: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [arg: string | null], [], [arg: string | undefined], StringConstructor, string | undefined, true>;
+    }, [string], [arg: string | null], [], [arg: string | undefined], StringConstructor, string | undefined, true>;
     pingEvery: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
+    }, [], [], [], [], StringConstructor, string, false>;
     pingUser: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
+    }, [], [], [], [], StringConstructor, string, false>;
     pingAdmin: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
+    }, [], [], [], [], StringConstructor, string, false>;
     getDictionary: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [arg: string], [], [arg: string], typeof JSON, Record<string, Record<string, string>>, false>;
+    }, [string], [arg: string], [], [arg: string], typeof JSON, Record<string, object>, false>;
     getAllDictionary: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], typeof JSON, Record<string, Record<string, Record<string, string>>>, false>;
+    }, [], [], [], [], typeof JSON, Record<string, Record<string, object>>, false>;
     cleanup: import("./apiInfo").ApiInfo<"mutation", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], BooleanConstructor, Promise<boolean>, false>;
+    }, [], [], [], [], BooleanConstructor, Promise<boolean>, false>;
     wsPing: import("./apiInfo").ApiInfo<"message", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, string, false>;
+    }, [], [], [], [], StringConstructor, string, false>;
     pubsubPing: import("./apiInfo").ApiInfo<"pubsub", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], StringConstructor, void, false>;
+    }, [], [], [], [], StringConstructor, void, false>;
     getSignals: import("./apiInfo").ApiInfo<"query", {
         baseService: import("@akanjs/service").BaseService;
-    }, [], [], [], typeof JSON, import("./signalInfo").SerializedSignal[], false>;
-}> & {}>;
+    }, [], [], [], [], typeof JSON, import("./signalInfo").SerializedSignal[], false>;
+}, {}>;
 export declare class BaseEndpoint extends BaseEndpoint_base {
 }
-declare const BaseSignal_base: import("@akanjs/base").Type<BaseEndpoint & BaseInternal>;
+declare const BaseSignal_base: new (...args: any[]) => import("./apiInfo").BuildApiSignal<BaseEndpoint> & import("./internalApiInfo").BuildInternalApiSignal<BaseInternal>;
 export declare class BaseSignal extends BaseSignal_base {
 }
+declare const Base_base: new (...args: any[]) => import("@akanjs/service").Sig<BaseSignal>;
+export declare class Base extends Base_base {
+}
 export {};

package/src/doc.d.ts

@@ -1,9 +1,9 @@
-import { type Type } from "@akanjs/base";
-import { ArgMeta, SignalType } from "./signalDecorators";
-export declare const makeRequestExample: (sigRef: Type, key: string) => {
+import { SerializedArg, SerializedEndpoint } from ".";
+import { SignalType } from "./signalDecorators";
+export declare const makeRequestExample: (gqlMeta: SerializedEndpoint) => {
     [key: string]: any;
 };
-export declare const getExampleData: (argMetas: ArgMeta[], signalType?: SignalType) => {
+export declare const getExampleData: (argMetas: SerializedArg[], signalType?: SignalType) => {
     [key: string]: any;
 };
-export declare const makeResponseExample: (sigRef: Type, key: string) => string | number | boolean | object | null;
+export declare const makeResponseExample: (gqlMeta: SerializedEndpoint) => string | number | boolean | object | null;

package/src/fetch.d.ts

@@ -2,14 +2,14 @@ export declare const fetch: {
     ping: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
     pingBody: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
     pingParam: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
-    pingQuery: (args_0?: string | null | undefined, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string | null>;
+    pingQuery: (arg?: string | null | undefined, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string | null>;
     pingEvery: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
     pingUser: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
     pingAdmin: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
-    getDictionary: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, string>>>;
-    getAllDictionary: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, Record<string, string>>>>;
+    getDictionary: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, object>>;
+    getAllDictionary: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, object>>>;
     cleanup: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<boolean>;
-    wsPing: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => void;
+    wsPing: () => void;
     getSignals: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<import("./signalInfo").SerializedSignal[]>;
     listenWsPing: (handleEvent: (data: string & {
         __Returns__: "Emit";
@@ -21,7 +21,7 @@ export declare const fetch: {
     clone: (option?: {
         jwt: string | null;
     }) => Omit<{
-        wsPing: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => void;
+        wsPing: () => void;
         listenWsPing: (handleEvent: (data: string & {
             __Returns__: "Emit";
         }) => any, options?: import("@akanjs/common").FetchPolicy) => () => void;
@@ -31,12 +31,12 @@ export declare const fetch: {
         ping: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
         pingBody: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
         pingParam: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
-        pingQuery: (args_0?: string | null | undefined, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string | null>;
+        pingQuery: (arg?: string | null | undefined, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string | null>;
         pingEvery: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
         pingUser: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
         pingAdmin: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<string>;
-        getDictionary: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, string>>>;
-        getAllDictionary: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, Record<string, string>>>>;
+        getDictionary: (args_0: string, option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, object>>;
+        getAllDictionary: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<Record<string, Record<string, object>>>;
         cleanup: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<boolean>;
         getSignals: (option?: import("@akanjs/common").FetchPolicy<any> | undefined) => Promise<import("./signalInfo").SerializedSignal[]>;
     } & typeof globalThis.fetch & {

package/src/gql.d.ts

@@ -1,13 +1,13 @@
-import { DataList, type GetActionObject, type GetStateObject, type MergeAll, type MergedValues, type Prettify, type PromiseOrObject, Type, Upload } from "@akanjs/base";
+import { DataList, type GetActionObject, type GetStateObject, MergeAll, type MergedValues, type Prettify, type PromiseOrObject, Type } from "@akanjs/base";
 import { FetchPolicy } from "@akanjs/common";
 import { ConstantModel, DefaultOf, DocumentModel, ProtoFile, QueryOf } from "@akanjs/constant";
-import type { FilterType, SortOf } from "@akanjs/document";
+import type { ExtractQuery, ExtractSort, FilterInstance } from "@akanjs/document";
 import { AnyVariables } from "@urql/core";
 import { type Client } from ".";
 import { type DefaultSignal, type SliceMeta } from "./signalDecorators";
 export declare class GqlStorage {
 }
-export interface FetchInitForm<Input, Full, Filter extends FilterType, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>> {
+export interface FetchInitForm<Input, Full, Filter extends FilterInstance, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>> {
     page?: number;
     limit?: number;
     sort?: _Sort;
@@ -15,7 +15,7 @@ export interface FetchInitForm<Input, Full, Filter extends FilterType, _DefaultI
     invalidate?: boolean;
     insight?: boolean;
 }
-export type ServerInit<T extends string, Light, Insight = any, QueryArgs = any[], Filter extends FilterType = any, _CapitalizedT extends string = Capitalize<T>, _Sort = SortOf<Filter>> = SliceMeta & {
+export type ServerInit<T extends string, Light, Insight = any, QueryArgs = any[], Filter extends FilterInstance = any, _CapitalizedT extends string = Capitalize<T>, _Sort = ExtractSort<Filter>> = SliceMeta & {
     [K in `${T}ObjList`]: Light[];
 } & {
     [K in `${T}ObjInsight`]: Insight;
@@ -32,7 +32,7 @@ export type ServerInit<T extends string, Light, Insight = any, QueryArgs = any[]
 } & {
     [K in `${T}InitAt`]: Date;
 };
-export type ClientInit<T extends string, Light, Insight = any, QueryArgs = any[], Filter extends FilterType = any, _CapitalizedT extends string = Capitalize<T>, _Sort = SortOf<Filter>> = PromiseOrObject<ServerInit<T, Light, Insight, QueryArgs, Filter, _CapitalizedT, _Sort>>;
+export type ClientInit<T extends string, Light, Insight = any, QueryArgs = any[], Filter extends FilterInstance = any, _CapitalizedT extends string = Capitalize<T>, _Sort = ExtractSort<Filter>> = PromiseOrObject<ServerInit<T, Light, Insight, QueryArgs, Filter, _CapitalizedT, _Sort>>;
 export type ServerView<T extends string, Model> = {
     refName: T;
 } & {
@@ -50,8 +50,8 @@ export type ServerEdit<T extends string, Model> = {
 };
 export type ClientEdit<T extends string, Model> = PromiseOrObject<ServerEdit<T, Model>>;
 type RemoveLast3<T extends any[]> = T extends [...infer Rest, any, any, any] ? Rest : T;
-export type FilterListArgs<Args extends any[]> = PartialNullableArgs<ConvertArgs<RemoveLast3<FilterInternalArgs<Args>>>>;
-type FetchOption<Input, Full, Filter extends FilterType, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>> = FetchPolicy & FetchInitForm<Input, Full, Filter, _DefaultInput, _Sort>;
+export type FilterListArgs<Args extends any[]> = PartialNullableArgs<RemoveLast3<Args>>;
+type FetchOption<Input, Full, Filter extends FilterInstance, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>> = FetchPolicy & FetchInitForm<Input, Full, Filter, _DefaultInput, _Sort>;
 type ViewReturn<T extends string, Full> = {
     [K in T]: Full;
 } & {
@@ -64,7 +64,7 @@ type EditReturn<T extends string, Full> = {
 };
 type InitReturn<T extends string, Light extends {
     id: string;
-}, Insight, Args, Filter extends FilterType, _CapitalizedT extends string = Capitalize<T>, _Sort = SortOf<Filter>> = {
+}, Insight, Args, Filter extends FilterInstance, _CapitalizedT extends string = Capitalize<T>, _Sort = ExtractSort<Filter>> = {
     [K in `${T}Init`]: ServerInit<T, Light, Insight, Args, Filter, _CapitalizedT, _Sort>;
 } & {
     [K in `${T}List`]: DataList<Light>;
@@ -91,14 +91,14 @@ type ViewEditMethods<T extends string, Full, _CapitalizedT extends string = Capi
 };
 type InitMethods<T extends string, Input, Full, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>> = {
+}, Insight, Filter extends FilterInstance, _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>> = {
     [K in `init${_CapitalizedT}`]: (query?: _QueryOfDoc, option?: FetchOption<Input, Full, Filter, _DefaultInput, _Sort>) => Promise<InitReturn<T, Light, Insight, [query?: _QueryOfDoc], Filter, _CapitalizedT, _Sort>>;
 } & {
     [K in `get${_CapitalizedT}Init`]: (query?: _QueryOfDoc, option?: FetchOption<Input, Full, Filter, _DefaultInput, _Sort>) => ClientInit<T, Light, Insight, [query?: _QueryOfDoc], Filter, _CapitalizedT, _Sort>;
 };
 type DynamicListMethodsOfKey<T extends string, Input, Full, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Suffix extends string, QueryArgs extends any[], _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>> = {
+}, Insight, Filter extends FilterInstance, Suffix extends string, QueryArgs extends any[], _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>> = {
     [Key in `init${_CapitalizedT}${Suffix}`]: (...args: [...queryArgs: QueryArgs, option?: FetchOption<Input, Full, Filter, _DefaultInput, _Sort>]) => Promise<{
         [P in `${T}Init${Suffix}`]: ServerInit<T, Light, Insight, QueryArgs, Filter, _CapitalizedT, _Sort>;
     } & {
@@ -111,31 +111,20 @@ type DynamicListMethodsOfKey<T extends string, Input, Full, Light extends {
 };
 type DynamicListMethods<T extends string, Input, Full, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Signal, _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>> = MergedValues<{
+}, Insight, Filter extends FilterInstance, Signal, _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>> = MergedValues<{
     [K in keyof _DynamicSliceArgMap]: K extends string ? _DynamicSliceArgMap[K] extends any[] ? DynamicListMethodsOfKey<T, Input, Full, Light, Insight, Filter, K, _DynamicSliceArgMap[K], _CapitalizedT, _DefaultInput, _Sort> : never : never;
 }>;
-export type DynamicSliceArgMap<T extends string, Input, Full, Filter extends FilterType, Signal, _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = SortOf<Filter>> = {
+export type DynamicSliceArgMap<T extends string, Input, Full, Filter extends FilterInstance, Signal, _CapitalizedT extends string = Capitalize<T>, _DefaultInput = DefaultOf<Input>, _Sort = ExtractSort<Filter>> = {
     [K in keyof Signal as K extends `${T}List${infer Suffix}` ? Suffix : never]: Signal[K] extends (...args: infer Args) => Promise<Full[]> ? FilterListArgs<Args> : never;
 };
 export type DbGraphQL<T extends string, Input, Full, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Fetch, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = GetActionObject<Filter>, _Sort = SortOf<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>> = {
+}, Insight, Filter extends FilterInstance, Fetch, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = ExtractQuery<Filter>, _Sort = ExtractSort<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>> = {
     refName: string;
     slices: SliceMeta[];
 } & GetWsMessageOf<Signal> & GetWsPubsubOf<Signal> & BasicMethods<T, Input, Full, Light, Insight, _CapitalizedT> & ViewEditMethods<T, Full, _CapitalizedT> & InitMethods<T, Input, Full, Light, Insight, Filter, _CapitalizedT, _QueryOfDoc, _DefaultInput, _Sort> & Fetch & DynamicListMethods<T, Input, Full, Light, Insight, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort, _DynamicSliceArgMap>;
-type IsInternalArg<T> = T extends {
-    __InternalArg__: any;
-} ? true : false;
-type ConvertArg<T> = T extends Upload[] ? FileList : T;
-type ConvertArgs<T extends any[]> = T extends [infer Head, ...infer Rest] ? [ConvertArg<Head>, ...ConvertArgs<Rest>] : [];
-type FilterInternalArgs<T extends any[]> = T extends [...infer Rest, infer Last] ? IsInternalArg<Last> extends true ? FilterInternalArgs<Rest> : T : [];
 type PartialNullableArgs<T extends any[]> = T extends [infer Head, ...infer Rest] ? null extends Head ? Partial<T> : [Head, ...PartialNullableArgs<Rest>] : [];
-export type FilterOutInternalArgs<Args extends any[]> = PartialNullableArgs<ConvertArgs<FilterInternalArgs<Args>>>;
-type FunctionParams<F> = F extends (...args: infer P) => any ? P : never;
-type RebuildFunction<Params extends readonly unknown[], R> = (...args: [...Params, option?: FetchPolicy]) => R;
-export type RemoveInternalArgs<F extends (...args: any) => any, Returns = ReturnType<F>> = RebuildFunction<FilterOutInternalArgs<FunctionParams<F>>, Returns>;
 type EnsurePromise<T> = T extends Promise<any> ? T : Promise<T>;
-type ApplyPromise<T> = T extends (...args: infer A) => infer R ? (...args: A) => EnsurePromise<R> : never;
 type ApplyVoidReturn<T> = T extends (...args: infer A) => any ? (...args: A) => void : never;
 type HasMarker<Fn, Marker> = Fn extends (...args: any) => Promise<{
     __Returns__: Marker;
@@ -143,10 +132,10 @@ type HasMarker<Fn, Marker> = Fn extends (...args: any) => Promise<{
     __Returns__: Marker;
 } ? true : false;
 export type GetQueryMutationOf<Sig, M = unknown> = {
-    [K in keyof Sig as K extends keyof M ? never : HasMarker<Sig[K], string> extends true ? never : K]: Sig[K] extends (...args: any) => any ? ApplyPromise<RemoveInternalArgs<Sig[K]>> : never;
+    [K in keyof Sig as K extends keyof M ? never : HasMarker<Sig[K], string> extends true ? never : K]: Sig[K] extends (...args: any) => any ? Sig[K] extends (...args: infer Args) => infer Return ? (...args: [...PartialNullableArgs<Args>, option?: FetchPolicy]) => EnsurePromise<Return> : never : never;
 };
 type EmitMethods<Sig> = {
-    [K in keyof Sig as HasMarker<Sig[K], "Emit"> extends true ? K : never]: Sig[K] extends (...args: any) => any ? ApplyVoidReturn<RemoveInternalArgs<Sig[K], void>> : never;
+    [K in keyof Sig as HasMarker<Sig[K], "Emit"> extends true ? K : never]: Sig[K] extends (...args: any) => any ? ApplyVoidReturn<Sig[K]> : never;
 };
 type ListenMethods<Sig> = {
     [K in keyof Sig as K extends string ? HasMarker<Sig[K], "Emit"> extends true ? `listen${Capitalize<K>}` : never : never]: Sig[K] extends (...args: any) => infer R ? (handleEvent: (data: Awaited<R>) => any, options?: FetchPolicy) => () => void : never;
@@ -155,11 +144,7 @@ export type GetWsMessageOf<Sig> = EmitMethods<Sig> & ListenMethods<Sig>;
 type RemoveReturnMeta<Return> = Return extends infer R & {
     __Returns__: any;
 } ? R : Return;
-type GenerateSubscribeMethod<Fn> = Fn extends (...args: infer Args) => infer R ? (...args: [
-    ...args: FilterOutInternalArgs<Args>,
-    onData: (data: RemoveReturnMeta<Awaited<R>>) => void,
-    fetchPolicy?: FetchPolicy
-]) => () => void : never;
+type GenerateSubscribeMethod<Fn> = Fn extends (...args: infer Args) => infer R ? (...args: [...args: Args, onData: (data: RemoveReturnMeta<Awaited<R>>) => void, fetchPolicy?: FetchPolicy]) => () => void : never;
 export type GetWsPubsubOf<Sig> = {
     [K in keyof Sig as K extends string ? HasMarker<Sig[K], "Subscribe"> extends true ? `subscribe${Capitalize<K>}` : never : never]: GenerateSubscribeMethod<Sig[K]>;
 };
@@ -174,7 +159,7 @@ export declare const gqlOf: <T extends string, Input, Full extends {
     id: string;
 }, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Signal, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _Sort = SortOf<Filter>, _SignalAction = GetActionObject<Signal>>(constant: ConstantModel<T, Input, Full, Light, Insight, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc>, filterRef: Type<Filter>, sigRef: Type<Signal>, option?: {
+}, Insight, Filter extends FilterInstance, Signal, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _Sort = ExtractSort<Filter>, _SignalAction = GetActionObject<Signal>>(constant: ConstantModel<T, Input, Full, Light, Insight, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc>, filterRef: Type<Filter>, sigRef: Type<Signal>, option?: {
     overwrite?: {
         [key: string]: any;
     };

package/src/internalApiInfo.d.ts

@@ -1,7 +1,8 @@
 import { JSON, PromiseOrObject, Type, UnType } from "@akanjs/base";
 import { ConstantFieldTypeInput, DocumentModel, FieldToValue, PlainTypeToFieldType } from "@akanjs/constant";
-import { GetInternalArg } from "./apiInfo";
-import { ArgType, InternalArgType, Job, SignalOption } from "./signalDecorators";
+import { InternalParam } from "@akanjs/nest";
+import type { Job } from "bull";
+import { ArgType, SignalOption } from "./signalDecorators";
 type InternalApiType = "resolveField" | "interval" | "cron" | "timeout" | "init" | "destroy" | "process";
 interface InternalApiArgProps<Nullable extends boolean = false> {
     nullable?: Nullable;
@@ -10,7 +11,7 @@ export declare class InternalApiInfo<ReqType extends InternalApiType, Srvs exten
     [key: string]: any;
 } = {
     [key: string]: any;
-}, Args extends any[] = [], InternalArgs extends any[] = [], Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Parent extends DocumentModel<any> = DocumentModel<any>, Nullable extends boolean = false> {
+}, Args extends any[] = [], InternalArgs extends any[] = [], DefaultArgs extends any[] = [], Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false> {
     #private;
     readonly type: ReqType;
     readonly args: {
@@ -20,18 +21,19 @@ export declare class InternalApiInfo<ReqType extends InternalApiType, Srvs exten
         option?: InternalApiArgProps<boolean>;
     }[];
     readonly internalArgs: {
-        type: InternalArgType;
+        type: InternalParam;
         option?: InternalApiArgProps<boolean>;
     }[];
+    readonly defaultArgs: string[];
     readonly returnRef: Returns;
     readonly signalOption: SignalOption<Returns, Nullable>;
-    execFn: ((...args: [...Args, ...InternalArgs]) => any) | null;
+    execFn: ((...args: [...Args, ...DefaultArgs, ...InternalArgs]) => any) | null;
     constructor(type: ReqType, returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>);
-    msg<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Nullable extends boolean = false, _FieldToValue = FieldToValue<Arg>>(name: string, argRef: Arg, option?: InternalApiArgProps<Nullable>): InternalApiInfo<ReqType, Srvs, [...Args, arg: _FieldToValue | (Nullable extends true ? undefined : never)], InternalArgs, Returns, Parent, Nullable>;
-    with<ArgType extends InternalArgType, Nullable extends boolean = false>(argType: ArgType, option?: InternalApiArgProps<Nullable>): InternalApiInfo<ReqType, Srvs, Args, [...InternalArgs, arg: ArgType extends "Job" ? Job : ArgType extends "Parent" ? Parent : GetInternalArg<ArgType> | (Nullable extends true ? null : never)], Returns, Parent, Nullable>;
+    msg<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, Nullable extends boolean = false, _FieldToValue = FieldToValue<Arg>>(name: string, argRef: Arg, option?: InternalApiArgProps<Nullable>): InternalApiInfo<ReqType, Srvs, [...Args, arg: _FieldToValue | (Nullable extends true ? undefined : never)], InternalArgs, DefaultArgs, Returns, Nullable>;
+    with<ArgType, Optional extends boolean = false>(argType: InternalParam<ArgType>, option?: InternalApiArgProps<Optional>): InternalApiInfo<ReqType, Srvs, Args, [...InternalArgs, arg: ArgType | (Optional extends true ? null : never)], DefaultArgs, Returns, Nullable>;
     exec(query: (this: {
         [K in keyof Srvs as K extends string ? Uncapitalize<K> : never]: Srvs[K];
-    }, ...args: [...Args, ...InternalArgs]) => ReqType extends "process" | "resolveField" ? PromiseOrObject<DocumentModel<FieldToValue<Returns>> | (Nullable extends true ? null : never)> : PromiseOrObject<void>): this;
+    }, ...args: [...Args, ...DefaultArgs, ...InternalArgs]) => ReqType extends "process" | "resolveField" ? PromiseOrObject<DocumentModel<FieldToValue<Returns>> | (Nullable extends true ? null : never)> : PromiseOrObject<void>): this;
     applyApiMeta(sigRef: Type, key: string): void;
 }
 export declare const makeInternalApiBuilder: <Srvs extends {
@@ -39,16 +41,16 @@ export declare const makeInternalApiBuilder: <Srvs extends {
 } = {
     [key: string]: any;
 }, Parent extends DocumentModel<any> = DocumentModel<any>>() => {
-    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalApiInfo<"resolveField", Srvs, [], [], Returns, Parent, Nullable>;
-    interval: <Nullable_2 extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"interval", Srvs, [], [], typeof JSON, Parent, Nullable_2>;
-    cron: <Nullable_2 extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"cron", Srvs, [], [], typeof JSON, Parent, Nullable_2>;
-    timeout: <Nullable_2 extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"timeout", Srvs, [], [], typeof JSON, Parent, Nullable_2>;
-    initialize: <Nullable_2 extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"init", Srvs, [], [], typeof JSON, Parent, Nullable_2>;
-    destroy: <Nullable_2 extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"destroy", Srvs, [], [], typeof JSON, Parent, Nullable_2>;
-    process: <Returns extends ConstantFieldTypeInput, Nullable_1 extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable_1>) => InternalApiInfo<"process", Srvs, [], [], Returns, Parent, Nullable_1>;
+    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalApiInfo<"resolveField", Srvs, [], [], [Parent], Returns, Nullable>;
+    interval: <Nullable_2 extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"interval", Srvs, [], [], [], typeof JSON, Nullable_2>;
+    cron: <Nullable_2 extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"cron", Srvs, [], [], [], typeof JSON, Nullable_2>;
+    timeout: <Nullable_2 extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"timeout", Srvs, [], [], [], typeof JSON, Nullable_2>;
+    initialize: <Nullable_2 extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"init", Srvs, [], [], [], typeof JSON, Nullable_2>;
+    destroy: <Nullable_2 extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable_2>) => InternalApiInfo<"destroy", Srvs, [], [], [], typeof JSON, Nullable_2>;
+    process: <Returns extends ConstantFieldTypeInput, Nullable_1 extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable_1>) => InternalApiInfo<"process", Srvs, [], [], [Job<any>], Returns, Nullable_1>;
 };
-export type BuildInternalApiSignal<SigBuilder extends InternalApiBuilder<any>, _ApiMap = ReturnType<SigBuilder>> = {
-    [K in keyof _ApiMap as _ApiMap[K] extends InternalApiInfo<"process", any, any, any, any, any, any> ? K : never]: _ApiMap[K] extends InternalApiInfo<infer ReqType, any, infer Args, any, infer Returns, any, infer Nullable> ? (...args: Args) => ReqType extends "process" ? Promise<(FieldToValue<Returns> | (Nullable extends true ? null : never)) & {
+export type BuildInternalApiSignal<InternalApiInfoMap> = {
+    [K in keyof InternalApiInfoMap as InternalApiInfoMap[K] extends InternalApiInfo<"process", any, any, any, any, any, any> ? K : never]: InternalApiInfoMap[K] extends InternalApiInfo<infer ReqType, any, infer Args, any, any, infer Returns, infer Nullable> ? (...args: Args) => ReqType extends "process" ? Promise<(FieldToValue<Returns> | (Nullable extends true ? null : never)) & {
         __Returns__: "Done";
     }> : never : never;
 };
@@ -61,13 +63,13 @@ export type InternalApiBuilder<Srvs extends {
 } = {
     [K in keyof Srvs as K extends string ? Uncapitalize<K> : never]: UnType<Srvs[K]>;
 }> = (builder: {
-    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalApiInfo<"resolveField", _ThisSrvs, [], [], Returns, Parent, Nullable>;
-    interval: <Nullable extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"interval", _ThisSrvs, [], [], typeof JSON, Parent, Nullable>;
-    cron: <Nullable extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"cron", _ThisSrvs, [], [], typeof JSON, Parent, Nullable>;
-    timeout: <Nullable extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"timeout", _ThisSrvs, [], [], typeof JSON, Parent, Nullable>;
-    initialize: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"init", _ThisSrvs, [], [], typeof JSON, Parent, Nullable>;
-    destroy: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"destroy", _ThisSrvs, [], [], typeof JSON, Parent, Nullable>;
-    process: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => InternalApiInfo<"process", _ThisSrvs, [], [], Returns, Parent, Nullable>;
+    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalApiInfo<"resolveField", _ThisSrvs, [], [], [Parent], Returns, Nullable>;
+    interval: <Nullable extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"interval", _ThisSrvs, [], [], [], typeof JSON, Nullable>;
+    cron: <Nullable extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"cron", _ThisSrvs, [], [], [], typeof JSON, Nullable>;
+    timeout: <Nullable extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"timeout", _ThisSrvs, [], [], [], typeof JSON, Nullable>;
+    initialize: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"init", _ThisSrvs, [], [], [], typeof JSON, Nullable>;
+    destroy: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof JSON, Nullable>) => InternalApiInfo<"destroy", _ThisSrvs, [], [], [], typeof JSON, Nullable>;
+    process: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => InternalApiInfo<"process", _ThisSrvs, [], [], [Job], Returns, Nullable>;
 }) => {
     [key: string]: InternalApiInfo<any, any, any, any, any, any, any>;
 };