akanjs 2.3.1 → 2.3.2-rc.0

package/constant/fieldInfo.ts

@@ -48,10 +48,10 @@ export type FieldToValue<Field, MapValue = any> = Field extends null
 export interface FieldInfoObject {
   [key: string]: FieldInfo<any, ConstantFieldTypeInput | null, any>;
 }
-export type ExtractFieldInfoObject<Obj extends FieldInfoObject> = {
-  [K in keyof Obj]: Obj[K] extends FieldInfo<any, infer FieldValue, infer ExplicitType, infer MapValue>
+export type ExtractFieldInfoObject<Obj extends FieldInfoObject, NullableType extends string = "hidden" | "secret"> = {
+  [K in keyof Obj]: Obj[K] extends FieldInfo<infer FieldType, infer FieldValue, infer ExplicitType, infer MapValue>
     ? unknown extends ExplicitType
-      ? FieldToValue<FieldValue, MapValue>
+      ? FieldToValue<FieldValue | (FieldType extends NullableType ? null : never), MapValue>
       : ExplicitType
     : never;
 };
@@ -381,7 +381,7 @@ field.hidden = <
   value: Value,
   option: FieldOption<Value, MapValue> = {},
 ) =>
-  new FieldInfo<"hidden", Value | null, ExplicitType | null, MapValue>(value, {
+  new FieldInfo<"hidden", Value, ExplicitType, MapValue>(value, {
     ...option,
     fieldType: "hidden",
     nullable: true,
@@ -394,7 +394,7 @@ field.secret = <
   value: Value,
   option: FieldOption<Value, MapValue> = {},
 ) =>
-  new FieldInfo<"secret", Value | null, ExplicitType | null, MapValue>(value, {
+  new FieldInfo<"secret", Value, ExplicitType, MapValue>(value, {
     ...option,
     fieldType: "secret",
     select: false,

package/constant/via.ts

@@ -129,7 +129,7 @@ const getBaseConstantClass = (field: FieldObject, modelType: ConstantType = "sca
     static relations: Set<ConstantCls> = new Set();
     static enums: Set<EnumInstance> = new Set();
     [immerable] = true;
-    constructor(obj?: Partial<typeof this>) {
+    constructor(obj?: Partial<unknown>) {
       this.set({
         ...(this.constructor as ConstantCls).getDefault(),
         ...((obj ?? {}) as Partial<typeof this>),

package/document/by.ts

@@ -1,8 +1,9 @@
-import { type Cls, FIELD_META, type MergeAllActionTypes, type UnCls } from "akanjs/base";
+import { type Cls, FIELD_META, type MergeAllActionTypes } from "akanjs/base";
 import { applyMixins } from "akanjs/common";
 import {
   type BaseObject,
   type ConstantCls,
+  type ConstantField,
   ConstantRegistry,
   type DocumentModel,
   type FieldObject,
@@ -22,11 +23,19 @@ type HydratedDocumentWithId<TDocument> = TDocument & { id: string } & DefaultDoc
 export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
 
 export const by = <
-  ModelCls,
+  Schema,
+  FieldObj extends FieldObject,
   AddDbModels extends DatabaseCls[],
-  _DocModel = UnCls<ModelCls> extends BaseObject ? Doc<UnCls<ModelCls>> : DocumentModel<UnCls<ModelCls>>,
+  _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: ModelCls,
+  modelRef: ConstantCls<Schema, FieldObj>,
   ...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.1",
+  "version": "2.3.2-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/constant/fieldInfo.d.ts

@@ -11,8 +11,8 @@ export type FieldToValue<Field, MapValue = any> = Field extends null ? FieldToVa
 export interface FieldInfoObject {
     [key: string]: FieldInfo<any, ConstantFieldTypeInput | null, any>;
 }
-export type ExtractFieldInfoObject<Obj extends FieldInfoObject> = {
-    [K in keyof Obj]: Obj[K] extends FieldInfo<any, infer FieldValue, infer ExplicitType, infer MapValue> ? unknown extends ExplicitType ? FieldToValue<FieldValue, MapValue> : ExplicitType : never;
+export type ExtractFieldInfoObject<Obj extends FieldInfoObject, NullableType extends string = "hidden" | "secret"> = {
+    [K in keyof Obj]: Obj[K] extends FieldInfo<infer FieldType, infer FieldValue, infer ExplicitType, infer MapValue> ? unknown extends ExplicitType ? FieldToValue<FieldValue | (FieldType extends NullableType ? null : never), MapValue> : ExplicitType : never;
 };
 export type ConstantFieldKind = "property" | "hidden" | "secret" | "resolve";
 export interface ConstantFieldProps<FieldType extends ConstantFieldKind = ConstantFieldKind, FieldValue = any, MapValue = any, Metadata = {
@@ -144,8 +144,8 @@ export type PlainTypeToFieldType<PlainType> = PlainType extends [infer First, ..
 /** Builds a stored property field with optional validation, default, ref, text, and metadata options. */
 export declare const field: {
     <ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<"property", Value, ExplicitType, MapValue>;
-    hidden<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<"hidden", Value | null, ExplicitType | null, MapValue>;
-    secret<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<"secret", Value | null, ExplicitType | null, MapValue>;
+    hidden<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<"hidden", Value, ExplicitType, MapValue>;
+    secret<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<"secret", Value, ExplicitType, MapValue>;
 };
 /** Builds a resolved field that is derived rather than treated as a stored property. */
 export declare const resolve: <ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof PrimitiveScalar : never>(value: Value, option?: FieldOption<Value, MapValue>) => FieldInfo<"resolve", Value, ExplicitType, MapValue>;

package/types/document/by.d.ts

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