akanjs 2.2.4-rc.4 → 2.2.4-rc.5

package/package.json

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

package/service/predefinedAdaptor/database.adaptor.ts

@@ -300,6 +300,13 @@ const jsonPath = (path: string) =>
     .map((part) => part.replaceAll('"', '\\"'))
     .join(".")}`;
 const encodeSqlValue = (value: unknown) => encodeDocumentValue(value);
+
+const decodeDateValue = (value: unknown) => {
+  if (value === null || value === undefined) return value;
+  if (typeof value === "number") return dayjs(value);
+  const epoch = Number(value);
+  return Number.isNaN(epoch) ? dayjs(value as never) : dayjs(epoch);
+};
 const QUERY_OPERATOR_KEYS = new Set([
   "eq",
   "ne",
@@ -773,8 +780,8 @@ 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 (doc[key] !== undefined && doc[key] !== null) {
+        doc[key] = this.normalizeWriteValue(doc[key], props);
       }
       if (props.enum && doc[key] !== undefined && doc[key] !== null) {
         const values = Array.isArray(doc[key]) ? doc[key] : [doc[key]];
@@ -992,8 +999,8 @@ export class SqliteDocumentStore {
       return new Map(entries.map(([key, item]) => [key, this.decodeMapValue(item, props)]));
     }
     if (props.modelRef === Date) {
-      if (Array.isArray(value)) return value.map((item) => (item === null ? item : dayjs(Number(item))));
-      return dayjs(Number(value));
+      if (Array.isArray(value)) return value.map((item) => (item === null ? item : decodeDateValue(item)));
+      return decodeDateValue(value);
     }
     if (Array.isArray(value)) return value.map((item) => this.decodeNestedValue(item, props));
     return this.decodeNestedValue(value, props);
@@ -1001,7 +1008,7 @@ export class SqliteDocumentStore {
 
   private decodeMapValue(value: unknown, props: Record<string, unknown>) {
     if (value === undefined || value === null) return value;
-    if (props.of === Date) return dayjs(Number(value));
+    if (props.of === Date) return decodeDateValue(value);
     return value;
   }
 
@@ -1024,8 +1031,13 @@ export class SqliteDocumentStore {
     return result;
   }
 
-  private applyNestedDefaults(value: unknown, props: Record<string, unknown>): unknown {
+  private normalizeWriteValue(value: unknown, props: Record<string, unknown>): unknown {
     if (value === undefined || value === null) return value;
+    if (props.modelRef === Date) {
+      if (Array.isArray(value))
+        return value.map((item) => (item === null || item === undefined ? item : dayjs(item as never)));
+      return dayjs(value as never);
+    }
     if (!props.isClass || !props.isScalar) return value;
     if (Array.isArray(value)) return value.map((item) => this.fillScalarDefaults(item, props));
     return this.fillScalarDefaults(value, props);
@@ -1040,7 +1052,7 @@ export class SqliteDocumentStore {
     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);
+      else result[key] = this.normalizeWriteValue(result[key], nestedProps);
     }
     return result;
   }

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

@@ -256,7 +256,7 @@ export declare class SqliteDocumentStore {
     private decodeFieldValue;
     private decodeMapValue;
     private decodeNestedValue;
-    private applyNestedDefaults;
+    private normalizeWriteValue;
     private fillScalarDefaults;
     hydrate(data: DocumentRecord, originalData?: DocumentRecord): any;
     private runHooks;