akanjs 2.3.5-rc.9 → 2.3.5

package/types/service/types.d.ts

@@ -1,9 +1,28 @@
 import type { Cls, MergeAllTypes, PromiseOrObject } from "akanjs/base";
 import type { Logger } from "akanjs/common";
 import type { QueryOf } from "akanjs/constant";
-import type { CRUDEventType, DatabaseInstance, DataInputOf, Doc as DbDoc, ExtractQuery, ExtractSort, FilterInstance, FindQueryOption, GetDocObject, ListQueryOption, QueryMethodPart, SaveEventType } from "akanjs/document";
+import type { CRUDEventType, DatabaseModel, DataInputOf, FilterInstance, FindQueryOption, GetDocObject, ListQueryOption, QueryMethodPart, SaveEventType } from "akanjs/document";
 type ServiceMixinOmitKey = "onInit" | "onDestroy" | "_libsOnInit" | "_libsOnDestroy" | "_preCreate" | "_postCreate" | "_preUpdate" | "_postUpdate" | "_preRemove" | "_postRemove" | "_libsPreCreate" | "_libsPostCreate" | "_libsPreUpdate" | "_libsPostUpdate" | "_libsPreRemove" | "_libsPostRemove";
-export type DatabaseService<T extends string = string, Input = any, Doc = any, Obj = any, Model = any, Insight = any, Filter extends FilterInstance = FilterInstance, LibSrvs extends Cls[] = [], _Query extends ExtractQuery<Filter> = ExtractQuery<Filter>, _Sort extends ExtractSort<Filter> = ExtractSort<Filter>, _CapitalizedRefName extends Capitalize<T> = Capitalize<T>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _FindQueryOption extends FindQueryOption<_Sort, Obj> = FindQueryOption<_Sort, Obj>, _ListQueryOption extends ListQueryOption<_Sort, Obj> = ListQueryOption<_Sort, Obj>, _DocObjectOfDoc = GetDocObject<Doc>, _MixedLibSrv = MergeAllTypes<LibSrvs, ServiceMixinOmitKey>> = {
+type DatabaseQueryMethods<Query, Sort, Obj, Doc, Insight, FindQueryOption, ListQueryOption, DocQuery> = QueryMethodPart<Query, Sort, Obj, Doc, Insight, FindQueryOption, ListQueryOption, DocQuery>;
+type DocumentLike = {
+    id: string;
+    set: (...args: never[]) => unknown;
+    save: (...args: never[]) => unknown;
+};
+type MixedLibServiceReturn<Value, Doc, DocObjectOfDoc> = Value extends (infer SingleValue)[] ? SingleValue extends DocumentLike ? DocObjectOfDoc extends GetDocObject<SingleValue> ? Doc[] : Value : Value : Value extends DocumentLike ? DocObjectOfDoc extends GetDocObject<Value> ? Doc : Value : Value;
+type MixedLibServiceMethods<MixedLibSrv, Doc, DocObjectOfDoc> = {
+    [K in keyof MixedLibSrv]: MixedLibSrv[K] extends (...args: infer Args) => Promise<infer Value> ? (...args: Args) => Promise<MixedLibServiceReturn<Value, Doc, DocObjectOfDoc>> : MixedLibSrv[K];
+};
+export type DbRefName<Db extends DatabaseModel> = Db["refName"];
+export type DbInput<Db extends DatabaseModel> = Db["_Input"];
+export type DbDoc<Db extends DatabaseModel> = Db["_Doc"];
+export type DbObj<Db extends DatabaseModel> = Db["_Obj"];
+export type DbModel<Db extends DatabaseModel> = Db["_Model"];
+export type DbInsight<Db extends DatabaseModel> = Db["_Insight"];
+export type DbFilter<Db extends DatabaseModel> = Db["_Filter"];
+export type DbQuery<Db extends DatabaseModel> = Db["_Query"];
+export type DbSort<Db extends DatabaseModel> = Db["_Sort"];
+export type DatabaseService<T extends string = string, Input = any, Doc = any, Obj = any, Model = any, Insight = any, Filter extends FilterInstance = FilterInstance, LibSrvs extends Cls[] = [], _Query = Filter extends FilterInstance ? any : never, _Sort = Filter extends FilterInstance ? any : never, _CapitalizedRefName extends Capitalize<T> = Capitalize<T>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _FindQueryOption extends FindQueryOption<_Sort, Obj> = FindQueryOption<_Sort, Obj>, _ListQueryOption extends ListQueryOption<_Sort, Obj> = ListQueryOption<_Sort, Obj>, _DocObjectOfDoc = GetDocObject<Doc>, _MixedLibSrv = MergeAllTypes<LibSrvs, ServiceMixinOmitKey>> = {
     logger: Logger;
     __databaseModel: Model;
     __get: (id: string) => Promise<Doc>;
@@ -49,7 +68,6 @@ export type DatabaseService<T extends string = string, Input = any, Doc = any, O
     [K in `update${_CapitalizedRefName}`]: (id: string, data: Partial<Doc>) => Promise<Doc>;
 } & {
     [K in `remove${_CapitalizedRefName}`]: (id: string) => Promise<Doc>;
-} & QueryMethodPart<_Query, _Sort, Obj, Doc, Insight, _FindQueryOption, _ListQueryOption, _QueryOfDoc> & {
-    [K in keyof _MixedLibSrv]: _MixedLibSrv[K] extends (...args: infer Args) => Promise<infer Value> ? Value extends (infer SingleValue)[] ? SingleValue extends DatabaseInstance ? _DocObjectOfDoc extends GetDocObject<SingleValue> ? (...args: Args) => Promise<Doc[]> : _MixedLibSrv[K] : _MixedLibSrv[K] : Value extends DbDoc<any> ? _DocObjectOfDoc extends GetDocObject<Value> ? (...args: Args) => Promise<Doc> : _MixedLibSrv[K] : _MixedLibSrv[K] : _MixedLibSrv[K];
-};
+} & DatabaseQueryMethods<_Query, _Sort, Obj, Doc, Insight, _FindQueryOption, _ListQueryOption, _QueryOfDoc> & MixedLibServiceMethods<_MixedLibSrv, Doc, _DocObjectOfDoc>;
+export type DatabaseServiceForModel<Db extends DatabaseModel, LibSrvs extends Cls[] = []> = DatabaseService<DbRefName<Db>, DbInput<Db>, DbDoc<Db>, DbObj<Db>, DbModel<Db>, DbInsight<Db>, DbFilter<Db>, LibSrvs, DbQuery<Db>, DbSort<Db>>;
 export {};

package/types/signal/endpoint.d.ts

@@ -2,6 +2,7 @@ import type { Assign } from "akanjs/base";
 import { ENDPOINT_META } from "akanjs/base";
 import { type Adaptor, type AdaptorCls, type ServiceModel } from "akanjs/service";
 import { type EndpointBuilder, type EndpointInfo } from "./endpointInfo.d.ts";
+import type { SrvRefName } from "./types.d.ts";
 export interface Endpoint extends Adaptor {
 }
 export interface EndpointCls<SrvModule extends ServiceModel = ServiceModel, EndpointInfoObj extends {
@@ -9,7 +10,7 @@ export interface EndpointCls<SrvModule extends ServiceModel = ServiceModel, Endp
 } = {
     [key: string]: EndpointInfo;
 }> extends AdaptorCls {
-    baseName: SrvModule["srv"]["refName"];
+    baseName: SrvRefName<SrvModule>;
     srv: SrvModule;
     [ENDPOINT_META]: EndpointInfoObj;
 }

package/types/signal/endpointInfo.d.ts

@@ -2,7 +2,7 @@ import { type Dayjs, type EnumInstance, type PromiseOrObject } from "akanjs/base
 import type { ConstantFieldType, ConstantFieldTypeInput, DocumentModel, FieldToValue, ParamFieldType, PlainTypeToFieldType, PurifiedModel } from "akanjs/constant";
 import type { ServiceModel } from "akanjs/service";
 import type { InternalArgCls } from "./internalArg.d.ts";
-import type { ArgType, SignalOption } from "./types.d.ts";
+import type { ArgType, SignalOption, SrvMap } from "./types.d.ts";
 export type EndpointType = "query" | "mutation" | "pubsub" | "message";
 export interface EndpointArgProps<Optional extends boolean = false> {
     nullable?: Optional;
@@ -56,22 +56,47 @@ export declare class EndpointInfo<ReqType extends EndpointType = EndpointType, S
     getPath(key: string): string;
 }
 export type BuildEndpoint<SrvModule extends ServiceModel = ServiceModel> = {
-    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"query", SrvModule["srvMap"], [], [], [], [], Returns, never, never, Nullable>;
-    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"mutation", SrvModule["srvMap"], [], [], [], [], Returns, never, never, Nullable>;
-    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"pubsub", SrvModule["srvMap"], [], [], [], [], Returns, never, never, Nullable>;
-    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"message", SrvModule["srvMap"], [], [], [], [], Returns, never, never, Nullable>;
+    query: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"query", SrvMap<SrvModule>, [], [], [], [], Returns, never, never, Nullable>;
+    mutation: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"mutation", SrvMap<SrvModule>, [], [], [], [], Returns, never, never, Nullable>;
+    pubsub: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"pubsub", SrvMap<SrvModule>, [], [], [], [], Returns, never, never, Nullable>;
+    message: <Returns extends ConstantFieldTypeInput = ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => EndpointInfo<"message", SrvMap<SrvModule>, [], [], [], [], Returns, never, never, Nullable>;
 };
 export declare const buildEndpoint: BuildEndpoint<any>;
 export type EndpointBuilder<SrvModule extends ServiceModel = ServiceModel> = (builder: BuildEndpoint<SrvModule>) => {
     [key: string]: EndpointInfo;
 };
-export type EndpInfoReqType<E> = E extends EndpointInfo<infer T, any, any, any, any, any, any, any, any, any> ? T : never;
-export type EndpInfoSrvs<E> = E extends EndpointInfo<any, infer S, any, any, any, any, any, any, any, any> ? S : never;
-export type EndpInfoArgNames<E> = E extends EndpointInfo<any, any, infer N, any, any, any, any, any, any, any> ? N : never;
-export type EndpInfoArgs<E> = E extends EndpointInfo<any, any, any, infer A, any, any, any, any, any, any> ? A : never;
-export type EndpInfoInternalArgs<E> = E extends EndpointInfo<any, any, any, any, infer I, any, any, any, any, any> ? I : never;
-export type EndpInfoServerArgs<E> = E extends EndpointInfo<any, any, any, any, any, infer S, any, any, any, any> ? S : never;
-export type EndpInfoReturnRef<E> = E extends EndpointInfo<any, any, any, any, any, any, infer R, any, any, any> ? R : never;
-export type EndpInfoClientReturns<E> = E extends EndpointInfo<any, any, any, any, any, any, any, infer R, any, any> ? R : never;
-export type EndpInfoServerReturns<E> = E extends EndpointInfo<any, any, any, any, any, any, any, any, infer R, any> ? R : never;
-export type EndpInfoNullable<E> = E extends EndpointInfo<any, any, any, any, any, any, any, any, any, infer N> ? N : never;
+type EndpointInfoEmptyParts = {
+    reqType: never;
+    srvs: never;
+    argNames: never;
+    args: never;
+    internalArgs: never;
+    serverArgs: never;
+    returnRef: never;
+    clientReturns: never;
+    serverReturns: never;
+    nullable: never;
+};
+export type EndpointInfoParts<E> = E extends EndpointInfo<infer ReqType, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs, infer Returns, infer ClientReturns, infer ServerReturns, infer Nullable> ? {
+    reqType: ReqType;
+    srvs: Srvs;
+    argNames: ArgNames;
+    args: Args;
+    internalArgs: InternalArgs;
+    serverArgs: ServerArgs;
+    returnRef: Returns;
+    clientReturns: ClientReturns;
+    serverReturns: ServerReturns;
+    nullable: Nullable;
+} : EndpointInfoEmptyParts;
+export type EndpInfoReqType<E> = EndpointInfoParts<E>["reqType"];
+export type EndpInfoSrvs<E> = EndpointInfoParts<E>["srvs"];
+export type EndpInfoArgNames<E> = EndpointInfoParts<E>["argNames"];
+export type EndpInfoArgs<E> = EndpointInfoParts<E>["args"];
+export type EndpInfoInternalArgs<E> = EndpointInfoParts<E>["internalArgs"];
+export type EndpInfoServerArgs<E> = EndpointInfoParts<E>["serverArgs"];
+export type EndpInfoReturnRef<E> = EndpointInfoParts<E>["returnRef"];
+export type EndpInfoClientReturns<E> = EndpointInfoParts<E>["clientReturns"];
+export type EndpInfoServerReturns<E> = EndpointInfoParts<E>["serverReturns"];
+export type EndpInfoNullable<E> = EndpointInfoParts<E>["nullable"];
+export {};

package/types/signal/internal.d.ts

@@ -1,6 +1,7 @@
 import { INTERNAL_META, type MergeAllKeyOfObjects } from "akanjs/base";
 import { type Adaptor, type AdaptorCls, type QueueAdaptor, type ScheduleAdaptor, type ServiceModel } from "akanjs/service";
 import { type BuildInternal, type InternalBuilder, type InternalInfo } from "./internalInfo.d.ts";
+import type { SrvRefName } from "./types.d.ts";
 export interface Internal extends Adaptor {
     schedule: ScheduleAdaptor;
     queue: QueueAdaptor;
@@ -10,7 +11,7 @@ export type InternalCls<SrvModule extends ServiceModel = ServiceModel, InternalI
 } = {
     [key: string]: InternalInfo;
 }> = AdaptorCls & {
-    refName: SrvModule["srv"]["refName"];
+    refName: SrvRefName<SrvModule>;
     srv: SrvModule;
     [INTERNAL_META]: InternalInfoMap;
 };

package/types/signal/internalInfo.d.ts

@@ -3,7 +3,7 @@ import type { ConstantCls, ConstantField, ConstantFieldTypeInput, DocumentModel,
 import type { AkanJob, ServiceModel } from "akanjs/service";
 import { type ArgInfo, type InternalArgInfo, type ReturnInfo } from "./endpointInfo.d.ts";
 import type { InternalArgCls } from "./internalArg.d.ts";
-import type { SignalOption } from "./types.d.ts";
+import type { CnstOf, DbDoc, SignalOption, SrvMap } from "./types.d.ts";
 type InternalType = "resolveField" | "interval" | "cron" | "timeout" | "init" | "destroy" | "process";
 interface InternalArgProps<Nullable extends boolean = false> {
     nullable?: Nullable;
@@ -25,21 +25,55 @@ export declare class InternalInfo<ReqType extends InternalType = InternalType, S
     with<ArgType, Optional extends boolean = false>(argRef: InternalArgCls<ArgType>, option?: InternalArgProps<Optional>): InternalInfo<ReqType, Srvs, Args, [...InternalArgs, arg: NonNullable<ArgType> | (Optional extends true ? null : ReqType extends "resolveField" ? null : never)], DefaultArgs, Returns, ServerReturns, Nullable>;
     exec<ExecReturn extends ReqType extends "process" | "resolveField" ? PromiseOrObject<DocumentModel<FieldToValue<Returns>> | (Nullable extends true ? null : never)> : PromiseOrObject<void>>(execFn: (this: Srvs, ...args: [...Args, ...DefaultArgs, ...InternalArgs]) => ExecReturn): InternalInfo<ReqType, Srvs, Args, InternalArgs, DefaultArgs, Returns, ExecReturn, Nullable>;
 }
-export type BuildInternal<SrvModule extends ServiceModel, ParentDoc = SrvModule["db"]["_Doc"]> = {
-    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalInfo<"resolveField", SrvModule["srvMap"], [], [], [ParentDoc], Returns, never, Nullable>;
-    interval: <Nullable extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"interval", SrvModule["srvMap"], [], [], [], typeof Any, never, Nullable>;
-    cron: <Nullable extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"cron", SrvModule["srvMap"], [], [], [], typeof Any, never, Nullable>;
-    timeout: <Nullable extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"timeout", SrvModule["srvMap"], [], [], [], typeof Any, never, Nullable>;
-    initialize: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"init", SrvModule["srvMap"], [], [], [], typeof Any, never, Nullable>;
-    destroy: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"destroy", SrvModule["srvMap"], [], [], [], typeof Any, never, Nullable>;
-    process: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => InternalInfo<"process", SrvModule["srvMap"], [], [], [AkanJob], Returns, never, Nullable>;
+type InternalInfoEmptyParts = {
+    reqType: never;
+    srvs: never;
+    args: never;
+    internalArgs: never;
+    defaultArgs: never;
+    returns: never;
+    serverReturns: never;
+    nullable: never;
 };
-export type InternalBuilder<SrvModule extends ServiceModel, _FullCls extends ConstantCls = SrvModule["cnst"]["full"], _FieldObj extends FieldObject = _FullCls[typeof FIELD_META], _ResolveFieldObj extends FieldObject = {
+export type InternalInfoParts<I> = I extends InternalInfo<infer ReqType, infer Srvs, infer Args, infer InternalArgs, infer DefaultArgs, infer Returns, infer ServerReturns, infer Nullable> ? {
+    reqType: ReqType;
+    srvs: Srvs;
+    args: Args;
+    internalArgs: InternalArgs;
+    defaultArgs: DefaultArgs;
+    returns: Returns;
+    serverReturns: ServerReturns;
+    nullable: Nullable;
+} : InternalInfoEmptyParts;
+export type InternalInfoReqType<I> = InternalInfoParts<I>["reqType"];
+export type InternalInfoSrvs<I> = InternalInfoParts<I>["srvs"];
+export type InternalInfoServerArgs<I> = InternalInfoParts<I>["args"];
+export type InternalInfoInternalArgs<I> = InternalInfoParts<I>["internalArgs"];
+export type InternalInfoDefaultArgs<I> = InternalInfoParts<I>["defaultArgs"];
+export type InternalInfoReturns<I> = InternalInfoParts<I>["returns"];
+export type InternalInfoServerReturns<I> = InternalInfoParts<I>["serverReturns"];
+export type InternalInfoNullable<I> = InternalInfoParts<I>["nullable"];
+export type BuildInternal<SrvModule extends ServiceModel, ParentDoc = DbDoc<SrvModule>> = {
+    resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">) => InternalInfo<"resolveField", SrvMap<SrvModule>, [], [], [ParentDoc], Returns, never, Nullable>;
+    interval: <Nullable extends boolean = false>(scheduleTime: number, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"interval", SrvMap<SrvModule>, [], [], [], typeof Any, never, Nullable>;
+    cron: <Nullable extends boolean = false>(scheduleCron: string, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"cron", SrvMap<SrvModule>, [], [], [], typeof Any, never, Nullable>;
+    timeout: <Nullable extends boolean = false>(timeout: number, signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"timeout", SrvMap<SrvModule>, [], [], [], typeof Any, never, Nullable>;
+    initialize: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"init", SrvMap<SrvModule>, [], [], [], typeof Any, never, Nullable>;
+    destroy: <Nullable extends boolean = false>(signalOption?: SignalOption<typeof Any, Nullable>) => InternalInfo<"destroy", SrvMap<SrvModule>, [], [], [], typeof Any, never, Nullable>;
+    process: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(returnRef: Returns, signalOption?: SignalOption<Returns, Nullable>) => InternalInfo<"process", SrvMap<SrvModule>, [], [], [AkanJob], Returns, never, Nullable>;
+};
+export type InternalBuilder<SrvModule extends ServiceModel, _Cnst = CnstOf<SrvModule>, _FullCls extends ConstantCls = [_Cnst] extends [never] ? never : _Cnst extends {
+    full: infer Full extends ConstantCls;
+} ? Full : never, _FieldObj extends FieldObject = _FullCls[typeof FIELD_META], _ResolveFieldObj extends FieldObject = {
     [K in keyof _FieldObj as _FieldObj[K] extends ConstantField<"resolve", any, any, any, any, any> ? K : never]: _FieldObj[K];
-}> = (builder: BuildInternal<SrvModule>) => SrvModule["cnst"] extends never ? {
-    [key: string]: InternalInfo<Exclude<InternalType, "resolveField">>;
+}> = (builder: BuildInternal<SrvModule>) => [_Cnst] extends [never] ? {
+    [key: string]: InternalInfo<InternalType>;
+} : [_FullCls] extends [never] ? {
+    [key: string]: InternalInfo<InternalType>;
 } : {
     [K in keyof _ResolveFieldObj]: _ResolveFieldObj[K] extends ConstantField<"resolve", infer Value, any, any, infer Nullable> ? InternalInfo<"resolveField", any, any, any, any, NonNullable<Value>, Nullable> : InternalInfo<Exclude<InternalType, "resolveField">>;
+} & {
+    [key: string]: InternalInfo<InternalType>;
 };
 export declare const buildInternal: BuildInternal<any, any>;
 export {};

package/types/signal/serverSignal.d.ts

@@ -2,23 +2,24 @@ import { ENDPOINT_META, INJECT_META, INTERNAL_META } from "akanjs/base";
 import type { DocumentModel } from "akanjs/constant";
 import { type Adaptor, type AdaptorCls, type AkanJob, type AkanJobOptions, type QueueAdaptor } from "akanjs/service";
 import type { ServerWebSocket } from "bun";
-import type { EndpointInfo } from "./endpointInfo.d.ts";
-import type { InternalInfo } from "./internalInfo.d.ts";
+import type { EndpInfoClientReturns, EndpInfoReqType, EndpInfoServerArgs, EndpointInfo } from "./endpointInfo.d.ts";
+import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs } from "./internalInfo.d.ts";
+type EndpointPubsubPayload<E> = EndpInfoClientReturns<E> | DocumentModel<EndpInfoClientReturns<E>>;
 export interface ServerSignal extends Adaptor {
     readonly websocket: ServerWebSocket;
     readonly queue: QueueAdaptor;
 }
-type EndpointServerSignalMethods<EnpCls> = EnpCls extends {
+type EndpointServerSignalMethods<EnpCls> = [EnpCls] extends [{
     [ENDPOINT_META]: infer EndpointInfoObj;
-} ? {
-    [K in keyof EndpointInfoObj as EndpointInfoObj[K] extends EndpointInfo<"pubsub", any, any, any, any, any, any, any, any> ? K : never]: EndpointInfoObj[K] extends EndpointInfo<any, any, any, any, any, infer ServerArgs, any, infer ClientReturns, any, any> ? (...args: [...ServerArgs, data: DocumentModel<ClientReturns>]) => void : never;
-} : never;
-type InternalServerSignalMethods<IntCls> = IntCls extends {
+}] ? {
+    [K in keyof EndpointInfoObj as EndpInfoReqType<EndpointInfoObj[K]> extends "pubsub" ? K : never]: (...args: [...EndpInfoServerArgs<EndpointInfoObj[K]>, data: EndpointPubsubPayload<EndpointInfoObj[K]>]) => void;
+} : Record<never, never>;
+type InternalServerSignalMethods<IntCls> = [IntCls] extends [{
     [INTERNAL_META]: infer InternalInfoObj;
-} ? {
-    [K in keyof InternalInfoObj as InternalInfoObj[K] extends InternalInfo<"process", any, any, any, any, any, any, any> ? K : never]: InternalInfoObj[K] extends InternalInfo<any, any, infer ServerArgs, any, any, any, infer ServerReturns> ? (...args: [...args: ServerArgs, jobOptions?: AkanJobOptions]) => Promise<AkanJob<any, ServerReturns>> : never;
-} : never;
-type ServerSignalClsStatics = {
+}] ? {
+    [K in keyof InternalInfoObj as InternalInfoReqType<InternalInfoObj[K]> extends "process" ? K : never]: (...args: [...args: InternalInfoServerArgs<InternalInfoObj[K]>, jobOptions?: AkanJobOptions]) => Promise<AkanJob<unknown, unknown>>;
+} : Record<never, never>;
+export type ServerSignalClsStatics = {
     readonly refName: string;
     readonly [INJECT_META]: {
         queue: QueueAdaptor;
@@ -30,7 +31,9 @@ type ServerSignalClsStatics = {
         [key: string]: InternalInfo;
     };
 };
-export type ServerSignalCls<EnpCls = any, IntCls = any> = AdaptorCls<EndpointServerSignalMethods<EnpCls> & InternalServerSignalMethods<IntCls> & ServerSignal> & ServerSignalClsStatics;
+export type ServerSignalMethods<EnpCls, IntCls> = EndpointServerSignalMethods<EnpCls> & InternalServerSignalMethods<IntCls>;
+export type TypedServerSignalCls<EnpCls, IntCls> = AdaptorCls<ServerSignalMethods<EnpCls, IntCls> & ServerSignal> & ServerSignalClsStatics;
+export type ServerSignalCls<EnpCls = unknown, IntCls = unknown> = AdaptorCls<ServerSignalMethods<EnpCls, IntCls> & ServerSignal> & ServerSignalClsStatics;
 /** Composes endpoint and internal classes into a server-side signal class. */
 export declare const serverSignal: <EnpCls, IntCls>(endpointRef: EnpCls, internalRef: IntCls) => ServerSignalCls<EnpCls, IntCls>;
 export {};

package/types/signal/slice.d.ts

@@ -3,7 +3,8 @@ import type { DocumentModel, QueryOf } from "akanjs/constant";
 import type { FilterInstance } from "akanjs/document";
 import { type Adaptor, type AdaptorCls, type ServiceModel } from "akanjs/service";
 import type { Guard, GuardCls } from "./guard.d.ts";
-import { type SliceBuilder, type SliceInfo } from "./sliceInfo.d.ts";
+import { type SliceBuilder, type SliceInfo, type SliceInfoArgNames, type SliceInfoArgs, type SliceInfoInternalArgs, type SliceInfoServerArgs, type SliceInfoSrvs } from "./sliceInfo.d.ts";
+import type { CnstFull, CnstInput, CnstInsight, CnstLight, DbFilter, SrvMap, SrvRefName } from "./types.d.ts";
 export interface Slice extends Adaptor {
 }
 export type SliceCls<SrvModule extends ServiceModel = ServiceModel, SliceInfoObj extends {
@@ -11,7 +12,7 @@ export type SliceCls<SrvModule extends ServiceModel = ServiceModel, SliceInfoObj
 } = {
     [key: string]: SliceInfo;
 }> = AdaptorCls & {
-    baseName: SrvModule["srv"]["refName"];
+    baseName: SrvRefName<SrvModule>;
     srv: SrvModule;
     [SLICE_META]: SliceInfoObj;
     getGuards: GuardCls[];
@@ -25,12 +26,13 @@ interface RootSliceOption {
     };
     prefix?: string;
 }
-type ExtendSliceInfoObj<SrvModule extends ServiceModel, LibSlices extends SliceCls[], _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = any, _Merged = MergeAllKeyOfObjects<LibSlices, typeof SLICE_META>> = {
-    [K in keyof _Merged]: _Merged[K] extends SliceInfo<any, any, any, any, any, any, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs> ? SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, Srvs, ArgNames, Args, InternalArgs, ServerArgs> : never;
+type RootSliceQuery<SrvModule extends ServiceModel, Full = CnstFull<SrvModule>> = QueryOf<DocumentModel<Full>>;
+type ExtendSliceInfoObj<SrvModule extends ServiceModel, LibSlices extends SliceCls[], _Input = CnstInput<SrvModule>, _Full = CnstFull<SrvModule>, _Light = CnstLight<SrvModule>, _Insight = CnstInsight<SrvModule>, _Filter extends FilterInstance = DbFilter<SrvModule>, _Merged = MergeAllKeyOfObjects<LibSlices, typeof SLICE_META>> = {
+    [K in keyof _Merged]: _Merged[K] extends SliceInfo ? SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SliceInfoSrvs<_Merged[K]>, SliceInfoArgNames<_Merged[K]>, SliceInfoArgs<_Merged[K]>, SliceInfoInternalArgs<_Merged[K]>, SliceInfoServerArgs<_Merged[K]>> : never;
 };
 /** Builds database-backed slice APIs for list, insight, init, view, edit, create, update, and remove flows. */
-export declare function slice<SrvModule extends ServiceModel, BuildSlice extends SliceBuilder<SrvModule>, LibSlices extends SliceCls[], _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"], _Query = QueryOf<DocumentModel<_Full>>>(srv: SrvModule, option: RootSliceOption, sliceBuilder: BuildSlice, ...libSlices: LibSlices): SliceCls<SrvModule, Assign<ReturnType<BuildSlice>, LibSlices extends [] ? {
-    [""]: SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"], [
+export declare function slice<SrvModule extends ServiceModel, BuildSlice extends SliceBuilder<SrvModule>, LibSlices extends SliceCls[], _Input = CnstInput<SrvModule>, _Full = CnstFull<SrvModule>, _Light = CnstLight<SrvModule>, _Insight = CnstInsight<SrvModule>, _Filter extends FilterInstance = DbFilter<SrvModule>, _Query = RootSliceQuery<SrvModule, _Full>>(srv: SrvModule, option: RootSliceOption, sliceBuilder: BuildSlice, ...libSlices: LibSlices): SliceCls<SrvModule, Assign<ReturnType<BuildSlice>, LibSlices extends [] ? {
+    [""]: SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>, [
         "query"
     ], [
         _Query

package/types/signal/sliceInfo.d.ts

@@ -1,10 +1,10 @@
 import type { Cls, PromiseOrObject } from "akanjs/base";
 import type { BaseInsight, BaseObject, ConstantFieldTypeInput, DocumentModel, FieldToValue, ParamFieldType, PlainTypeToFieldType, PurifiedModel, QueryOf } from "akanjs/constant";
-import type { ExtractSort, FilterCls, FilterInstance } from "akanjs/document";
+import type { FilterCls, FilterInstance } from "akanjs/document";
 import type { ServiceModel } from "akanjs/service";
 import { type ArgInfo, type EndpointArgProps, type InternalArgInfo, type InternalArgProps } from "./endpointInfo.d.ts";
 import type { InternalArgCls } from "./internalArg.d.ts";
-import type { SignalOption } from "./types.d.ts";
+import type { CnstFull, CnstInput, CnstInsight, CnstLight, DbFilter, SignalOption, SrvMap, SrvRefName } from "./types.d.ts";
 export declare class SliceInfo<RefName extends string = string, Input = any, Full = any, Light = any, Insight = any, Filter extends FilterInstance = any, Srvs extends {
     [key: string]: any;
 } = {
@@ -30,22 +30,43 @@ export declare class SliceInfo<RefName extends string = string, Input = any, Ful
         [K in keyof Srvs as K extends string ? Uncapitalize<K> : never]: Srvs[K];
     }, ...args: [...ServerArgs, ...InternalArgs]) => PromiseOrObject<QueryOf<DocumentModel<Full>>>): this;
 }
-export declare const buildSlice: <T extends string, Input extends Cls<any>, Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Filter extends FilterInstance, SrvModule extends ServiceModel>(refName: T, input: Cls<Input>, full: Cls<Full>, light: Cls<Light>, insight: Cls<Insight>, filter: FilterCls<Filter>) => (signalOption?: SignalOption) => SliceInfo<T, Input, Full, Light, Insight, Filter, SrvModule["srvMap"], [], [], [], []>;
-export type SliceInfoRefName<S> = S extends SliceInfo<infer R, any, any, any, any, any, any, any, any, any, any> ? R : never;
-export type SliceInfoInput<S> = S extends SliceInfo<any, infer I, any, any, any, any, any, any, any, any, any> ? I : never;
-export type SliceInfoFull<S> = S extends SliceInfo<any, any, infer F, any, any, any, any, any, any, any, any> ? F : never;
-export type SliceInfoLight<S> = S extends SliceInfo<any, any, any, infer L, any, any, any, any, any, any, any> ? L : never;
-export type SliceInfoInsight<S> = S extends SliceInfo<any, any, any, any, infer I, any, any, any, any, any, any> ? I : never;
-export type SliceInfoFilter<S> = S extends SliceInfo<any, any, any, any, any, infer F, any, any, any, any, any> ? F : never;
-export type SliceInfoSrvs<S> = S extends SliceInfo<any, any, any, any, any, any, infer S2, any, any, any, any> ? S2 : never;
-export type SliceInfoArgNames<S> = S extends SliceInfo<any, any, any, any, any, any, any, infer N, any, any, any> ? N : never;
-export type SliceInfoArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, infer A, any, any> ? A : never;
-export type SliceInfoInternalArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, any, infer I, any> ? I : never;
-export type SliceInfoServerArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, any, any, infer S2> ? S2 : never;
-export type SliceBuilder<SrvModule extends ServiceModel, _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"], _Sort = ExtractSort<_Filter>> = (init: (signalOption?: SignalOption) => SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"], [
-], [
-], [
-], [
-]>) => {
-    [key: string]: SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"]>;
+export declare const buildSlice: <T extends string, Input extends Cls<any>, Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Filter extends FilterInstance, SrvModule extends ServiceModel>(refName: T, input: Cls<Input>, full: Cls<Full>, light: Cls<Light>, insight: Cls<Insight>, filter: FilterCls<Filter>) => (signalOption?: SignalOption) => SliceInfo<T, Input, Full, Light, Insight, Filter, SrvMap<SrvModule>, [], [], [], []>;
+type SliceInfoEmptyParts = {
+    refName: never;
+    input: never;
+    full: never;
+    light: never;
+    insight: never;
+    filter: never;
+    srvs: never;
+    argNames: never;
+    args: never;
+    internalArgs: never;
+    serverArgs: never;
 };
+export type SliceInfoParts<S> = S extends SliceInfo<infer RefName, infer Input, infer Full, infer Light, infer Insight, infer Filter, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs> ? {
+    refName: RefName;
+    input: Input;
+    full: Full;
+    light: Light;
+    insight: Insight;
+    filter: Filter;
+    srvs: Srvs;
+    argNames: ArgNames;
+    args: Args;
+    internalArgs: InternalArgs;
+    serverArgs: ServerArgs;
+} : SliceInfoEmptyParts;
+export type SliceInfoRefName<S> = SliceInfoParts<S>["refName"];
+export type SliceInfoInput<S> = SliceInfoParts<S>["input"];
+export type SliceInfoFull<S> = SliceInfoParts<S>["full"];
+export type SliceInfoLight<S> = SliceInfoParts<S>["light"];
+export type SliceInfoInsight<S> = SliceInfoParts<S>["insight"];
+export type SliceInfoFilter<S> = SliceInfoParts<S>["filter"];
+export type SliceInfoSrvs<S> = SliceInfoParts<S>["srvs"];
+export type SliceInfoArgNames<S> = SliceInfoParts<S>["argNames"];
+export type SliceInfoArgs<S> = SliceInfoParts<S>["args"];
+export type SliceInfoInternalArgs<S> = SliceInfoParts<S>["internalArgs"];
+export type SliceInfoServerArgs<S> = SliceInfoParts<S>["serverArgs"];
+export type SliceBuilder<SrvModule extends ServiceModel, _Input = CnstInput<SrvModule>, _Full = CnstFull<SrvModule>, _Light = CnstLight<SrvModule>, _Insight = CnstInsight<SrvModule>, _Filter extends FilterInstance = DbFilter<SrvModule>, _SliceInfo = SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>>> = (init: (signalOption?: SignalOption) => SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>, [], [], [], []>) => Record<string, _SliceInfo>;
+export {};

package/types/signal/types.d.ts

@@ -5,11 +5,14 @@ import type { MiddlewareCls } from "./middleware.d.ts";
 import type { SliceCls } from "./slice.d.ts";
 export type CnstOf<S extends ServiceModel> = NonNullable<S["cnst"]>;
 export type DbOf<S extends ServiceModel> = NonNullable<S["db"]>;
+export type SrvOf<S extends ServiceModel> = S["srv"];
+export type SrvRefName<S extends ServiceModel> = SrvOf<S>["refName"];
+export type SrvMap<S extends ServiceModel> = S["srvMap"];
 export type CnstRefName<S extends ServiceModel> = CnstOf<S>["refName"];
 export type CnstInput<S extends ServiceModel> = CnstOf<S>["_Input"];
-export type CnstFull<S extends ServiceModel> = CnstOf<S>["_Full"];
-export type CnstLight<S extends ServiceModel> = CnstOf<S>["_Light"];
-export type CnstInsight<S extends ServiceModel> = CnstOf<S>["_Insight"];
+export type CnstFull<S extends ServiceModel> = UnCls<CnstOf<S>["full"]> & CnstOf<S>["_Full"];
+export type CnstLight<S extends ServiceModel> = UnCls<CnstOf<S>["light"]> & CnstOf<S>["_Light"];
+export type CnstInsight<S extends ServiceModel> = UnCls<CnstOf<S>["insight"]> & CnstOf<S>["_Insight"];
 export type CnstDefault<S extends ServiceModel> = CnstOf<S>["_Default"];
 export type CnstDefaultInput<S extends ServiceModel> = CnstOf<S>["_DefaultInput"];
 export type CnstDefaultState<S extends ServiceModel> = CnstOf<S>["_DefaultState"];
@@ -18,22 +21,25 @@ export type CnstStateInsight<S extends ServiceModel> = CnstOf<S>["_StateInsight"
 export type CnstPurifiedInput<S extends ServiceModel> = CnstOf<S>["_PurifiedInput"];
 export type CnstCapitalizedRefName<S extends ServiceModel> = CnstOf<S>["_CapitalizedRefName"];
 export type DbFilter<S extends ServiceModel> = DbOf<S>["_Filter"];
+export type DbDoc<S extends ServiceModel> = DbOf<S>["_Doc"];
+export type DbQuery<S extends ServiceModel> = DbOf<S>["_Query"];
 export type DbSort<S extends ServiceModel> = DbOf<S>["_Sort"];
 export type SlceSrv<S extends SliceCls> = S["srv"];
-export type SlceCnstRefName<S extends SliceCls> = S["srv"]["cnst"]["refName"];
-export type SlceCnstInput<S extends SliceCls> = S["srv"]["cnst"]["_Input"];
-export type SlceCnstFull<S extends SliceCls> = S["srv"]["cnst"]["_Full"];
-export type SlceCnstLight<S extends SliceCls> = S["srv"]["cnst"]["_Light"];
-export type SlceCnstInsight<S extends SliceCls> = S["srv"]["cnst"]["_Insight"];
-export type SlceCnstDefault<S extends SliceCls> = S["srv"]["cnst"]["_Default"];
-export type SlceCnstDefaultInput<S extends SliceCls> = S["srv"]["cnst"]["_DefaultInput"];
-export type SlceCnstDefaultState<S extends SliceCls> = S["srv"]["cnst"]["_DefaultState"];
-export type SlceCnstPurifiedInput<S extends SliceCls> = S["srv"]["cnst"]["_PurifiedInput"];
-export type SlceCnstCapitalizedRefName<S extends SliceCls> = S["srv"]["cnst"]["_CapitalizedRefName"];
-export type SlceCnstStateLight<S extends SliceCls> = S["srv"]["cnst"]["_StateLight"];
-export type SlceCnstStateInsight<S extends SliceCls> = S["srv"]["cnst"]["_StateInsight"];
-export type SlceDbFilter<S extends SliceCls> = S["srv"]["db"]["_Filter"];
-export type SlceDbSort<S extends SliceCls> = S["srv"]["db"]["_Sort"];
+export type SlceCnstRefName<S extends SliceCls> = CnstRefName<SlceSrv<S>>;
+export type SlceCnstInput<S extends SliceCls> = CnstInput<SlceSrv<S>>;
+export type SlceCnstFull<S extends SliceCls> = CnstFull<SlceSrv<S>>;
+export type SlceCnstLight<S extends SliceCls> = CnstLight<SlceSrv<S>>;
+export type SlceCnstInsight<S extends SliceCls> = CnstInsight<SlceSrv<S>>;
+export type SlceCnstDefault<S extends SliceCls> = CnstDefault<SlceSrv<S>>;
+export type SlceCnstDefaultInput<S extends SliceCls> = CnstDefaultInput<SlceSrv<S>>;
+export type SlceCnstDefaultState<S extends SliceCls> = CnstDefaultState<SlceSrv<S>>;
+export type SlceCnstPurifiedInput<S extends SliceCls> = CnstPurifiedInput<SlceSrv<S>>;
+export type SlceCnstCapitalizedRefName<S extends SliceCls> = CnstCapitalizedRefName<SlceSrv<S>>;
+export type SlceCnstStateLight<S extends SliceCls> = CnstStateLight<SlceSrv<S>>;
+export type SlceCnstStateInsight<S extends SliceCls> = CnstStateInsight<SlceSrv<S>>;
+export type SlceDbFilter<S extends SliceCls> = DbFilter<SlceSrv<S>>;
+export type SlceDbQuery<S extends SliceCls> = DbQuery<SlceSrv<S>>;
+export type SlceDbSort<S extends SliceCls> = DbSort<SlceSrv<S>>;
 export declare const argTypes: readonly ["body", "param", "search", "upload", "msg", "room"];
 export type ArgType = (typeof argTypes)[number];
 interface InitOption {

package/types/store/action.d.ts

@@ -1,10 +1,20 @@
-import { type GetStateObject, type SLICE_META } from "akanjs/base";
+import { type GetStateObject } from "akanjs/base";
 import { type FetchPolicy } from "akanjs/common";
 import { type DefaultOf, type FieldState, type ProtoFile } from "akanjs/constant";
 import type { ExtractSort, FilterInstance } from "akanjs/document";
 import type { FetchInitForm, FetchProxy } from "akanjs/fetch";
-import type { SerializedSlice, SliceCls, SliceInfoArgs } from "akanjs/signal";
-import type { SetGet } from "./types.d.ts";
+import type { SerializedSlice, SlceCnstCapitalizedRefName, SlceCnstDefault, SlceCnstDefaultInput, SlceCnstFull, SlceCnstInput, SlceCnstLight, SlceCnstRefName, SlceDbFilter, SlceDbSort, SliceCls } from "akanjs/signal";
+import type { SetGet, StoreSliceArgs, StoreSliceMap, StoreSliceSuffixCap } from "./types.d.ts";
+type _SliceMap<S extends SliceCls> = StoreSliceMap<S>;
+type _ActionRefName<S extends SliceCls> = SlceCnstRefName<S>;
+type _ActionCap<S extends SliceCls> = SlceCnstCapitalizedRefName<S>;
+type _ActionInput<S extends SliceCls> = SlceCnstInput<S>;
+type _ActionFull<S extends SliceCls> = SlceCnstFull<S>;
+type _ActionLight<S extends SliceCls> = SlceCnstLight<S>;
+type _ActionDefault<S extends SliceCls> = SlceCnstDefault<S>;
+type _ActionDefaultInput<S extends SliceCls> = SlceCnstDefaultInput<S>;
+type _ActionFilter<S extends SliceCls> = SlceDbFilter<S>;
+type _ActionSort<S extends SliceCls> = SlceDbSort<S>;
 export interface CreateOption<Full extends {
     id: string;
 }> {
@@ -105,37 +115,30 @@ type FormSetter<Full, RefName extends string, _CapitalizedRefName extends string
 } & {
     [K in `writeOn${_CapitalizedRefName}`]: (path: string | (string | number)[], value: any) => void;
 };
-type _SliceActionMap<SlceCls extends SliceCls> = SlceCls[typeof SLICE_META];
-type _ActSuffixCap<SlceCls extends SliceCls, Suffix extends keyof _SliceActionMap<SlceCls>> = Capitalize<Suffix & string>;
-type _ActArgs<SlceCls extends SliceCls, Suffix extends keyof _SliceActionMap<SlceCls>> = SliceInfoArgs<_SliceActionMap<SlceCls>[Suffix]>;
-type DefaultSliceActionFields<SlceCls extends SliceCls, _CapRef extends string, _FetchInitFormWithFetchPolicy, _Light, _Sort> = {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `init${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (...args: [...args: _ActArgs<SlceCls, Suffix>, initForm?: _FetchInitFormWithFetchPolicy]) => Promise<void>;
-} & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `refresh${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (initForm?: _FetchInitFormWithFetchPolicy & {
-        queryArgs?: _ActArgs<SlceCls, Suffix>;
+type DefaultSliceActionFields<SlceCls extends SliceCls, _CapRef extends string, _FetchInitFormWithFetchPolicy, _Light, _Sort, _Suffixes extends keyof _SliceMap<SlceCls> = keyof _SliceMap<SlceCls>> = {
+    [Suffix in _Suffixes as `init${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (...args: [...args: StoreSliceArgs<SlceCls, Suffix>, initForm?: _FetchInitFormWithFetchPolicy]) => Promise<void>;
+} & {
+    [Suffix in _Suffixes as `refresh${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (initForm?: _FetchInitFormWithFetchPolicy & {
+        queryArgs?: StoreSliceArgs<SlceCls, Suffix>;
     }) => Promise<void>;
 } & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `select${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (model: _Light | _Light[], options?: {
+    [Suffix in _Suffixes as `select${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (model: _Light | _Light[], options?: {
         refresh?: boolean;
         remove?: boolean;
     }) => void;
 } & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `setPageOf${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (page: number, options?: FetchPolicy) => Promise<void>;
-} & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `addPageOf${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (page: number, options?: FetchPolicy) => Promise<void>;
-} & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `setLimitOf${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (limit: number, options?: FetchPolicy) => Promise<void>;
+    [Suffix in _Suffixes as `setPageOf${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}` | `addPageOf${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}` | `setLimitOf${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (value: number, options?: FetchPolicy) => Promise<void>;
 } & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `setQueryArgsOf${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (...args: [...args: _ActArgs<SlceCls, Suffix>, options?: FetchPolicy] | [
-        setQueryArgs: (...prevQueryArgs: _ActArgs<SlceCls, Suffix>) => _ActArgs<SlceCls, Suffix>,
+    [Suffix in _Suffixes as `setQueryArgsOf${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (...args: [...args: StoreSliceArgs<SlceCls, Suffix>, options?: FetchPolicy] | [
+        setQueryArgs: (...prevQueryArgs: StoreSliceArgs<SlceCls, Suffix>) => StoreSliceArgs<SlceCls, Suffix>,
         options?: FetchPolicy
     ]) => Promise<void>;
 } & {
-    [Suffix in keyof _SliceActionMap<SlceCls> as `setSortOf${_CapRef}${_ActSuffixCap<SlceCls, Suffix>}`]: (sort: _Sort, options?: FetchPolicy) => Promise<void>;
+    [Suffix in _Suffixes as `setSortOf${_CapRef}${StoreSliceSuffixCap<SlceCls, Suffix>}`]: (sort: _Sort, options?: FetchPolicy) => Promise<void>;
 };
-export type DefaultAction<SlceCls extends SliceCls, _RefName extends string = SlceCls["srv"]["cnst"]["refName"], _Input = SlceCls["srv"]["cnst"]["_Input"], _Full extends {
+export type DefaultAction<SlceCls extends SliceCls, _RefName extends string = _ActionRefName<SlceCls>, _Input = _ActionInput<SlceCls>, _Full extends {
     id: string;
-} = SlceCls["srv"]["cnst"]["_Full"], _Light = SlceCls["srv"]["cnst"]["_Light"], _Filter extends FilterInstance = SlceCls["srv"]["db"]["_Filter"], _CapitalizedRefName extends string = Capitalize<_RefName>, _Default = SlceCls["srv"]["cnst"]["_Default"], _DefaultInput = SlceCls["srv"]["cnst"]["_DefaultInput"], _Sort = SlceCls["srv"]["db"]["_Sort"], _CreateOption = CreateOption<_Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<_Input, _Filter, _DefaultInput, _Sort> & FetchPolicy> = BaseAction<_RefName, _Input, _Full, _Light, _CapitalizedRefName, _CreateOption> & FormSetter<_Full, _RefName, _CapitalizedRefName, _Default> & DefaultSliceActionFields<SlceCls, _CapitalizedRefName, _FetchInitFormWithFetchPolicy, _Light, _Sort>;
+} = _ActionFull<SlceCls>, _Light = _ActionLight<SlceCls>, _Filter extends FilterInstance = _ActionFilter<SlceCls>, _CapitalizedRefName extends string = _ActionCap<SlceCls>, _Default = _ActionDefault<SlceCls>, _DefaultInput = _ActionDefaultInput<SlceCls>, _Sort = _ActionSort<SlceCls>, _CreateOption = CreateOption<_Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<_Input, _Filter, _DefaultInput, _Sort> & FetchPolicy> = BaseAction<_RefName, _Input, _Full, _Light, _CapitalizedRefName, _CreateOption> & FormSetter<_Full, _RefName, _CapitalizedRefName, _Default> & DefaultSliceActionFields<SlceCls, _CapitalizedRefName, _FetchInitFormWithFetchPolicy, _Light, _Sort>;
 export declare const makeFormSetter: (refName: string, fetch: FetchProxy<any>) => {
     [x: string]: (this: SetGet, path: string | (string | number)[], value: any) => void;
 };