@akanjs/constant 0.9.41 → 0.9.43

package/cjs/src/baseGql.js

@@ -79,7 +79,13 @@ const lightModelOf = (objectRef, fields) => {
   class BaseGql {
     __ModelType__ = "light";
   }
-  ["id", ...fields, "createdAt", "updatedAt", "removedAt"].forEach((key) => map.set(key, metadataMap.get(key)));
+  map.set("id", metadataMap.get("id"));
+  for (const field of fields) {
+    map.set(field, metadataMap.get(field));
+  }
+  map.set("createdAt", metadataMap.get("createdAt"));
+  map.set("updatedAt", metadataMap.get("updatedAt"));
+  map.set("removedAt", metadataMap.get("removedAt"));
   Reflect.defineMetadata("fields", map, BaseGql.prototype);
   return BaseGql;
 };
@@ -98,31 +104,28 @@ const fullModelOf = (modelRef, lightRef, overwriteRef, overwriteLightRef) => {
   (0, import_scalar.setFieldMetaMap)(modelRef, new Map([...modelFieldMetaMap, ...lightFieldMetaMap]));
   return modelRef;
 };
-const via = (modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef) => {
+function via(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef) {
   if (!fieldsOrLightModelRef)
     return baseModelOf(modelRef);
-  else if (Array.isArray(fieldsOrLightModelRef))
+  if (Array.isArray(fieldsOrLightModelRef))
     return lightModelOf(modelRef, fieldsOrLightModelRef);
-  else
-    return fullModelOf(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef);
-};
-const addModelOf = (modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+  return fullModelOf(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef);
+}
+const addModelOf = (modelRef, ...types) => {
   const modelMetadataMap = (0, import_scalar.getFieldMetaMap)(modelRef);
-  const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).reduce((acc, writeRef) => {
-      const writeMetadataMap = (0, import_scalar.getFieldMetaMap)(writeRef);
-      (0, import_common.applyMixins)(modelRef, [writeRef]);
-      return new Map([...acc, ...writeMetadataMap]);
-    }, modelMetadataMap)
-  );
+  const metadataMap = types.filter(Boolean).reduce((acc, writeRef) => {
+    const writeMetadataMap = (0, import_scalar.getFieldMetaMap)(writeRef);
+    (0, import_common.applyMixins)(modelRef, [writeRef]);
+    return new Map([...acc, ...writeMetadataMap]);
+  }, modelMetadataMap);
   (0, import_scalar.setFieldMetaMap)(modelRef, metadataMap);
   return modelRef;
 };
-const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+const addFilterOf = (filterRef, ...types) => {
   const filterMeta = (0, import_filterMeta.getFilterMeta)(filterRef);
   const filterQueryMap = (0, import_filterMeta.getFilterQueryMap)(filterRef);
   const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).reduce((acc, writeRef) => {
+    types.filter(Boolean).reduce((acc, writeRef) => {
       const writeMetadataMap = (0, import_filterMeta.getFilterQueryMap)(writeRef);
       (0, import_common.applyMixins)(filterRef, [writeRef]);
       writeMetadataMap.forEach((value, key) => {
@@ -132,7 +135,7 @@ const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
       return new Map([...acc, ...writeMetadataMap]);
     }, filterQueryMap)
   );
-  const filterSort = [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).map((t) => (0, import_filterMeta.getFilterSortMap)(t)).reduce((acc, sort) => {
+  const filterSort = types.filter(Boolean).map((t) => (0, import_filterMeta.getFilterSortMap)(t)).reduce((acc, sort) => {
     Object.assign(acc, sort);
     return acc;
   }, filterMeta.sort);
@@ -140,19 +143,19 @@ const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
   (0, import_filterMeta.setFilterMeta)(filterRef, { ...filterMeta, sort: filterSort });
   return filterRef;
 };
-const from = (modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+const from = (modelRef, ...types) => {
   if ((0, import_scalar.isConstantModel)(modelRef))
-    return addModelOf(modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
+    return addModelOf(modelRef, ...types);
   else if ((0, import_filterMeta.isFilterModel)(modelRef))
-    return addFilterOf(modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
+    return addFilterOf(modelRef, ...types);
   else
     throw new Error("Invalid modelRef");
 };
-const mixModelOf = (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) => {
+const mixModelOf = (...types) => {
   class Mix {
   }
   const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20].filter((t) => !!t).reduce((acc, modelRef) => {
+    types.reduce((acc, modelRef) => {
       const modelMetadataMap = (0, import_scalar.getFieldMetaMap)(modelRef);
       (0, import_common.applyMixins)(Mix, [modelRef]);
       return [...acc, ...modelMetadataMap];

package/cjs/src/constantDecorator.js

@@ -18,7 +18,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var constantDecorator_exports = {};
 __export(constantDecorator_exports, {
   cnstOf: () => cnstOf,
-  getCnstMeta: () => getCnstMeta
+  getCnstMeta: () => getCnstMeta,
+  scalarCnstOf: () => scalarCnstOf
 });
 module.exports = __toCommonJS(constantDecorator_exports);
 var import_reflect_metadata = require("reflect-metadata");
@@ -34,7 +35,34 @@ const getCnstMeta = (refName) => {
   return cnst;
 };
 const cnstOf = (refName, Input, Full, Light, Insight, Filter, Summary) => {
-  const cnst = { refName, Input, Full, Light, Insight, Filter, Summary };
+  const cnst = {
+    refName,
+    Input,
+    Full,
+    Light,
+    Insight,
+    Filter,
+    Summary,
+    _CapitalizedT: null,
+    _Default: null,
+    _DefaultInput: null,
+    _DefaultState: null,
+    _DefaultStateInput: null,
+    _Doc: null,
+    _DocInput: null,
+    _QueryOfDoc: null,
+    _Query: null,
+    _Sort: null
+  };
   setCnstMeta(refName, cnst);
   return cnst;
 };
+const scalarCnstOf = (refName, Model) => {
+  const cnst = {
+    refName,
+    Model,
+    _Default: null,
+    _Doc: null
+  };
+  return cnst;
+};

package/cjs/src/types.js

@@ -20,17 +20,11 @@ __export(types_exports, {
   DEFAULT_PAGE_SIZE: () => DEFAULT_PAGE_SIZE,
   MAX_INT: () => MAX_INT,
   Responsive: () => Responsive,
-  defaultListOption: () => defaultListOption,
   responsiveWidths: () => responsiveWidths,
   unsetDate: () => unsetDate
 });
 module.exports = __toCommonJS(types_exports);
 var import_base = require("@akanjs/base");
-const defaultListOption = {
-  limit: 20,
-  skip: 0,
-  sort: "latest"
-};
 const DEFAULT_PAGE_SIZE = 20;
 const unsetDate = (0, import_base.dayjs)(/* @__PURE__ */ new Date("0000"));
 const MAX_INT = 2147483647;

package/esm/src/baseGql.js

@@ -62,7 +62,13 @@ const lightModelOf = (objectRef, fields) => {
   class BaseGql {
     __ModelType__ = "light";
   }
-  ["id", ...fields, "createdAt", "updatedAt", "removedAt"].forEach((key) => map.set(key, metadataMap.get(key)));
+  map.set("id", metadataMap.get("id"));
+  for (const field of fields) {
+    map.set(field, metadataMap.get(field));
+  }
+  map.set("createdAt", metadataMap.get("createdAt"));
+  map.set("updatedAt", metadataMap.get("updatedAt"));
+  map.set("removedAt", metadataMap.get("removedAt"));
   Reflect.defineMetadata("fields", map, BaseGql.prototype);
   return BaseGql;
 };
@@ -81,31 +87,28 @@ const fullModelOf = (modelRef, lightRef, overwriteRef, overwriteLightRef) => {
   setFieldMetaMap(modelRef, new Map([...modelFieldMetaMap, ...lightFieldMetaMap]));
   return modelRef;
 };
-const via = (modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef) => {
+function via(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef) {
   if (!fieldsOrLightModelRef)
     return baseModelOf(modelRef);
-  else if (Array.isArray(fieldsOrLightModelRef))
+  if (Array.isArray(fieldsOrLightModelRef))
     return lightModelOf(modelRef, fieldsOrLightModelRef);
-  else
-    return fullModelOf(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef);
-};
-const addModelOf = (modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+  return fullModelOf(modelRef, fieldsOrLightModelRef, overwriteRef, overwriteLightRef);
+}
+const addModelOf = (modelRef, ...types) => {
   const modelMetadataMap = getFieldMetaMap(modelRef);
-  const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).reduce((acc, writeRef) => {
-      const writeMetadataMap = getFieldMetaMap(writeRef);
-      applyMixins(modelRef, [writeRef]);
-      return new Map([...acc, ...writeMetadataMap]);
-    }, modelMetadataMap)
-  );
+  const metadataMap = types.filter(Boolean).reduce((acc, writeRef) => {
+    const writeMetadataMap = getFieldMetaMap(writeRef);
+    applyMixins(modelRef, [writeRef]);
+    return new Map([...acc, ...writeMetadataMap]);
+  }, modelMetadataMap);
   setFieldMetaMap(modelRef, metadataMap);
   return modelRef;
 };
-const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+const addFilterOf = (filterRef, ...types) => {
   const filterMeta = getFilterMeta(filterRef);
   const filterQueryMap = getFilterQueryMap(filterRef);
   const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).reduce((acc, writeRef) => {
+    types.filter(Boolean).reduce((acc, writeRef) => {
       const writeMetadataMap = getFilterQueryMap(writeRef);
       applyMixins(filterRef, [writeRef]);
       writeMetadataMap.forEach((value, key) => {
@@ -115,7 +118,7 @@ const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
       return new Map([...acc, ...writeMetadataMap]);
     }, filterQueryMap)
   );
-  const filterSort = [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10].filter((t) => !!t).map((t) => getFilterSortMap(t)).reduce((acc, sort) => {
+  const filterSort = types.filter(Boolean).map((t) => getFilterSortMap(t)).reduce((acc, sort) => {
     Object.assign(acc, sort);
     return acc;
   }, filterMeta.sort);
@@ -123,19 +126,19 @@ const addFilterOf = (filterRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
   setFilterMeta(filterRef, { ...filterMeta, sort: filterSort });
   return filterRef;
 };
-const from = (modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => {
+const from = (modelRef, ...types) => {
   if (isConstantModel(modelRef))
-    return addModelOf(modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
+    return addModelOf(modelRef, ...types);
   else if (isFilterModel(modelRef))
-    return addFilterOf(modelRef, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
+    return addFilterOf(modelRef, ...types);
   else
     throw new Error("Invalid modelRef");
 };
-const mixModelOf = (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) => {
+const mixModelOf = (...types) => {
   class Mix {
   }
   const metadataMap = new Map(
-    [t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20].filter((t) => !!t).reduce((acc, modelRef) => {
+    types.reduce((acc, modelRef) => {
       const modelMetadataMap = getFieldMetaMap(modelRef);
       applyMixins(Mix, [modelRef]);
       return [...acc, ...modelMetadataMap];

package/esm/src/constantDecorator.js

@@ -11,11 +11,39 @@ const getCnstMeta = (refName) => {
   return cnst;
 };
 const cnstOf = (refName, Input, Full, Light, Insight, Filter, Summary) => {
-  const cnst = { refName, Input, Full, Light, Insight, Filter, Summary };
+  const cnst = {
+    refName,
+    Input,
+    Full,
+    Light,
+    Insight,
+    Filter,
+    Summary,
+    _CapitalizedT: null,
+    _Default: null,
+    _DefaultInput: null,
+    _DefaultState: null,
+    _DefaultStateInput: null,
+    _Doc: null,
+    _DocInput: null,
+    _QueryOfDoc: null,
+    _Query: null,
+    _Sort: null
+  };
   setCnstMeta(refName, cnst);
   return cnst;
 };
+const scalarCnstOf = (refName, Model) => {
+  const cnst = {
+    refName,
+    Model,
+    _Default: null,
+    _Doc: null
+  };
+  return cnst;
+};
 export {
   cnstOf,
-  getCnstMeta
+  getCnstMeta,
+  scalarCnstOf
 };

package/esm/src/types.js

@@ -1,9 +1,4 @@
 import { dayjs, enumOf } from "@akanjs/base";
-const defaultListOption = {
-  limit: 20,
-  skip: 0,
-  sort: "latest"
-};
 const DEFAULT_PAGE_SIZE = 20;
 const unsetDate = dayjs(/* @__PURE__ */ new Date("0000"));
 const MAX_INT = 2147483647;
@@ -13,7 +8,6 @@ export {
   DEFAULT_PAGE_SIZE,
   MAX_INT,
   Responsive,
-  defaultListOption,
   responsiveWidths,
   unsetDate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/constant",
-  "version": "0.9.41",
+  "version": "0.9.43",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/baseGql.d.ts

@@ -2,7 +2,16 @@ import "reflect-metadata";
 import { BaseObject, type Prettify, Type } from "@akanjs/base";
 import type { NonFunctionalKeys } from "./types";
 export declare const as: <T>(modelRef: Type<T>) => Type<T>;
-export declare const via: <T, LightOrFields extends readonly NonFunctionalKeys<Omit<T, "id" | "createdAt" | "updatedAt" | "removedAt">>[] | Type | undefined = undefined>(modelRef: Type<T>, fieldsOrLightModelRef?: LightOrFields, overwriteRef?: Type, overwriteLightRef?: Type) => LightOrFields extends undefined ? Type<Prettify<T & BaseObject>> : LightOrFields extends Type<infer Light> ? Type<Prettify<T & Light & BaseObject>> : LightOrFields extends readonly NonFunctionalKeys<Omit<T, "id" | "createdAt" | "updatedAt" | "removedAt">>[] ? Type<Prettify<{ [K in LightOrFields[number]]: T[K]; } & BaseObject>> : never;
-export declare const from: <A, T1, T2 = unknown, T3 = unknown, T4 = unknown, T5 = unknown, T6 = unknown, T7 = unknown, T8 = unknown, T9 = unknown, T10 = unknown>(modelRef: Type<A>, t1: Type<T1>, t2?: Type<T2>, t3?: Type<T3>, t4?: Type<T4>, t5?: Type<T5>, t6?: Type<T6>, t7?: Type<T7>, t8?: Type<T8>, t9?: Type<T9>, t10?: Type<T10>) => Type<A & T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9 & T10>;
-export declare const mixModelOf: <T1 = unknown, T2 = unknown, T3 = unknown, T4 = unknown, T5 = unknown, T6 = unknown, T7 = unknown, T8 = unknown, T9 = unknown, T10 = unknown, T11 = unknown, T12 = unknown, T13 = unknown, T14 = unknown, T15 = unknown, T16 = unknown, T17 = unknown, T18 = unknown, T19 = unknown, T20 = unknown>(t1: Type<T1>, t2?: Type<T2>, t3?: Type<T3>, t4?: Type<T4>, t5?: Type<T5>, t6?: Type<T6>, t7?: Type<T7>, t8?: Type<T8>, t9?: Type<T9>, t10?: Type<T10>, t11?: Type<T11>, t12?: Type<T12>, t13?: Type<T13>, t14?: Type<T14>, t15?: Type<T15>, t16?: Type<T16>, t17?: Type<T17>, t18?: Type<T18>, t19?: Type<T19>, t20?: Type<T20>) => Type<T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9 & T10 & T11 & T12 & T13 & T14 & T15 & T16 & T17 & T18 & T19 & T20>;
-export declare const over: <T1 = unknown, T2 = unknown, T3 = unknown, T4 = unknown, T5 = unknown, T6 = unknown, T7 = unknown, T8 = unknown, T9 = unknown, T10 = unknown, T11 = unknown, T12 = unknown, T13 = unknown, T14 = unknown, T15 = unknown, T16 = unknown, T17 = unknown, T18 = unknown, T19 = unknown, T20 = unknown>(t1: Type<T1>, t2?: Type<T2>, t3?: Type<T3>, t4?: Type<T4>, t5?: Type<T5>, t6?: Type<T6>, t7?: Type<T7>, t8?: Type<T8>, t9?: Type<T9>, t10?: Type<T10>, t11?: Type<T11>, t12?: Type<T12>, t13?: Type<T13>, t14?: Type<T14>, t15?: Type<T15>, t16?: Type<T16>, t17?: Type<T17>, t18?: Type<T18>, t19?: Type<T19>, t20?: Type<T20>) => Type<T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9 & T10 & T11 & T12 & T13 & T14 & T15 & T16 & T17 & T18 & T19 & T20>;
+type BaseFields = "id" | "createdAt" | "updatedAt" | "removedAt";
+type OmitBase<T> = Omit<T, BaseFields>;
+export declare function via<T>(modelRef: Type<T>): Type<Prettify<T & BaseObject>>;
+export declare function via<T, Light>(modelRef: Type<T>, lightModelRef: Type<Light>, overwriteRef?: Type, overwriteLightRef?: Type): Type<Prettify<T & Light & BaseObject>>;
+export declare function via<T, K extends NonFunctionalKeys<OmitBase<T>>>(modelRef: Type<T>, fields: readonly K[]): Type<Prettify<Pick<T, K> & BaseObject>>;
+type TypesFromArray<T extends Type[]> = {
+    [K in keyof T]: T[K] extends Type<infer U> ? U : never;
+}[number];
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+export declare const from: <A, T extends Type[]>(modelRef: Type<A>, ...types: T) => Type<A & UnionToIntersection<TypesFromArray<T>>>;
+export declare const mixModelOf: <T extends Type[]>(...types: T) => Type<UnionToIntersection<TypesFromArray<T>>>;
+export declare const over: <T extends Type[]>(...types: T) => Type<UnionToIntersection<TypesFromArray<T>>>;
+export {};

package/src/constantDecorator.d.ts

@@ -1,8 +1,8 @@
 import "reflect-metadata";
 import type { Type } from "@akanjs/base";
-import type { FilterType } from "./types";
+import type { DefaultOf, DocumentModel, FilterType, GetActionObject, GetStateObject, QueryOf, SortOf } from "./types";
 export declare const getCnstMeta: (refName: string) => ConstantModel<any, any, any, any, any, any>;
-export interface ConstantModel<T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary = any> {
+export interface ConstantModel<T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary = any, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<_Doc>, _Query = GetActionObject<Filter>, _Sort = SortOf<Filter>> {
     refName: T;
     Input: Type<Input>;
     Full: Type<Full>;
@@ -10,5 +10,22 @@ export interface ConstantModel<T extends string, Input, Full, Light, Insight, Fi
     Insight: Type<Insight>;
     Filter: Type<Filter>;
     Summary?: Type<Summary>;
+    _CapitalizedT: _CapitalizedT;
+    _Default: _Default;
+    _DefaultInput: _DefaultInput;
+    _DefaultState: _DefaultState;
+    _DefaultStateInput: _DefaultStateInput;
+    _Doc: _Doc;
+    _DocInput: _DocInput;
+    _QueryOfDoc: _QueryOfDoc;
+    _Query: _Query;
+    _Sort: _Sort;
 }
-export declare const cnstOf: <T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary>(refName: T, Input: Type<Input>, Full: Type<Full>, Light: Type<Light>, Insight: Type<Insight>, Filter: Type<Filter>, Summary?: Type<Summary>) => ConstantModel<T, Input, Full, Light, Insight, Filter, Summary>;
+export declare const cnstOf: <T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary>(refName: T, Input: Type<Input>, Full: Type<Full>, Light: Type<Light>, Insight: Type<Insight>, Filter: Type<Filter>, Summary?: Type<Summary>) => ConstantModel<T, Input, Full, Light, Insight, Filter, Summary, Capitalize<T>, DefaultOf<Full>, DefaultOf<Input>, GetStateObject<Full>, GetStateObject<Input>, DocumentModel<Full>, DocumentModel<Input>, QueryOf<DocumentModel<Full>>, GetActionObject<Filter>, SortOf<Filter>>;
+export interface ScalarConstantModel<T extends string, Model, _Default = DefaultOf<Model>, _Doc = DocumentModel<Model>> {
+    refName: T;
+    Model: Type<Model>;
+    _Default: _Default;
+    _Doc: _Doc;
+}
+export declare const scalarCnstOf: <T extends string, Model>(refName: T, Model: Type<Model>) => ScalarConstantModel<T, Model>;

package/src/types.d.ts

@@ -1,15 +1,27 @@
 import { type BaseObject, Dayjs, enumOf } from "@akanjs/base";
 import type { FilterQuery, HydratedDocument, ProjectionType } from "mongoose";
 export type { FilterQuery as QueryOf };
-type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
-type OptionalKeys<T> = T extends {
-    [key: string]: any;
-} ? {
-    [K in keyof T]-?: null extends T[K] ? K : never;
-}[keyof T] : never;
-type ObjectToId<O, D = Dayjs> = O extends BaseObject ? string : O extends BaseObject[] ? string[] : O extends Dayjs ? D : O extends {
+type ObjectToId<O> = O extends BaseObject ? string : O extends BaseObject[] ? string[] : O extends Dayjs ? Dayjs : O extends {
     [key: string]: any;
 } ? DocumentModel<O> : O;
+export type GetStateObject<T> = {
+    [K in keyof T as T[K] extends (...args: any) => any ? never : K extends "prototype" ? never : K]: T[K];
+};
+export type GetActionObject<T> = {
+    [K in keyof T as T[K] extends (...args: any) => any ? (K extends "prototype" ? never : K) : never]: T[K];
+};
+type NullToUndefinedWithObjectToId<T, StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>> = {
+    [K in StateKeys as null extends T[K] ? never : K]: ObjectToId<T[K]>;
+} & {
+    [K in StateKeys as null extends T[K] ? K : never]?: ObjectToId<Exclude<T[K], null>> | undefined;
+};
+export type DocumentModel<T> = T extends (infer S)[] ? DocumentModel<S>[] : T extends string | number | boolean | Dayjs ? T : T extends Map<infer K, infer V> ? Map<K, DocumentModel<V>> : NullToUndefinedWithObjectToId<T>;
+export type FieldState<T> = T extends {
+    id: string;
+} ? T | null : T;
+export type DefaultOf<S> = {
+    [K in keyof S]: FieldState<S[K]>;
+};
 export interface SortType {
     [key: string]: {
         [key: string]: number;
@@ -30,24 +42,9 @@ export interface FindQueryOption<Sort, Obj> {
     sample?: boolean;
     select?: ProjectionType<Obj>;
 }
-export type DocumentModel<T, D = Dayjs> = T extends (infer S)[] ? DocumentModel<S>[] : T extends string ? T : T extends number ? T : T extends boolean ? T : T extends Dayjs ? T : T extends Map<infer K, infer V> ? Map<K, DocumentModel<V, D>> : Optional<{
-    [K in keyof GetStateObject<T>]: T[K] extends infer S ? S extends null ? undefined : ObjectToId<T[K], D> : never;
-}, OptionalKeys<GetStateObject<T>>>;
-export interface ListOption {
-    limit?: number;
-    skip?: number;
-    sort?: string;
-}
-export declare const defaultListOption: ListOption;
 export type GetPlainObject<T, O extends string> = Omit<{
     [K in keyof T as T[K] extends (...args: any) => any ? never : K extends keyof HydratedDocument<any> ? never : K]: T[K];
 }, O>;
-export type GetStateObject<T> = Omit<{
-    [K in keyof T as T[K] extends (...args: any) => any ? never : K]: T[K];
-}, "prototype">;
-export type GetActionObject<T> = Omit<{
-    [K in keyof T as T[K] extends (...args: any) => any ? K : never]: T[K];
-}, "prototype">;
 export interface ProtoFile {
     id: string;
     filename: string;