akanjs 2.3.1 → 2.3.2-rc.1

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.1",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

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 {};

package/ui/Field.tsx

@@ -1345,10 +1345,7 @@ const ParentId = <T extends string, State, Input, Full extends { id: string }, L
         labelClassName={labelClassName}
         selectClassName={selectClassName}
         value={value}
-        options={modelList.map((model) => {
-          const label = renderOption?.(model) ?? model.id;
-          return { label: typeof label === "string" ? label : model.id, value: model.id };
-        })}
+        options={modelList.map((model) => model.id)}
         renderOption={(renderId) => {
           if (!renderId) return null;
           const model = modelList.get(renderId);