akanjs 2.3.2-rc.1 → 2.3.2-rc.2

package/constant/constantRegistry.ts

@@ -200,7 +200,7 @@ export class ConstantRegistry {
       _StateLight: null as unknown as GetStateObject<Light>,
       _StateInsight: null as unknown as GetStateObject<Insight>,
     };
-    ConstantRegistry.setDatabase(refName, cnst);
+    ConstantRegistry.setDatabase(refName, cnst as ConstantModel);
     Object.entries(constExports).forEach(([key, value]) => {
       if ((modelRefSet as Set<unknown>).has(value)) return;
       else if (typeof value === "function" && isEnum(value as Cls))

package/constant/via.ts

@@ -172,6 +172,15 @@ export interface ConstantStatics<Schema = any, FieldObj extends FieldObject = Fi
   relations: Set<ConstantCls>;
   enums: Set<EnumInstance>;
   text: { search: Set<string>; filter: Set<string>; children: { search: Set<string>; filter: Set<string> } };
+  _DatabaseSchema: {
+    [K in keyof Schema]: K extends keyof FieldObj
+      ? FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any>
+        ? FieldType extends "hidden"
+          ? NonNullable<Schema[K]>
+          : Schema[K]
+        : Schema[K]
+      : Schema[K];
+  };
 }
 export type ConstantCls<Schema = any, FieldObj extends FieldObject = FieldObject> = (new (
   obj?: Partial<Schema>,

package/document/by.ts

@@ -3,7 +3,6 @@ import { applyMixins } from "akanjs/common";
 import {
   type BaseObject,
   type ConstantCls,
-  type ConstantField,
   ConstantRegistry,
   type DocumentModel,
   type FieldObject,
@@ -23,19 +22,12 @@ type HydratedDocumentWithId<TDocument> = TDocument & { id: string } & DefaultDoc
 export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
 
 export const by = <
-  Schema,
-  FieldObj extends FieldObject,
+  ModelCls,
   AddDbModels extends DatabaseCls[],
-  _DatabaseSchema = Schema & {
-    [K in keyof FieldObj & keyof Schema as FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any>
-      ? FieldType extends "hidden"
-        ? K
-        : never
-      : never]: NonNullable<Schema[K]>;
-  },
-  _DocModel = Schema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>,
+  _DatabaseSchema = ModelCls extends { _DatabaseSchema: infer Schema } ? Schema : never,
+  _DocModel = _DatabaseSchema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>,
 >(
-  modelRef: ConstantCls<Schema, FieldObj>,
+  modelRef: ModelCls,
   ...addRefs: AddDbModels
 ): DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel> => {
   const refName = ConstantRegistry.getRefName(modelRef as Cls);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.2-rc.1",
+  "version": "2.3.2-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/constant/via.d.ts

@@ -1,5 +1,5 @@
 import { type Cls, type EnumInstance, FIELD_META, type MergeAllKeyOfObjects, type MergeAllTypes } from "akanjs/base";
-import { type ExtractFieldInfoObject, type FieldBuilder, type FieldInfoObject, type FieldInfoObjectToFieldObject, type FieldObject, type FieldResolver } from "./fieldInfo.d.ts";
+import { ConstantField, type ExtractFieldInfoObject, type FieldBuilder, type FieldInfoObject, type FieldInfoObjectToFieldObject, type FieldObject, type FieldResolver } from "./fieldInfo.d.ts";
 import { type PurifyFunc } from "./purify.d.ts";
 import type { BaseInsight, BaseObject, ConstantType, DefaultOf, NonFunctionalKeys } from "./types.d.ts";
 type BaseFields = "id" | "createdAt" | "updatedAt" | "removedAt";
@@ -23,6 +23,9 @@ export interface ConstantStatics<Schema = any, FieldObj extends FieldObject = Fi
             filter: Set<string>;
         };
     };
+    _DatabaseSchema: {
+        [K in keyof Schema]: K extends keyof FieldObj ? FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any> ? FieldType extends "hidden" ? NonNullable<Schema[K]> : Schema[K] : Schema[K] : Schema[K];
+    };
 }
 export type ConstantCls<Schema = any, FieldObj extends FieldObject = FieldObject> = (new (obj?: Partial<Schema>) => Schema & ConstantMethods<Schema>) & ConstantStatics<Schema, FieldObj>;
 declare global {

package/types/document/by.d.ts

@@ -1,5 +1,5 @@
 import { type Cls, FIELD_META, type MergeAllActionTypes } from "akanjs/base";
-import { type BaseObject, type ConstantCls, type ConstantField, type DocumentModel, type FieldObject } from "akanjs/constant";
+import { type BaseObject, type DocumentModel, type FieldObject } from "akanjs/constant";
 export type DatabaseCls<Schema = any> = Cls<Schema, {
     refName: string;
     [FIELD_META]: FieldObject;
@@ -16,5 +16,7 @@ type HydratedDocumentWithId<TDocument> = TDocument & {
     id: string;
 } & DefaultDocMtds<TDocument>;
 export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
-export declare const by: <Schema, FieldObj extends FieldObject, AddDbModels extends DatabaseCls[], _DatabaseSchema = Schema & { [K in keyof FieldObj & keyof Schema as FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any> ? FieldType extends "hidden" ? K : never : never]: NonNullable<Schema[K]>; }, _DocModel = Schema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>>(modelRef: ConstantCls<Schema, FieldObj>, ...addRefs: AddDbModels) => DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
+export declare const by: <ModelCls, AddDbModels extends DatabaseCls[], _DatabaseSchema = ModelCls extends {
+    _DatabaseSchema: infer Schema;
+} ? Schema : never, _DocModel = _DatabaseSchema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>>(modelRef: ModelCls, ...addRefs: AddDbModels) => DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
 export {};