unconventional 1.7.0 → 1.8.0

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

@@ -4,7 +4,10 @@ import { FilterConfig, PageConfig, UpsertConfig } from "./base.options";
 interface BaseModelSchema {
     indexes: IndexSummary[];
     props: PropSummary;
-    timestamped?: boolean;
+    timestamp?: {
+        createdField: string;
+        updatedField: string;
+    };
 }
 export declare class Document {
     static schema: BaseModelSchema;
@@ -38,7 +41,7 @@ export declare class BaseModel extends Document {
     $key(): any;
     $owner(): any;
 }
-export declare abstract class TimeStamped extends BaseModel {
+export declare class TimeStamped extends BaseModel {
     createdAt?: Date;
     updatedAt?: Date;
 }

package/dist/core/base.model.js

@@ -28,9 +28,9 @@ class BaseModel extends Document {
     static db;
     id;
     static async create(data, upsertConfig) {
-        const timestamp = this.schema.timestamped ? {
-            updatedAt: new Date(),
-            createdAt: new Date()
+        const timestamp = this.schema.timestamp ? {
+            [this.schema.timestamp.createdField]: new Date(),
+            [this.schema.timestamp.updatedField]: new Date()
         } : {};
         const response = await this.db.fetch({
             action: db_types_1.SqlAction.Insert,
@@ -45,9 +45,9 @@ class BaseModel extends Document {
         return this.fromDatabaseJson(result);
     }
     static async createMany(data, upsertConfig) {
-        const timestamp = this.schema.timestamped ? {
-            updatedAt: new Date(),
-            createdAt: new Date()
+        const timestamp = this.schema.timestamp ? {
+            [this.schema.timestamp.createdField]: new Date(),
+            [this.schema.timestamp.updatedField]: new Date()
         } : {};
         const response = await this.db.fetch({
             action: db_types_1.SqlAction.Insert,
@@ -94,7 +94,7 @@ class BaseModel extends Document {
         return response ? response.map(item => this.fromDatabaseJson(item)) : [];
     }
     static async update(id, data) {
-        const timestamp = this.schema.timestamped ? { updatedAt: new Date() } : {};
+        const timestamp = this.schema.timestamp ? { [this.schema.timestamp.updatedField]: new Date() } : {};
         const targetField = this.getFieldName(id);
         if (!targetField)
             return null;
@@ -112,7 +112,7 @@ class BaseModel extends Document {
         return this.fromDatabaseJson(result);
     }
     static async updateMany(data) {
-        const timestamp = this.schema.timestamped ? { updatedAt: new Date() } : {};
+        const timestamp = this.schema.timestamp ? { [this.schema.timestamp.updatedField]: new Date() } : {};
         const response = await this.db.fetch({
             action: db_types_1.SqlAction.Update,
             type: unconventional_pg_queries_1.OneOrMany.Many,

package/dist/decorators/prop.decorator.js

@@ -21,7 +21,7 @@ function prop(options) {
         const child = target.constructor;
         if (child.schema === parent.schema) {
             child.schema = parent.schema
-                ? { indexes: [...parent.schema.indexes], props: { ...parent.schema.props }, timestamped: parent.schema.timestamped }
+                ? { indexes: [...parent.schema.indexes], props: { ...parent.schema.props }, timestamp: parent.schema.timestamp }
                 : { indexes: [], props: {} };
         }
         child.schema.props[key] = options || {};

package/dist/decorators/timestamp.decorator.d.ts

@@ -1,5 +1,5 @@
-import { TimeStamped } from '../core/base.model';
-import { TypedClassDecorator } from '../types/decorator.types';
+import { BaseModel } from '../core/base.model';
+import { TimestampOptions, TypedClassDecorator } from '../types/decorator.types';
 /**
  * Adds createdAt and updatedAt fields to the class and updates them on create/update calls.
  * @example Example:
@@ -8,5 +8,5 @@ import { TypedClassDecorator } from '../types/decorator.types';
  * class ClassName {}
  * ```
  */
-export declare function timestamp<T extends typeof TimeStamped>(): TypedClassDecorator<T>;
+export declare function timestamp<T extends typeof BaseModel>(options?: TimestampOptions): TypedClassDecorator<T>;
 export { timestamp as Timestamp };

package/dist/decorators/timestamp.decorator.js

@@ -9,9 +9,12 @@ exports.Timestamp = exports.timestamp = void 0;
  * class ClassName {}
  * ```
  */
-function timestamp() {
+function timestamp(options) {
     return (target) => {
-        target.schema.timestamped = true;
+        target.schema.timestamp = {
+            createdField: options?.createdField || 'createdAt',
+            updatedField: options?.updatedField || 'updatedAt'
+        };
     };
 }
 exports.timestamp = timestamp;

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

@@ -47,7 +47,7 @@ export interface Relation<Target extends typeof BaseModel = any, Source extends
     /** Details of the pivot table connecting this model to the related model */
     through?: RelationPivot<Pivot>;
 }
-/** Options to pass to MongoDB when creating or validating a property */
+/** Options to pass to the DB when creating or validating a property */
 export interface PropOptions<T = any, S extends typeof BaseModel = any, P extends typeof BaseModel = any> {
     /**
      * Is this value required?
@@ -71,3 +71,10 @@ export interface PropOptions<T = any, S extends typeof BaseModel = any, P extend
 }
 /** 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>>;
+/** Options to guide the timestamping of a model on create/update */
+export interface TimestampOptions {
+    /** The field to store the created date in */
+    createdField: string;
+    /** The field to store the updated date in */
+    updatedField: string;
+}

package/package.json

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