akanjs 2.2.4-rc.3 → 2.2.4-rc.4

package/constant/getDefault.ts

@@ -6,7 +6,7 @@ export const getDefault = <T>(fieldObj: FieldObject): DefaultOf<T> => {
   const result: Record<string, unknown> = {};
   for (const [key, field] of Object.entries(fieldObj)) {
     if (field.fieldType === "hidden") result[key] = null;
-    else if (field.default) {
+    else if (field.default !== undefined && field.default !== null) {
       if (typeof field.default === "function") result[key] = (field.default as () => object)();
       else result[key] = field.default as object;
     } else if (field.isArray) result[key] = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.2.4-rc.3",
+  "version": "2.2.4-rc.4",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/service/predefinedAdaptor/database.adaptor.ts

@@ -4,7 +4,7 @@ import { mkdir } from "node:fs/promises";
 import path from "node:path";
 import type { InArgs, InValue, Client as LibsqlClient } from "@libsql/client";
 import { type BaseEnv, dayjs, FIELD_META, type PromiseOrObject } from "akanjs/base";
-import type { ConstantModel } from "akanjs/constant";
+import { type ConstantModel, getDefault } from "akanjs/constant";
 import {
   createDocumentId,
   type DatabaseModel,
@@ -773,6 +773,9 @@ export class SqliteDocumentStore {
       } else {
         doc[key] = value;
       }
+      if ((props.isClass as boolean) && (props.isScalar as boolean) && doc[key] !== undefined && doc[key] !== null) {
+        doc[key] = this.applyNestedDefaults(doc[key], props);
+      }
       if (props.enum && doc[key] !== undefined && doc[key] !== null) {
         const values = Array.isArray(doc[key]) ? doc[key] : [doc[key]];
         const fieldEnum = props.enum as { has: (value: unknown) => boolean } | undefined;
@@ -958,12 +961,28 @@ export class SqliteDocumentStore {
 
   private decodeDocumentPayload(payload: Record<string, unknown>) {
     const fields = this.database.doc[FIELD_META] as unknown as FieldMap;
-    return Object.fromEntries(
-      Object.entries(payload).map(([key, value]) => {
-        const props = fields[key]?.getProps?.();
-        return [key, props ? this.decodeFieldValue(value, props) : value];
-      }),
-    );
+    const result: Record<string, unknown> = {};
+    for (const [key, fieldMeta] of Object.entries(fields)) {
+      if (BASE_COLUMNS.has(key)) continue;
+      const props = fieldMeta.getProps();
+      const value = payload[key];
+      if (value === undefined) {
+        const def = props.default;
+        if (def !== undefined && def !== null) {
+          result[key] = typeof def === "function" ? (def as (data: unknown) => unknown)(payload) : def;
+        } else if (props.nullable) {
+          result[key] = null;
+        }
+      } else {
+        result[key] = this.decodeFieldValue(value, props);
+      }
+    }
+    for (const [key, value] of Object.entries(payload)) {
+      if (key in result || BASE_COLUMNS.has(key)) continue;
+      const props = fields[key]?.getProps?.();
+      result[key] = props ? this.decodeFieldValue(value, props) : value;
+    }
+    return result;
   }
 
   private decodeFieldValue(value: unknown, props: Record<string, unknown>): unknown {
@@ -991,12 +1010,39 @@ export class SqliteDocumentStore {
     if (!props.isClass || !props.isScalar) return value;
     const scalarFields = (props.modelRef as { [FIELD_META]?: FieldMap } | undefined)?.[FIELD_META];
     if (!scalarFields) return value;
-    return Object.fromEntries(
-      Object.entries(value as Record<string, unknown>).map(([key, nested]) => {
-        const nestedProps = scalarFields[key]?.getProps?.();
-        return [key, nestedProps ? this.decodeFieldValue(nested, nestedProps) : nested];
-      }),
-    );
+    const source = value as Record<string, unknown>;
+    const defaults = getDefault(scalarFields as never) as Record<string, unknown>;
+    const result: Record<string, unknown> = {};
+    for (const [key, fieldMeta] of Object.entries(scalarFields)) {
+      const nestedProps = fieldMeta.getProps();
+      const nested = source[key];
+      result[key] = nested === undefined ? defaults[key] : this.decodeFieldValue(nested, nestedProps);
+    }
+    for (const [key, nested] of Object.entries(source)) {
+      if (!(key in result)) result[key] = nested;
+    }
+    return result;
+  }
+
+  private applyNestedDefaults(value: unknown, props: Record<string, unknown>): unknown {
+    if (value === undefined || value === null) return value;
+    if (!props.isClass || !props.isScalar) return value;
+    if (Array.isArray(value)) return value.map((item) => this.fillScalarDefaults(item, props));
+    return this.fillScalarDefaults(value, props);
+  }
+
+  private fillScalarDefaults(value: unknown, props: Record<string, unknown>): unknown {
+    if (!value || typeof value !== "object") return value;
+    const scalarFields = (props.modelRef as { [FIELD_META]?: FieldMap } | undefined)?.[FIELD_META];
+    if (!scalarFields) return value;
+    const defaults = getDefault(scalarFields as never) as Record<string, unknown>;
+    const result = { ...(value as Record<string, unknown>) };
+    for (const [key, fieldMeta] of Object.entries(scalarFields)) {
+      const nestedProps = fieldMeta.getProps();
+      if (result[key] === undefined) result[key] = defaults[key];
+      else result[key] = this.applyNestedDefaults(result[key], nestedProps);
+    }
+    return result;
   }
 
   hydrate(data: DocumentRecord, originalData: DocumentRecord = data) {

package/types/service/predefinedAdaptor/database.adaptor.d.ts

@@ -1,7 +1,7 @@
 import { Database } from "bun:sqlite";
 import type { Client as LibsqlClient } from "@libsql/client";
 import { type BaseEnv, type PromiseOrObject } from "akanjs/base";
-import type { ConstantModel } from "akanjs/constant";
+import { type ConstantModel } from "akanjs/constant";
 import { type DatabaseModel, type DocumentQuery, type DocumentSchema, type DocumentUpdate, type DocumentUpdateOptions, type SchemaOf } from "akanjs/document";
 import type { Sql } from "postgres";
 export interface SqliteDatabaseConfig {
@@ -256,6 +256,8 @@ export declare class SqliteDocumentStore {
     private decodeFieldValue;
     private decodeMapValue;
     private decodeNestedValue;
+    private applyNestedDefaults;
+    private fillScalarDefaults;
     hydrate(data: DocumentRecord, originalData?: DocumentRecord): any;
     private runHooks;
     private insertStmt;

package/ui/Dialog/Modal.tsx

@@ -185,7 +185,7 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
   return createPortal(
     <>
       <div
-        className={clsx("fixed inset-0 z-10", showBackground && "animate-fadeIn bg-base-content/50 backdrop-blur-md")}
+        className={clsx("fixed inset-0 z-10", showBackground && "animate-fadeIn bg-black/50 backdrop-blur-md")}
         onClick={(event) => {
           if (event.target !== event.currentTarget) return;
           requestClose();