@proteinjs/db 1.15.3 → 1.17.0

package/src/Table.ts

@@ -1,6 +1,6 @@
 import { Loadable, SourceRepository } from '@proteinjs/reflection';
 import { CustomSerializableObject } from '@proteinjs/serializer';
-import { Record, RecordSerializer } from './Record';
+import { isRecordColumn, Record } from './Record';
 import { TableSerializerId } from './serializers/TableSerializer';
 import { QueryBuilder } from '@proteinjs/db-query';
 import { Identity, TableOperationsAuth } from './auth/TableAuth';
@@ -44,7 +44,10 @@ export const getColumnByName = (table: Table<any>, columnName: string) => {
 };
 
 export const addDefaultFieldValues = async (table: Table<any>, record: any, runAsSystem: boolean) => {
-  for (const columnPropertyName in table.columns) {
+  // Get defaultFieldValue for Record columns first
+  const columns = Object.keys(table.columns).sort((a, b) => +!isRecordColumn(a) - +!isRecordColumn(b));
+
+  for (const columnPropertyName of columns) {
     const column = (table.columns as any)[columnPropertyName] as Column<any, any>;
     if (
       column.options?.defaultValue &&
@@ -144,13 +147,14 @@ export type ColumnOptions = {
   references?: { table: string };
   nullable?: boolean;
   /** Value stored on insert */
-  defaultValue?: (table: Table<any>, insertObj: any) => Promise<any>;
+  defaultValue?: (table: Table<any>, insertObj: any & Record) => Promise<any>;
   /** If true, the `defaultValue` function will always provide the value and override any existing value */
   forceDefaultValue?: boolean | ((runAsSystem: boolean) => boolean);
   /** Value stored on update */
   updateValue?: (table: Table<any>, updateObj: any) => Promise<any>;
   /** Add conditions to query; called on every query of this table */
   addToQuery?: (qb: QueryBuilder, runAsSystem: boolean) => Promise<void>;
+  onBeforeInsert?: (insertObj: any & Record, runAsSystem: boolean) => Promise<void>;
   ui?: {
     hidden?: boolean;
   };

package/src/TableWatcher.ts

@@ -72,6 +72,15 @@ export interface TableWatcher<R extends Record = Record> extends Loadable {
   afterInsert?<T extends R>(record: T): Promise<void>;
   beforeUpdate?<T extends R>(record: Partial<T>, qb: QueryBuilder<T>): Promise<Partial<T>>;
   afterUpdate?<T extends R>(recordUpdateCount: number, record: Partial<T>, qb: QueryBuilder<T>): Promise<void>;
-  beforeDelete?<T extends R>(recordsToDelete: T[], qb: QueryBuilder<T>): Promise<void>;
-  afterDelete?<T extends R>(recordDeleteCount: number, deletedRecords: T[], qb: QueryBuilder<T>): Promise<void>;
+  beforeDelete?<T extends R>(
+    recordsToDelete: T[],
+    initialQb: QueryBuilder<T>,
+    deleteQb: QueryBuilder<T>
+  ): Promise<void>;
+  afterDelete?<T extends R>(
+    recordDeleteCount: number,
+    deletedRecords: T[],
+    initialQb: QueryBuilder<T>,
+    deleteQb: QueryBuilder<T>
+  ): Promise<void>;
 }

package/src/TableWatcherRunner.ts

@@ -117,7 +117,8 @@ export class TableWatcherRunner<R extends Record = Record> {
   async runBeforeDeleteTableWatchers<T extends R>(
     table: Table<T>,
     recordsToDelete: T[],
-    qb: QueryBuilder<T>
+    initialQb: QueryBuilder<T>,
+    deleteQb: QueryBuilder<T>
   ): Promise<void> {
     const tableWatcherMap = TableWatcherRunner.tableWatcherMap[table.name];
     if (!tableWatcherMap) {
@@ -130,10 +131,10 @@ export class TableWatcherRunner<R extends Record = Record> {
     }
 
     this.logger.info({ message: `(${table.name}) Running before-delete table watchers` });
-    const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
+    const initialQbCopy = QueryBuilder.fromQueryBuilder(initialQb, table.name);
     for (const tableWatcher of tableWatchers) {
       this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeDelete` });
-      await tableWatcher.beforeDelete(recordsToDelete, qbCopy);
+      await tableWatcher.beforeDelete(recordsToDelete, initialQbCopy, deleteQb);
       this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeDelete` });
     }
     this.logger.info({ message: `(${table.name}) Finished running before-delete table watchers` });
@@ -143,7 +144,8 @@ export class TableWatcherRunner<R extends Record = Record> {
     table: Table<T>,
     recordDeleteCount: number,
     deletedRecords: T[],
-    qb: QueryBuilder<T>
+    initialQb: QueryBuilder<T>,
+    deleteQb: QueryBuilder<T>
   ): Promise<void> {
     const tableWatcherMap = TableWatcherRunner.tableWatcherMap[table.name];
     if (!tableWatcherMap) {
@@ -156,10 +158,10 @@ export class TableWatcherRunner<R extends Record = Record> {
     }
 
     this.logger.info({ message: `(${table.name}) Running after-delete table watchers` });
-    const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
+    const initialQbCopy = QueryBuilder.fromQueryBuilder(initialQb, table.name);
     for (const tableWatcher of tableWatchers) {
       this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterDelete` });
-      await tableWatcher.afterDelete(recordDeleteCount, deletedRecords, qbCopy);
+      await tableWatcher.afterDelete(recordDeleteCount, deletedRecords, initialQbCopy, deleteQb);
       this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterDelete` });
     }
     this.logger.info({ message: `(${table.name}) Finished running after-delete table watchers` });