akanjs 2.3.5-rc.13 → 2.3.5-rc.14

package/document/by.ts

@@ -1,4 +1,4 @@
-import { type Cls, FIELD_META, type GetActionObject, type MergeAllActionTypes } from "akanjs/base";
+import { type Cls, FIELD_META, type GetActionObject, SERVER_VALUE } from "akanjs/base";
 import { applyMixins } from "akanjs/common";
 import {
   ConstantRegistry,
@@ -7,7 +7,12 @@ import {
   type FieldObject,
 } from "akanjs/constant";
 
-export type DatabaseCls<Schema = any> = Cls<Schema, { refName: string; [FIELD_META]: FieldObject }>;
+export type DatabaseCls<Schema = unknown> = Cls<Schema, { refName: string; [FIELD_META]: FieldObject }>;
+export type DatabaseInstanceOf<DatabaseRef extends DatabaseCls> = DatabaseRef extends new (
+  ...args: never[]
+) => infer Instance
+  ? Instance
+  : never;
 type ConstantModelCls = DocumentConstantModelRef<unknown>;
 
 export interface DefaultDocMtds<TDocument> {
@@ -38,8 +43,13 @@ interface ChainableHydratedMethods<TDocument>
 type ChainableHydratedDocument<TDocument> = TDocument & {
   id: string;
 } & ChainableHydratedMethods<TDocument>;
-export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
+export type Doc<M = unknown> = HydratedDocumentWithId<DocumentModel<M>>;
 type DatabaseSchemaOf<ModelCls> = ModelCls extends { _DatabaseSchema: infer Schema } ? Schema : never;
+type ConstantValueOf<ModelCls> = ModelCls extends { [SERVER_VALUE]: infer Schema }
+  ? Schema
+  : ModelCls extends new (...args: never[]) => infer Schema
+    ? Schema
+    : never;
 type ObjectDocumentModelType = "object" | "full" | "light";
 type ModelTypeOf<ModelCls> = ModelCls extends { _ModelType: infer ModelType } ? ModelType : never;
 type IsObjectModel<ModelCls> = ModelTypeOf<ModelCls> extends ObjectDocumentModelType ? true : false;
@@ -48,27 +58,40 @@ type DocModelOf<ModelCls, Schema = DatabaseSchemaOf<ModelCls>> =
 type DocActionOmitKey<ModelCls, Schema = DatabaseSchemaOf<ModelCls>> =
   | (keyof Schema & string)
   | (IsObjectModel<ModelCls> extends true ? keyof DefaultDocMtds<unknown> | "id" : never);
-type DatabaseSchemaFor<ModelCls extends ConstantModelCls> = DatabaseSchemaOf<ModelCls>;
+type DatabaseSchemaFor<ModelCls extends ConstantModelCls> = DatabaseSchemaOf<ModelCls> & ConstantValueOf<ModelCls>;
 type DocModelFor<ModelCls extends ConstantModelCls> = DocModelOf<ModelCls, DatabaseSchemaFor<ModelCls>>;
 type DocActionOmitKeyFor<ModelCls extends ConstantModelCls> = DocActionOmitKey<ModelCls, DatabaseSchemaFor<ModelCls>>;
-type AddDbModelActions<
-  ModelCls extends ConstantModelCls,
-  AddDbModel extends DatabaseCls,
-  _OmitKey extends string = DocActionOmitKeyFor<ModelCls> & string,
-> = Omit<GetActionObject<InstanceType<AddDbModel>>, _OmitKey>;
+type StrictDocumentActions<T> = string extends keyof T
+  ? T[string] extends never
+    ? Record<never, never>
+    : GetActionObject<T>
+  : GetActionObject<T>;
+type DocumentActionsOf<AddDbModel extends DatabaseCls, OmitKey extends string> = Omit<
+  StrictDocumentActions<DatabaseInstanceOf<AddDbModel>>,
+  OmitKey
+>;
+type MergeDocumentActions<
+  AddDbModels extends readonly DatabaseCls[],
+  OmitKey extends string,
+  Acc = Record<never, never>,
+> = AddDbModels extends readonly [infer First extends DatabaseCls, ...infer Rest extends readonly DatabaseCls[]]
+  ? MergeDocumentActions<Rest, OmitKey, Acc & DocumentActionsOf<First, OmitKey>>
+  : AddDbModels extends readonly (infer AddDbModel extends DatabaseCls)[]
+    ? Acc & DocumentActionsOf<AddDbModel, OmitKey>
+    : Acc;
 type ByInstance<
   ModelCls extends ConstantModelCls,
-  AddDbModels extends DatabaseCls[],
+  AddDbModels extends readonly DatabaseCls[],
   _OmitKey extends string = DocActionOmitKeyFor<ModelCls> & string,
   _DocModel = DocModelFor<ModelCls>,
-> = MergeAllActionTypes<AddDbModels, _OmitKey> & _DocModel;
+> = MergeDocumentActions<AddDbModels, _OmitKey> & _DocModel;
 
 export function by<ModelCls extends ConstantModelCls>(modelRef: ModelCls): DatabaseCls<DocModelFor<ModelCls>>;
 export function by<ModelCls extends ConstantModelCls, AddDbModel extends DatabaseCls>(
   modelRef: ModelCls,
   addRef: AddDbModel,
-): DatabaseCls<AddDbModelActions<ModelCls, AddDbModel> & DocModelFor<ModelCls>>;
-export function by<ModelCls extends ConstantModelCls, AddDbModels extends DatabaseCls[]>(
+): DatabaseCls<DocumentActionsOf<AddDbModel, DocActionOmitKeyFor<ModelCls> & string> & DocModelFor<ModelCls>>;
+export function by<ModelCls extends ConstantModelCls, const AddDbModels extends DatabaseCls[]>(
   modelRef: ModelCls,
   ...addRefs: AddDbModels
 ): DatabaseCls<ByInstance<ModelCls, AddDbModels>>;
@@ -79,5 +102,5 @@ export function by(modelRef: ConstantModelCls, ...addRefs: DatabaseCls[]): Datab
     static [FIELD_META] = modelRef[FIELD_META];
   };
   applyMixins(databaseCls as Cls, addRefs);
-  return databaseCls as any;
+  return databaseCls as unknown as DatabaseCls;
 }

package/package.json

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

package/service/types.ts

@@ -49,12 +49,12 @@ type DocumentLike = {
 };
 type MixedLibServiceReturn<Value, Doc, DocObjectOfDoc> = Value extends (infer SingleValue)[]
   ? SingleValue extends DocumentLike
-    ? GetDocObject<SingleValue> extends DocObjectOfDoc
+    ? DocObjectOfDoc extends GetDocObject<SingleValue>
       ? Doc[]
       : Value
     : Value
   : Value extends DocumentLike
-    ? GetDocObject<Value> extends DocObjectOfDoc
+    ? DocObjectOfDoc extends GetDocObject<Value>
       ? Doc
       : Value
     : Value;

package/signal/internalInfo.ts

@@ -193,9 +193,9 @@ export type InternalBuilder<
       : never]: _FieldObj[K];
   },
 > = (builder: BuildInternal<SrvModule>) => [_Cnst] extends [never]
-  ? { [key: string]: InternalInfo<Exclude<InternalType, "resolveField">> }
+  ? { [key: string]: InternalInfo<InternalType> }
   : [_FullCls] extends [never]
-    ? { [key: string]: InternalInfo<Exclude<InternalType, "resolveField">> }
+    ? { [key: string]: InternalInfo<InternalType> }
     : {
         [K in keyof _ResolveFieldObj]: _ResolveFieldObj[K] extends ConstantField<
           "resolve",
@@ -206,7 +206,7 @@ export type InternalBuilder<
         >
           ? InternalInfo<"resolveField", any, any, any, any, NonNullable<Value>, Nullable>
           : InternalInfo<Exclude<InternalType, "resolveField">>;
-      };
+      } & { [key: string]: InternalInfo<InternalType> };
 
 export const buildInternal = {
   resolveField: (returnRef: Cls, signalOption?: SignalOption) =>

package/signal/serverSignal.ts

@@ -1,4 +1,5 @@
 import { ENDPOINT_META, INJECT_META, INTERNAL_META } from "akanjs/base";
+import type { DocumentModel } from "akanjs/constant";
 import {
   type Adaptor,
   type AdaptorCls,
@@ -14,6 +15,8 @@ import type { EndpInfoClientReturns, EndpInfoReqType, EndpInfoServerArgs, Endpoi
 import type { InternalCls } from "./internal";
 import type { InternalInfo, InternalInfoReqType, InternalInfoServerArgs } from "./internalInfo";
 
+type EndpointPubsubPayload<E> = EndpInfoClientReturns<E> | DocumentModel<EndpInfoClientReturns<E>>;
+
 export interface ServerSignal extends Adaptor {
   readonly websocket: ServerWebSocket;
   readonly queue: QueueAdaptor;
@@ -22,7 +25,7 @@ export interface ServerSignal extends Adaptor {
 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: EndpInfoClientReturns<EndpointInfoObj[K]>]
+        ...args: [...EndpInfoServerArgs<EndpointInfoObj[K]>, data: EndpointPubsubPayload<EndpointInfoObj[K]>]
       ) => void;
     }
   : Record<never, never>;

package/types/document/by.d.ts

@@ -1,9 +1,10 @@
-import { type Cls, FIELD_META, type GetActionObject, type MergeAllActionTypes } from "akanjs/base";
+import { type Cls, FIELD_META, type GetActionObject, SERVER_VALUE } from "akanjs/base";
 import { type DocumentConstantModelRef, type DocumentModel, type FieldObject } from "akanjs/constant";
-export type DatabaseCls<Schema = any> = Cls<Schema, {
+export type DatabaseCls<Schema = unknown> = Cls<Schema, {
     refName: string;
     [FIELD_META]: FieldObject;
 }>;
+export type DatabaseInstanceOf<DatabaseRef extends DatabaseCls> = DatabaseRef extends new (...args: never[]) => infer Instance ? Instance : never;
 type ConstantModelCls = DocumentConstantModelRef<unknown>;
 export interface DefaultDocMtds<TDocument> {
     refresh(): Promise<this>;
@@ -31,10 +32,13 @@ interface ChainableHydratedMethods<TDocument> extends Omit<DefaultDocMtds<TDocum
 type ChainableHydratedDocument<TDocument> = TDocument & {
     id: string;
 } & ChainableHydratedMethods<TDocument>;
-export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
+export type Doc<M = unknown> = HydratedDocumentWithId<DocumentModel<M>>;
 type DatabaseSchemaOf<ModelCls> = ModelCls extends {
     _DatabaseSchema: infer Schema;
 } ? Schema : never;
+type ConstantValueOf<ModelCls> = ModelCls extends {
+    [SERVER_VALUE]: infer Schema;
+} ? Schema : ModelCls extends new (...args: never[]) => infer Schema ? Schema : never;
 type ObjectDocumentModelType = "object" | "full" | "light";
 type ModelTypeOf<ModelCls> = ModelCls extends {
     _ModelType: infer ModelType;
@@ -42,12 +46,14 @@ type ModelTypeOf<ModelCls> = ModelCls extends {
 type IsObjectModel<ModelCls> = ModelTypeOf<ModelCls> extends ObjectDocumentModelType ? true : false;
 type DocModelOf<ModelCls, Schema = DatabaseSchemaOf<ModelCls>> = IsObjectModel<ModelCls> extends true ? ChainableHydratedDocument<DocumentModel<Schema>> : DocumentModel<Schema>;
 type DocActionOmitKey<ModelCls, Schema = DatabaseSchemaOf<ModelCls>> = (keyof Schema & string) | (IsObjectModel<ModelCls> extends true ? keyof DefaultDocMtds<unknown> | "id" : never);
-type DatabaseSchemaFor<ModelCls extends ConstantModelCls> = DatabaseSchemaOf<ModelCls>;
+type DatabaseSchemaFor<ModelCls extends ConstantModelCls> = DatabaseSchemaOf<ModelCls> & ConstantValueOf<ModelCls>;
 type DocModelFor<ModelCls extends ConstantModelCls> = DocModelOf<ModelCls, DatabaseSchemaFor<ModelCls>>;
 type DocActionOmitKeyFor<ModelCls extends ConstantModelCls> = DocActionOmitKey<ModelCls, DatabaseSchemaFor<ModelCls>>;
-type AddDbModelActions<ModelCls extends ConstantModelCls, AddDbModel extends DatabaseCls, _OmitKey extends string = DocActionOmitKeyFor<ModelCls> & string> = Omit<GetActionObject<InstanceType<AddDbModel>>, _OmitKey>;
-type ByInstance<ModelCls extends ConstantModelCls, AddDbModels extends DatabaseCls[], _OmitKey extends string = DocActionOmitKeyFor<ModelCls> & string, _DocModel = DocModelFor<ModelCls>> = MergeAllActionTypes<AddDbModels, _OmitKey> & _DocModel;
+type StrictDocumentActions<T> = string extends keyof T ? T[string] extends never ? Record<never, never> : GetActionObject<T> : GetActionObject<T>;
+type DocumentActionsOf<AddDbModel extends DatabaseCls, OmitKey extends string> = Omit<StrictDocumentActions<DatabaseInstanceOf<AddDbModel>>, OmitKey>;
+type MergeDocumentActions<AddDbModels extends readonly DatabaseCls[], OmitKey extends string, Acc = Record<never, never>> = AddDbModels extends readonly [infer First extends DatabaseCls, ...infer Rest extends readonly DatabaseCls[]] ? MergeDocumentActions<Rest, OmitKey, Acc & DocumentActionsOf<First, OmitKey>> : AddDbModels extends readonly (infer AddDbModel extends DatabaseCls)[] ? Acc & DocumentActionsOf<AddDbModel, OmitKey> : Acc;
+type ByInstance<ModelCls extends ConstantModelCls, AddDbModels extends readonly DatabaseCls[], _OmitKey extends string = DocActionOmitKeyFor<ModelCls> & string, _DocModel = DocModelFor<ModelCls>> = MergeDocumentActions<AddDbModels, _OmitKey> & _DocModel;
 export declare function by<ModelCls extends ConstantModelCls>(modelRef: ModelCls): DatabaseCls<DocModelFor<ModelCls>>;
-export declare function by<ModelCls extends ConstantModelCls, AddDbModel extends DatabaseCls>(modelRef: ModelCls, addRef: AddDbModel): DatabaseCls<AddDbModelActions<ModelCls, AddDbModel> & DocModelFor<ModelCls>>;
-export declare function by<ModelCls extends ConstantModelCls, AddDbModels extends DatabaseCls[]>(modelRef: ModelCls, ...addRefs: AddDbModels): DatabaseCls<ByInstance<ModelCls, AddDbModels>>;
+export declare function by<ModelCls extends ConstantModelCls, AddDbModel extends DatabaseCls>(modelRef: ModelCls, addRef: AddDbModel): DatabaseCls<DocumentActionsOf<AddDbModel, DocActionOmitKeyFor<ModelCls> & string> & DocModelFor<ModelCls>>;
+export declare function by<ModelCls extends ConstantModelCls, const AddDbModels extends DatabaseCls[]>(modelRef: ModelCls, ...addRefs: AddDbModels): DatabaseCls<ByInstance<ModelCls, AddDbModels>>;
 export {};

package/types/service/serviceModule.d.ts

@@ -19,7 +19,7 @@ export declare class ServiceModel<Srv extends ServiceCls = ServiceCls, CnstModel
     static from<Srv extends ServiceCls>(srv: Srv): ServiceModel<Srv, never, never, { [K in `${Uncapitalize<Srv["refName"]>}Service`]: UnCls<Srv>; }>;
     with<SrvModules extends ServiceModel[]>(...srvs: SrvModules): ServiceModel<Srv, CnstModel, DbModel, SrvMap & MergeAllKeyOfObjects<SrvModules, "srvMap">>;
     static getDefaultDbServiceMethods(className: string): {
-        [x: string]: ((this: DatabaseService, query: QueryOf<any>, queryOption?: ListQueryOption) => Promise<any>) | ((this: DatabaseService, query: QueryOf<any>, queryOption?: FindQueryOption) => Promise<any>) | ((this: DatabaseService, type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>) => any) | ((this: DatabaseService, id: string, data: DataInputOf) => Promise<any>);
+        [x: string]: ((this: DatabaseService, query: QueryOf<any>, queryOption?: ListQueryOption) => Promise<any>) | ((this: DatabaseService, query: QueryOf<any>, queryOption?: FindQueryOption) => Promise<any>) | ((this: DatabaseService, id: string, data: Partial<Doc>) => Promise<Partial<Doc>>) | ((this: DatabaseService, type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>) => any) | ((this: DatabaseService, id: string, data: DataInputOf) => Promise<any>);
         __get(this: DatabaseService, id: string): Promise<any>;
         __load(this: DatabaseService, id?: string): Promise<any>;
         __loadMany(this: DatabaseService, ids: string[]): Promise<any>;
@@ -33,11 +33,11 @@ export declare class ServiceModel<Srv extends ServiceCls = ServiceCls, CnstModel
         __count(this: DatabaseService, query: QueryOf<any>): Promise<any>;
         __insight(this: DatabaseService, query: QueryOf<any>): Promise<any>;
         _preCreate(this: DatabaseService, data: DataInputOf): Promise<DataInputOf>;
-        _postCreate(this: DatabaseService, doc: Doc): Promise<any>;
-        _preUpdate(this: DatabaseService, id: string, data: Partial<Doc>): Promise<Partial<any>>;
-        _postUpdate(this: DatabaseService, doc: Doc): Promise<any>;
+        _postCreate(this: DatabaseService, doc: Doc): Promise<Doc>;
+        _preUpdate(this: DatabaseService, id: string, data: Partial<Doc>): Promise<Partial<Doc>>;
+        _postUpdate(this: DatabaseService, doc: Doc): Promise<Doc>;
         _preRemove(this: DatabaseService, id: string): Promise<void>;
-        _postRemove(this: DatabaseService, doc: Doc): Promise<any>;
+        _postRemove(this: DatabaseService, doc: Doc): Promise<Doc>;
         listenPre(this: DatabaseService, type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>): any;
         listenPost(this: DatabaseService, type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>): any;
         __create(this: DatabaseService, data: DataInputOf): Promise<any>;

package/types/service/types.d.ts

@@ -9,7 +9,7 @@ type DocumentLike = {
     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 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];
 };

package/types/signal/internalInfo.d.ts

@@ -67,11 +67,13 @@ export type InternalBuilder<SrvModule extends ServiceModel, _Cnst = CnstOf<SrvMo
 } ? 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>) => [_Cnst] extends [never] ? {
-    [key: string]: InternalInfo<Exclude<InternalType, "resolveField">>;
+    [key: string]: InternalInfo<InternalType>;
 } : [_FullCls] extends [never] ? {
-    [key: string]: InternalInfo<Exclude<InternalType, "resolveField">>;
+    [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

@@ -1,8 +1,10 @@
 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 } from "./internalInfo.d.ts";
+type EndpointPubsubPayload<E> = EndpInfoClientReturns<E> | DocumentModel<EndpInfoClientReturns<E>>;
 export interface ServerSignal extends Adaptor {
     readonly websocket: ServerWebSocket;
     readonly queue: QueueAdaptor;
@@ -10,7 +12,7 @@ export interface ServerSignal extends Adaptor {
 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: EndpInfoClientReturns<EndpointInfoObj[K]>]) => void;
+    [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;