akanjs 2.3.5-rc.12 → 2.3.5-rc.13

package/constant/via.ts

@@ -239,8 +239,13 @@ const makeBaseScalar = <FieldMap extends FieldInfoObject>(
   >;
 };
 
+type ConstantSetReturn<Self, Schema> = Self extends Schema & ConstantMethods<Schema> & infer Model
+  ? unknown extends Model
+    ? Self
+    : Model
+  : Self;
 export interface ConstantMethods<Schema = any> {
-  set: (obj: Partial<Schema>) => this;
+  set<Self extends Schema & ConstantMethods<Schema>>(this: Self, obj: Partial<Schema>): ConstantSetReturn<Self, Schema>;
 }
 
 type DatabaseSchemaOf<Schema, HiddenKey> = {

package/dictionary/dictInfo.ts

@@ -1,12 +1,22 @@
 import type { GetStateObject } from "akanjs/base";
 import { capitalize } from "akanjs/common";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { BaseFilterQueryKey, BaseFilterSortKey, FilterInfo, FilterInstance } from "akanjs/document";
+import type { BaseFilterQueryKey, BaseFilterSortKey, FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
 import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames } from "akanjs/signal";
 import type { DictionaryNode, RootDictionary } from "./trans";
 
 type MutableDictionaryNode = DictionaryNode & { t?: string; desc?: DictionaryNode };
 type EnumValueKey = string | number;
+type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictFilterShape<Filter> = Filter extends FilterInstance
+  ? Filter
+  : Filter extends FilterCls<infer FilterShape>
+    ? FilterShape
+    : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+      ? Filter
+      : AnyFilterShape;
+type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
+type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 
 const ensureNode = (target: DictionaryNode, key: string): MutableDictionaryNode => {
   target[key] ??= {};
@@ -250,24 +260,27 @@ export class ModelDictInfo<
       EtcKey
     >;
   }
-  query<Filter extends FilterInstance>(
+  query<Filter>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<keyof Filter["query"], QueryKey>]: Filter["query"][K] extends FilterInfo<infer ArgNames, any>
+      [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<
+        infer ArgNames,
+        any
+      >
         ? FunctionTranslation<Languages, ArgNames[number]>
         : never;
     },
   ) {
     Object.assign(this.queryDictionary, translate(fn), ModelDictInfo.baseQueryDictionary) as unknown as {
-      [K in keyof Filter["query"]]: FunctionTranslation<
+      [K in keyof DictFilterQuery<Filter>]: FunctionTranslation<
         Languages,
-        Filter["query"][K] extends FilterInfo<infer ArgNames, any> ? ArgNames[number] : never
+        DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any> ? ArgNames[number] : never
       >;
     };
     return this as unknown as ModelDictInfo<
       Languages,
       ModelKey,
       InsightKey,
-      keyof Filter["query"] & string,
+      keyof DictFilterQuery<Filter> & string,
       SortKey,
       EnumKey,
       BaseSignalKey,
@@ -277,9 +290,9 @@ export class ModelDictInfo<
       EtcKey
     >;
   }
-  sort<Filter extends FilterInstance>(
+  sort<Filter>(
     translate: (t: (trans: Languages) => FieldTranslation<Languages>) => {
-      [K in Exclude<keyof Filter["sort"], SortKey>]: FieldTranslation<Languages>;
+      [K in Exclude<keyof DictFilterSort<Filter>, SortKey>]: FieldTranslation<Languages>;
     },
   ) {
     Object.assign(
@@ -292,7 +305,7 @@ export class ModelDictInfo<
       ModelKey,
       InsightKey,
       QueryKey,
-      keyof Filter["sort"] & string,
+      keyof DictFilterSort<Filter> & string,
       EnumKey,
       BaseSignalKey,
       SliceKey,

package/dictionary/locale.ts

@@ -1,6 +1,6 @@
 import type { GetStateObject, MergedValues } from "akanjs/base";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { FilterInfo, FilterInstance } from "akanjs/document";
+import type { FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
 import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames, SliceInfoRefName } from "akanjs/signal";
 import type { ModelDictInfo, ScalarDictInfo, ServiceDictInfo } from ".";
 
@@ -16,16 +16,26 @@ interface FnTrans<ArgKey extends string> {
   desc?: string;
   arg?: { [key in ArgKey]: FieldTrans };
 }
-type FilterTranslatorKey<Filter extends FilterInstance> = {
-  [Key in keyof Filter["query"] & string]:
+type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictFilterShape<Filter> = Filter extends FilterInstance
+  ? Filter
+  : Filter extends FilterCls<infer FilterShape>
+    ? FilterShape
+    : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+      ? Filter
+      : AnyFilterShape;
+type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
+type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
+type FilterTranslatorKey<Filter> = {
+  [Key in keyof DictFilterQuery<Filter> & string]:
     | `${Key}`
     | `${Key}.desc`
-    | (Filter["query"][Key] extends FilterInfo<infer ArgNames, any>
+    | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, any>
         ? ArgNames[number] extends string
           ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc`
           : never
         : never);
-}[keyof Filter["query"] & string];
+}[keyof DictFilterQuery<Filter> & string];
 type EndpointTranslatorKey<Endpoint extends { [key: string]: EndpointInfo }> = {
   [Key in keyof Endpoint & string]:
     | `${Key}`
@@ -73,7 +83,7 @@ export type ModelTrans<
   T extends string,
   Model extends BaseObject,
   Insight extends BaseInsight,
-  Filter extends FilterInstance,
+  Filter,
   Slice extends { [key: string]: SliceInfo },
   Endpoint extends { [key: string]: EndpointInfo },
   ErrorKey extends string,
@@ -84,11 +94,11 @@ export type ModelTrans<
   model: { [K in keyof GetStateObject<Model>]: FieldTrans };
   insight: { [K in keyof GetStateObject<Insight>]: FieldTrans };
   query: {
-    [K in keyof Filter["query"]]: Filter["query"][K] extends FilterInfo<infer ArgNames, any>
+    [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any>
       ? FnTrans<ArgNames[number]>
       : never;
   };
-  sort: { [K in keyof Filter["sort"]]: FieldTrans };
+  sort: { [K in keyof DictFilterSort<Filter>]: FieldTrans };
   api: {
     [K in keyof Endpoint]: FnTrans<EndpInfoArgNames<Endpoint[K]>[number]>;
   } & BaseModelCrudGetApiTrans<T> &
@@ -101,7 +111,7 @@ export type ModelTranslatorKey<
   T extends string,
   Model,
   Insight,
-  Filter extends FilterInstance,
+  Filter,
   Slice extends { [key: string]: SliceInfo },
   Endpoint extends { [key: string]: EndpointInfo },
   EtcKey extends string,
@@ -111,7 +121,7 @@ export type ModelTranslatorKey<
   | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}`
   | `${T}.insight.${keyof GetStateObject<Insight> & string}${"" | ".desc"}`
   | `${T}.query.${FilterTranslatorKey<Filter>}`
-  | `${T}.sort.${keyof Filter["sort"] & string}${"" | ".desc"}`
+  | `${T}.sort.${keyof DictFilterSort<Filter> & string}${"" | ".desc"}`
   | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<Slice>}`
   | `${T}.${EtcKey}`;
 
@@ -159,7 +169,7 @@ export const registerModelTrans = <
   RefName extends string,
   Model extends BaseObject,
   Insight extends BaseInsight,
-  Filter extends FilterInstance,
+  Filter,
   Slice extends { [key: string]: SliceInfo },
   Endpoint extends { [key: string]: EndpointInfo },
   ModelDict extends ModelDictInfo<any>,

package/document/into.ts

@@ -90,6 +90,7 @@ interface IntoConstantModel<T extends string, _CapitalizedRefName extends string
   _CapitalizedRefName: _CapitalizedRefName;
   _Full: Raw;
 }
+type NoInferType<T> = [T][T extends unknown ? 0 : never];
 type IntoModelActions<
   T extends string,
   _CapitalizedRefName extends string,
@@ -119,19 +120,18 @@ type IntoModelActions<
 } & QueryMethodPart<_Query, _Sort, Raw, Doc, unknown, unknown, unknown, _QueryOfDoc>;
 
 export const into = <
-  DocRef extends Cls,
+  Doc,
   FilterRef extends FilterCls,
   T extends string,
   Raw,
   AddDbModels extends ModelCls[],
   _CapitalizedRefName extends string,
-  Doc = InstanceType<DocRef>,
   _QueryOfDoc = QueryOf<Doc>,
   _Query = FilterQueryOf<FilterRef>,
   _Sort = FilterSortOf<FilterRef>,
-  _LoaderBuilder extends LoaderBuilder<Doc> = LoaderBuilder<Doc>,
+  _LoaderBuilder extends LoaderBuilder<NoInferType<Doc>> = LoaderBuilder<Doc>,
 >(
-  docRef: DocRef,
+  docRef: Cls<Doc>,
   filterRef: FilterRef,
   cnst: IntoConstantModel<T, _CapitalizedRefName, Raw>,
   loaderBuilder: _LoaderBuilder,
@@ -140,7 +140,7 @@ export const into = <
   IntoModelActions<T, _CapitalizedRefName, Doc, Raw, _Query, _Sort, _QueryOfDoc>,
   ReturnType<_LoaderBuilder>
 > => {
-  const loaderInfoMap = loaderBuilder(makeLoaderBuilder());
+  const loaderInfoMap = loaderBuilder(makeLoaderBuilder<Doc>());
   const libsOnSchemaFns = addMdls.map((mdl) => mdl._onSchema);
   const DefaultModel = Object.assign(class DefaultModel {}, {
     [LOADER_META]: Object.assign({}, ...addMdls.map((mdl) => mdl[LOADER_META]), loaderInfoMap),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.5-rc.12",
+  "version": "2.3.5-rc.13",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/service/types.ts

@@ -4,9 +4,7 @@ import type { QueryOf } from "akanjs/constant";
 import type {
   CRUDEventType,
   DatabaseModel,
-  DatabaseInstance,
   DataInputOf,
-  Doc as HydratedDoc,
   FilterInstance,
   FindQueryOption,
   GetDocObject,
@@ -44,19 +42,25 @@ type DatabaseQueryMethods<Query, Sort, Obj, Doc, Insight, FindQueryOption, ListQ
   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
+    ? GetDocObject<SingleValue> extends DocObjectOfDoc
+      ? Doc[]
+      : Value
+    : Value
+  : Value extends DocumentLike
+    ? GetDocObject<Value> extends DocObjectOfDoc
+      ? Doc
+      : Value
+    : Value;
 type MixedLibServiceMethods<MixedLibSrv, Doc, DocObjectOfDoc> = {
   [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 HydratedDoc<any>
-        ? DocObjectOfDoc extends GetDocObject<Value>
-          ? (...args: Args) => Promise<Doc>
-          : MixedLibSrv[K]
-        : MixedLibSrv[K]
+    ? (...args: Args) => Promise<MixedLibServiceReturn<Value, Doc, DocObjectOfDoc>>
     : MixedLibSrv[K];
 };
 

package/signal/internalInfo.ts

@@ -194,17 +194,19 @@ export type InternalBuilder<
   },
 > = (builder: BuildInternal<SrvModule>) => [_Cnst] extends [never]
   ? { [key: string]: InternalInfo<Exclude<InternalType, "resolveField">> }
-  : {
-      [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">>;
-    };
+  : [_FullCls] extends [never]
+    ? { [key: string]: InternalInfo<Exclude<InternalType, "resolveField">> }
+    : {
+        [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">>;
+      };
 
 export const buildInternal = {
   resolveField: (returnRef: Cls, signalOption?: SignalOption) =>

package/signal/serverSignal.ts

@@ -1,5 +1,4 @@
 import { ENDPOINT_META, INJECT_META, INTERNAL_META } from "akanjs/base";
-import type { DocumentModel } from "akanjs/constant";
 import {
   type Adaptor,
   type AdaptorCls,
@@ -13,41 +12,44 @@ import type { ServerWebSocket } from "bun";
 import type { EndpointCls } from "./endpoint";
 import type { EndpInfoClientReturns, EndpInfoReqType, EndpInfoServerArgs, EndpointInfo } from "./endpointInfo";
 import type { InternalCls } from "./internal";
-import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs, InternalInfoServerReturns } from "./internalInfo";
+import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs } from "./internalInfo";
 
 export interface ServerSignal extends Adaptor {
   readonly websocket: ServerWebSocket;
   readonly queue: QueueAdaptor;
 }
 
-type EndpointServerSignalMethods<EnpCls> = EnpCls extends { [ENDPOINT_META]: infer EndpointInfoObj }
+type EndpointServerSignalMethods<EnpCls> = [EnpCls] extends [{ [ENDPOINT_META]: infer EndpointInfoObj }]
   ? {
       [K in keyof EndpointInfoObj as EndpInfoReqType<EndpointInfoObj[K]> extends "pubsub" ? K : never]: (
-        ...args: [
-          ...EndpInfoServerArgs<EndpointInfoObj[K]>,
-          data: DocumentModel<EndpInfoClientReturns<EndpointInfoObj[K]>>,
-        ]
+        ...args: [...EndpInfoServerArgs<EndpointInfoObj[K]>, data: EndpInfoClientReturns<EndpointInfoObj[K]>]
       ) => void;
     }
-  : never;
+  : Record<never, never>;
 
-type InternalServerSignalMethods<IntCls> = IntCls extends { [INTERNAL_META]: infer InternalInfoObj }
+type InternalServerSignalMethods<IntCls> = [IntCls] extends [{ [INTERNAL_META]: infer InternalInfoObj }]
   ? {
       [K in keyof InternalInfoObj as InternalInfoReqType<InternalInfoObj[K]> extends "process" ? K : never]: (
         ...args: [...args: InternalInfoServerArgs<InternalInfoObj[K]>, jobOptions?: AkanJobOptions]
-      ) => Promise<AkanJob<any, InternalInfoServerReturns<InternalInfoObj[K]>>>;
+      ) => Promise<AkanJob<unknown, unknown>>;
     }
-  : never;
+  : Record<never, never>;
 
-type ServerSignalClsStatics = {
+export type ServerSignalClsStatics = {
   readonly refName: string;
   readonly [INJECT_META]: { queue: QueueAdaptor };
   readonly [ENDPOINT_META]: { [key: string]: EndpointInfo };
   readonly [INTERNAL_META]: { [key: string]: InternalInfo };
 };
 
-export type ServerSignalCls<EnpCls = any, IntCls = any> = AdaptorCls<
-  EndpointServerSignalMethods<EnpCls> & InternalServerSignalMethods<IntCls> & ServerSignal
+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;
 

package/signal/slice.ts

@@ -146,7 +146,7 @@ export function slice<
           .search<"query", object>("query", Any)
           .exec((query) => query ?? {}),
       },
-      sliceBuilder(init),
+      sliceBuilder(init as Parameters<BuildSlice>[0]),
     );
   };
   libSlices.forEach((libSlice) => {

package/signal/sliceInfo.ts

@@ -262,22 +262,9 @@ export type SliceBuilder<
   _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>,
-    [],
-    [],
-    [],
-    []
-  >,
-) => {
-  [key: string]: SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>>;
-};
+  ) => SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>, [], [], [], []>,
+) => Record<string, _SliceInfo>;

package/signal/types.ts

@@ -12,9 +12,9 @@ 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"];

package/types/constant/via.d.ts

@@ -18,8 +18,9 @@ type BuiltSchema<BuildField extends (builder: FieldBuilder) => FieldInfoObject>
 type BuiltFieldObject<BuildField extends (builder: FieldBuilder) => FieldInfoObject> = FieldInfoObjectToFieldObject<ReturnType<BuildField>>;
 type ResolvedSchema<ResolveField extends (resolve: FieldResolver) => FieldInfoObject> = ExtractFieldInfoObject<ReturnType<ResolveField>>;
 type ResolvedFieldObject<ResolveField extends (resolve: FieldResolver) => FieldInfoObject> = FieldInfoObjectToFieldObject<ReturnType<ResolveField>>;
+type ConstantSetReturn<Self, Schema> = Self extends Schema & ConstantMethods<Schema> & infer Model ? unknown extends Model ? Self : Model : Self;
 export interface ConstantMethods<Schema = any> {
-    set: (obj: Partial<Schema>) => this;
+    set<Self extends Schema & ConstantMethods<Schema>>(this: Self, obj: Partial<Schema>): ConstantSetReturn<Self, Schema>;
 }
 type DatabaseSchemaOf<Schema, HiddenKey> = {
     [K in keyof Schema]: K extends HiddenKey ? NonNullable<Schema[K]> : Schema[K];

package/types/dictionary/dictInfo.d.ts

@@ -1,9 +1,16 @@
 import type { GetStateObject } from "akanjs/base";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { BaseFilterQueryKey, BaseFilterSortKey, FilterInfo, FilterInstance } from "akanjs/document";
+import type { BaseFilterQueryKey, BaseFilterSortKey, FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
 import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames } from "akanjs/signal";
 import type { RootDictionary } from "./trans.d.ts";
 type EnumValueKey = string | number;
+type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictFilterShape<Filter> = Filter extends FilterInstance ? Filter : Filter extends FilterCls<infer FilterShape> ? FilterShape : Filter extends {
+    query: Record<string, FilterInfo>;
+    sort: Record<string, unknown>;
+} ? Filter : AnyFilterShape;
+type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
+type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 declare class FieldTranslation<Languages extends [string, ...string[]]> {
     static translate: <Languages_1 extends [string, ...string[]]>(trans: Languages_1) => FieldTranslation<Languages_1>;
     trans: Languages;
@@ -95,12 +102,12 @@ export declare class ModelDictInfo<Languages extends [string, ...string[]] = [st
     insight<Insight extends object>(translate: (t: (trans: Languages) => FieldTranslation<Languages>) => {
         [K in Exclude<keyof GetStateObject<Insight>, InsightKey>]: FieldTranslation<Languages>;
     }): ModelDictInfo<Languages, ModelKey, keyof GetStateObject<Insight> & string, QueryKey, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
-    query<Filter extends FilterInstance>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-        [K in Exclude<keyof Filter["query"], QueryKey>]: Filter["query"][K] extends FilterInfo<infer ArgNames, any> ? FunctionTranslation<Languages, ArgNames[number]> : never;
-    }): ModelDictInfo<Languages, ModelKey, InsightKey, keyof Filter["query"] & string, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
-    sort<Filter extends FilterInstance>(translate: (t: (trans: Languages) => FieldTranslation<Languages>) => {
-        [K in Exclude<keyof Filter["sort"], SortKey>]: FieldTranslation<Languages>;
-    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, keyof Filter["sort"] & string, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
+    query<Filter>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
+        [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any> ? FunctionTranslation<Languages, ArgNames[number]> : never;
+    }): ModelDictInfo<Languages, ModelKey, InsightKey, keyof DictFilterQuery<Filter> & string, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
+    sort<Filter>(translate: (t: (trans: Languages) => FieldTranslation<Languages>) => {
+        [K in Exclude<keyof DictFilterSort<Filter>, SortKey>]: FieldTranslation<Languages>;
+    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, keyof DictFilterSort<Filter> & string, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
     enum<Enum extends {
         refName: string;
         value: EnumValueKey;

package/types/dictionary/locale.d.ts

@@ -1,6 +1,6 @@
 import type { GetStateObject, MergedValues } from "akanjs/base";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { FilterInfo, FilterInstance } from "akanjs/document";
+import type { FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
 import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames, SliceInfoRefName } from "akanjs/signal";
 import type { ModelDictInfo, ScalarDictInfo, ServiceDictInfo } from ".";
 interface Trans {
@@ -17,9 +17,16 @@ interface FnTrans<ArgKey extends string> {
         [key in ArgKey]: FieldTrans;
     };
 }
-type FilterTranslatorKey<Filter extends FilterInstance> = {
-    [Key in keyof Filter["query"] & string]: `${Key}` | `${Key}.desc` | (Filter["query"][Key] extends FilterInfo<infer ArgNames, any> ? ArgNames[number] extends string ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc` : never : never);
-}[keyof Filter["query"] & string];
+type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictFilterShape<Filter> = Filter extends FilterInstance ? Filter : Filter extends FilterCls<infer FilterShape> ? FilterShape : Filter extends {
+    query: Record<string, FilterInfo>;
+    sort: Record<string, unknown>;
+} ? Filter : AnyFilterShape;
+type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
+type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
+type FilterTranslatorKey<Filter> = {
+    [Key in keyof DictFilterQuery<Filter> & string]: `${Key}` | `${Key}.desc` | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, any> ? ArgNames[number] extends string ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc` : never : never);
+}[keyof DictFilterQuery<Filter> & string];
 type EndpointTranslatorKey<Endpoint extends {
     [key: string]: EndpointInfo;
 }> = {
@@ -44,7 +51,7 @@ type BaseModelCrudGetApiTrans<T extends string> = {
 } & {
     [K in `remove${T}`]: FnTrans<`${T}Id`>;
 };
-export type ModelTrans<T extends string, Model extends BaseObject, Insight extends BaseInsight, Filter extends FilterInstance, Slice extends {
+export type ModelTrans<T extends string, Model extends BaseObject, Insight extends BaseInsight, Filter, Slice extends {
     [key: string]: SliceInfo;
 }, Endpoint extends {
     [key: string]: EndpointInfo;
@@ -58,10 +65,10 @@ export type ModelTrans<T extends string, Model extends BaseObject, Insight exten
         [K in keyof GetStateObject<Insight>]: FieldTrans;
     };
     query: {
-        [K in keyof Filter["query"]]: Filter["query"][K] extends FilterInfo<infer ArgNames, any> ? FnTrans<ArgNames[number]> : never;
+        [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any> ? FnTrans<ArgNames[number]> : never;
     };
     sort: {
-        [K in keyof Filter["sort"]]: FieldTrans;
+        [K in keyof DictFilterSort<Filter>]: FieldTrans;
     };
     api: {
         [K in keyof Endpoint]: FnTrans<EndpInfoArgNames<Endpoint[K]>[number]>;
@@ -74,11 +81,11 @@ export type ModelTrans<T extends string, Model extends BaseObject, Insight exten
 } & {
     [K in EtcKey]: Trans;
 };
-export type ModelTranslatorKey<T extends string, Model, Insight, Filter extends FilterInstance, Slice extends {
+export type ModelTranslatorKey<T extends string, Model, Insight, Filter, Slice extends {
     [key: string]: SliceInfo;
 }, Endpoint extends {
     [key: string]: EndpointInfo;
-}, EtcKey extends string> = `${T}.modelName` | `${T}.modelDesc` | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}` | `${T}.insight.${keyof GetStateObject<Insight> & string}${"" | ".desc"}` | `${T}.query.${FilterTranslatorKey<Filter>}` | `${T}.sort.${keyof Filter["sort"] & string}${"" | ".desc"}` | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<Slice>}` | `${T}.${EtcKey}`;
+}, EtcKey extends string> = `${T}.modelName` | `${T}.modelDesc` | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}` | `${T}.insight.${keyof GetStateObject<Insight> & string}${"" | ".desc"}` | `${T}.query.${FilterTranslatorKey<Filter>}` | `${T}.sort.${keyof DictFilterSort<Filter> & string}${"" | ".desc"}` | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<Slice>}` | `${T}.${EtcKey}`;
 export type ScalarTrans<T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
     name: Trans;
     desc: Trans;
@@ -116,7 +123,7 @@ export interface DictModule<DictKey extends string, ErrorKey extends string> {
     __Error_Key__: ErrorKey;
     dict: ModelDictInfo<any> | ScalarDictInfo<any> | ServiceDictInfo<any>;
 }
-export declare const registerModelTrans: <RefName extends string, Model extends BaseObject, Insight extends BaseInsight, Filter extends FilterInstance, Slice extends {
+export declare const registerModelTrans: <RefName extends string, Model extends BaseObject, Insight extends BaseInsight, Filter, Slice extends {
     [key: string]: SliceInfo;
 }, Endpoint extends {
     [key: string]: EndpointInfo;

package/types/document/into.d.ts

@@ -68,6 +68,7 @@ interface IntoConstantModel<T extends string, _CapitalizedRefName extends string
     _CapitalizedRefName: _CapitalizedRefName;
     _Full: Raw;
 }
+type NoInferType<T> = [T][T extends unknown ? 0 : never];
 type IntoModelActions<T extends string, _CapitalizedRefName extends string, Doc, Raw, _Query, _Sort, _QueryOfDoc = QueryOf<Doc>> = {
     [key in _CapitalizedRefName]: Mdl<Doc, Raw>;
 } & {
@@ -87,5 +88,5 @@ type IntoModelActions<T extends string, _CapitalizedRefName extends string, Doc,
 } & {
     [K in `remove${_CapitalizedRefName}`]: (id: string) => Promise<Doc>;
 } & QueryMethodPart<_Query, _Sort, Raw, Doc, unknown, unknown, unknown, _QueryOfDoc>;
-export declare const into: <DocRef extends Cls, FilterRef extends FilterCls, T extends string, Raw, AddDbModels extends ModelCls[], _CapitalizedRefName extends string, Doc = InstanceType<DocRef>, _QueryOfDoc = QueryOf<Doc>, _Query = FilterQueryOf<FilterRef>, _Sort = FilterSortOf<FilterRef>, _LoaderBuilder extends LoaderBuilder<Doc> = LoaderBuilder<Doc>>(docRef: DocRef, filterRef: FilterRef, cnst: IntoConstantModel<T, _CapitalizedRefName, Raw>, loaderBuilder: _LoaderBuilder, ...addMdls: [...AddDbModels]) => ModelCls<IntoModelActions<T, _CapitalizedRefName, Doc, Raw, _Query, _Sort, _QueryOfDoc>, ReturnType<_LoaderBuilder>>;
+export declare const into: <Doc, FilterRef extends FilterCls, T extends string, Raw, AddDbModels extends ModelCls[], _CapitalizedRefName extends string, _QueryOfDoc = QueryOf<Doc>, _Query = FilterQueryOf<FilterRef>, _Sort = FilterSortOf<FilterRef>, _LoaderBuilder extends LoaderBuilder<NoInferType<Doc>> = LoaderBuilder<Doc>>(docRef: Cls<Doc>, filterRef: FilterRef, cnst: IntoConstantModel<T, _CapitalizedRefName, Raw>, loaderBuilder: _LoaderBuilder, ...addMdls: [...AddDbModels]) => ModelCls<IntoModelActions<T, _CapitalizedRefName, Doc, Raw, _Query, _Sort, _QueryOfDoc>, ReturnType<_LoaderBuilder>>;
 export {};

package/types/service/types.d.ts

@@ -1,11 +1,17 @@
 import type { Cls, MergeAllTypes, PromiseOrObject } from "akanjs/base";
 import type { Logger } from "akanjs/common";
 import type { QueryOf } from "akanjs/constant";
-import type { CRUDEventType, DatabaseModel, DatabaseInstance, DataInputOf, Doc as HydratedDoc, 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";
 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 ? GetDocObject<SingleValue> extends DocObjectOfDoc ? Doc[] : Value : Value : Value extends DocumentLike ? GetDocObject<Value> extends DocObjectOfDoc ? Doc : Value : Value;
 type MixedLibServiceMethods<MixedLibSrv, Doc, DocObjectOfDoc> = {
-    [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 HydratedDoc<any> ? DocObjectOfDoc extends GetDocObject<Value> ? (...args: Args) => Promise<Doc> : MixedLibSrv[K] : MixedLibSrv[K] : MixedLibSrv[K];
+    [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"];

package/types/signal/internalInfo.d.ts

@@ -68,6 +68,8 @@ export type InternalBuilder<SrvModule extends ServiceModel, _Cnst = CnstOf<SrvMo
     [K in keyof _FieldObj as _FieldObj[K] extends ConstantField<"resolve", any, any, any, any, any> ? K : never]: _FieldObj[K];
 }> = (builder: BuildInternal<SrvModule>) => [_Cnst] extends [never] ? {
     [key: string]: InternalInfo<Exclude<InternalType, "resolveField">>;
+} : [_FullCls] extends [never] ? {
+    [key: string]: InternalInfo<Exclude<InternalType, "resolveField">>;
 } : {
     [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">>;
 };

package/types/signal/serverSignal.d.ts

@@ -1,27 +1,23 @@
 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 { EndpInfoClientReturns, EndpInfoReqType, EndpInfoServerArgs, EndpointInfo } from "./endpointInfo.d.ts";
-import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs, InternalInfoServerReturns } from "./internalInfo.d.ts";
+import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs } from "./internalInfo.d.ts";
 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 EndpInfoReqType<EndpointInfoObj[K]> extends "pubsub" ? K : never]: (...args: [
-        ...EndpInfoServerArgs<EndpointInfoObj[K]>,
-        data: DocumentModel<EndpInfoClientReturns<EndpointInfoObj[K]>>
-    ]) => void;
-} : never;
-type InternalServerSignalMethods<IntCls> = IntCls extends {
+}] ? {
+    [K in keyof EndpointInfoObj as EndpInfoReqType<EndpointInfoObj[K]> extends "pubsub" ? K : never]: (...args: [...EndpInfoServerArgs<EndpointInfoObj[K]>, data: EndpInfoClientReturns<EndpointInfoObj[K]>]) => void;
+} : Record<never, never>;
+type InternalServerSignalMethods<IntCls> = [IntCls] extends [{
     [INTERNAL_META]: infer InternalInfoObj;
-} ? {
-    [K in keyof InternalInfoObj as InternalInfoReqType<InternalInfoObj[K]> extends "process" ? K : never]: (...args: [...args: InternalInfoServerArgs<InternalInfoObj[K]>, jobOptions?: AkanJobOptions]) => Promise<AkanJob<any, InternalInfoServerReturns<InternalInfoObj[K]>>>;
-} : 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;
@@ -33,7 +29,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/sliceInfo.d.ts

@@ -68,11 +68,5 @@ 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>> = (init: (signalOption?: SignalOption) => SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>, [
-], [
-], [
-], [
-]>) => {
-    [key: string]: SliceInfo<SrvRefName<SrvModule>, _Input, _Full, _Light, _Insight, _Filter, SrvMap<SrvModule>>;
-};
+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

@@ -10,9 +10,9 @@ 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"];