unconventional 1.17.0 → 1.18.0

package/dist/core/base.model.d.ts

@@ -34,7 +34,7 @@ export declare class BaseModel extends Document {
     }): Promise<InstanceType<T> | null>;
     static truncate<T extends typeof BaseModel>(this: T): Promise<void>;
     static fromDatabaseJson<T extends typeof BaseModel>(this: T, json: object): InstanceType<T>;
-    private static addDefaults;
+    private static prepareData;
     /** Gets the field name to use for the provided identifier */
     private static getFieldName;
     /** Masks private fields and in the provided data and its relations */

package/dist/core/base.model.js

@@ -37,7 +37,7 @@ class BaseModel extends Document {
             type: unconventional_pg_queries_1.OneOrMany.One,
             table: this.collection,
             conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint),
-            data: this.addDefaults({ ...data, ...timestamp })
+            data: this.prepareData({ ...data, ...timestamp })
         });
         if (!response)
             return null;
@@ -54,7 +54,7 @@ class BaseModel extends Document {
             type: unconventional_pg_queries_1.OneOrMany.Many,
             table: this.collection,
             conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint),
-            data: data.map(item => this.addDefaults({ ...item, ...timestamp }))
+            data: data.map(item => this.prepareData({ ...item, ...timestamp }))
         });
         if (!response)
             return null;
@@ -108,7 +108,7 @@ class BaseModel extends Document {
             type: unconventional_pg_queries_1.OneOrMany.One,
             table: this.collection,
             where: [{ field: targetField, operator: unconventional_pg_queries_1.SqlWhereOperator.Eq, value: id }],
-            data: { ...data, ...timestamp }
+            data: this.prepareData({ ...data, ...timestamp }, false)
         });
         if (!response)
             return null;
@@ -121,7 +121,7 @@ class BaseModel extends Document {
             action: db_types_1.SqlAction.Update,
             type: unconventional_pg_queries_1.OneOrMany.Many,
             table: this.collection,
-            data: data.map(item => ({ ...item, ...timestamp }))
+            data: data.map(item => this.prepareData({ ...item, ...timestamp }, false))
         });
         if (!response)
             return null;
@@ -196,12 +196,17 @@ class BaseModel extends Document {
         Object.assign(model, json);
         return model;
     }
-    static addDefaults(data) {
+    static prepareData(data, applyDefaults = true) {
         Object.entries(this.schema.props).forEach(([key, options]) => {
-            if (data[key] === undefined && options.default != null) {
+            // Apply default
+            if (applyDefaults && data[key] === undefined && options.default != null) {
                 const val = options.default;
                 data[key] = typeof val === "function" ? val() : val;
             }
+            // Apply preFormat
+            if (data[key] !== undefined && options.preFormat != null) {
+                data[key] = options.preFormat(data[key]);
+            }
         });
         return data;
     }

package/dist/types/decorator.types.d.ts

@@ -68,6 +68,8 @@ export interface PropOptions<T = any, S extends typeof BaseModel = any, P extend
     private?: boolean | ((model: InstanceType<S>, field: T extends typeof BaseModel ? InstanceType<T> : T) => boolean);
     /** Relational field data */
     relation?: T extends typeof BaseModel ? Relation<T, S, P> : never;
+    /** Format the field value before it is stored in the database */
+    preFormat?: (fieldValue: T extends typeof BaseModel ? InstanceType<T> : T) => any;
 }
 /** Type for the Values stored in the Reflection for Properties */
 export type PropSummary<Target = any, Source extends typeof BaseModel = any> = Record<keyof Source, PropOptions<Target, Source>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "A complete server built on Cloudflare Workers/Pages",
   "keywords": [
     "cloudflare",