@proteinjs/db 1.5.6 → 1.5.8

package/src/Record.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@proteinjs/util';
+import { Logger } from '@proteinjs/logger';
 import { DateTimeColumn, UuidColumn } from './Columns';
 import { Column, Table, Columns } from './Table';
 import { moment } from './opt/moment';
@@ -44,7 +44,7 @@ export function withRecordColumns<T extends Record>(
 export type SerializedRecord = { [columnName: string]: any };
 
 export class RecordSerializer<T extends Record> {
-  private logger: Logger = new Logger(this.constructor.name);
+  private logger = new Logger({ name: this.constructor.name });
   private table: Table<T>;
 
   constructor(table: Table<T>) {
@@ -74,7 +74,7 @@ export class RecordSerializer<T extends Record> {
 
     if (omittedFields.length > 0) {
       // could mean the developer is passing in an object they don't expect
-      this.logger.warn(`Fields were omitted during serialization: ${omittedFields.join(', ')}`);
+      this.logger.warn({ message: `Fields were omitted during serialization`, obj: { omittedFields } });
     }
 
     return serialized;
@@ -96,7 +96,7 @@ export class RecordSerializer<T extends Record> {
 
     if (omittedFields.length > 0) {
       // expected when passing a base table into the query api
-      this.logger.debug(`Fields were omitted during deserialization: ${omittedFields.join(', ')}`);
+      this.logger.debug({ message: `Fields were omitted during deserialization`, obj: { omittedFields } });
     }
 
     return deserialized;

package/src/TableWatcherRunner.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@proteinjs/util';
+import { Logger } from '@proteinjs/logger';
 import { TableWatcherMap, getTableWatcherMap } from './TableWatcher';
 import { Record } from './Record';
 import { Table } from './Table';
@@ -6,7 +6,7 @@ import { QueryBuilder } from '@proteinjs/db-query';
 
 export class TableWatcherRunner<R extends Record = Record> {
   private static tableWatcherMap: TableWatcherMap;
-  private logger = new Logger(this.constructor.name);
+  private logger = new Logger({ name: this.constructor.name });
 
   constructor() {
     if (!TableWatcherRunner.tableWatcherMap) {
@@ -28,14 +28,14 @@ export class TableWatcherRunner<R extends Record = Record> {
       return record;
     }
 
-    this.logger.info(`(${table.name}) Running before-insert table watchers`);
+    this.logger.info({ message: `(${table.name}) Running before-insert table watchers` });
     let updatedRecord: any = record;
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeInsert`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeInsert` });
       updatedRecord = await tableWatcher.beforeInsert(updatedRecord);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeInsert`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeInsert` });
     }
-    this.logger.info(`(${table.name}) Finished running before-insert table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running before-insert table watchers` });
 
     return updatedRecord;
   }
@@ -51,13 +51,13 @@ export class TableWatcherRunner<R extends Record = Record> {
       return;
     }
 
-    this.logger.info(`(${table.name}) Running after-insert table watchers`);
+    this.logger.info({ message: `(${table.name}) Running after-insert table watchers` });
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterInsert`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterInsert` });
       await tableWatcher.afterInsert(record);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterInsert`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterInsert` });
     }
-    this.logger.info(`(${table.name}) Finished running after-insert table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running after-insert table watchers` });
   }
 
   async runBeforeUpdateTableWatchers<T extends R>(
@@ -75,15 +75,15 @@ export class TableWatcherRunner<R extends Record = Record> {
       return record;
     }
 
-    this.logger.info(`(${table.name}) Running before-update table watchers`);
+    this.logger.info({ message: `(${table.name}) Running before-update table watchers` });
     const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
     let updatedRecord: any = record;
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeUpdate`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeUpdate` });
       updatedRecord = await tableWatcher.beforeUpdate(updatedRecord, qbCopy);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeUpdate`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeUpdate` });
     }
-    this.logger.info(`(${table.name}) Finished running before-update table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running before-update table watchers` });
 
     return updatedRecord;
   }
@@ -104,14 +104,14 @@ export class TableWatcherRunner<R extends Record = Record> {
       return;
     }
 
-    this.logger.info(`(${table.name}) Running after-update table watchers`);
+    this.logger.info({ message: `(${table.name}) Running after-update table watchers` });
     const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterUpdate`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterUpdate` });
       await tableWatcher.afterUpdate(recordUpdateCount, record, qbCopy);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterUpdate`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterUpdate` });
     }
-    this.logger.info(`(${table.name}) Finished running after-update table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running after-update table watchers` });
   }
 
   async runBeforeDeleteTableWatchers<T extends R>(
@@ -129,14 +129,14 @@ export class TableWatcherRunner<R extends Record = Record> {
       return;
     }
 
-    this.logger.info(`(${table.name}) Running before-delete table watchers`);
+    this.logger.info({ message: `(${table.name}) Running before-delete table watchers` });
     const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeDelete`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeDelete` });
       await tableWatcher.beforeDelete(recordsToDelete, qbCopy);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeDelete`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeDelete` });
     }
-    this.logger.info(`(${table.name}) Finished running before-delete table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running before-delete table watchers` });
   }
 
   async runAfterDeleteTableWatchers<T extends R>(
@@ -155,13 +155,13 @@ export class TableWatcherRunner<R extends Record = Record> {
       return;
     }
 
-    this.logger.info(`(${table.name}) Running after-delete table watchers`);
+    this.logger.info({ message: `(${table.name}) Running after-delete table watchers` });
     const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
     for (const tableWatcher of tableWatchers) {
-      this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterDelete`);
+      this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterDelete` });
       await tableWatcher.afterDelete(recordDeleteCount, deletedRecords, qbCopy);
-      this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterDelete`);
+      this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterDelete` });
     }
-    this.logger.info(`(${table.name}) Finished running after-delete table watchers`);
+    this.logger.info({ message: `(${table.name}) Finished running after-delete table watchers` });
   }
 }

package/src/auth/TableServiceAuth.ts

@@ -1,9 +1,9 @@
-import { Logger } from '@proteinjs/util';
+import { Logger } from '@proteinjs/logger';
 import { Table, isTable } from '../Table';
 import { TableAuth } from './TableAuth';
 
 export class TableServiceAuth {
-  private logger = new Logger(this.constructor.name);
+  private logger = new Logger({ name: this.constructor.name });
 
   canAccess(methodName: string, args: any[]): boolean {
     try {
@@ -25,7 +25,7 @@ export class TableServiceAuth {
         throw new Error(`User is not authorized to access unsupported Db service api: ${methodName}`);
       }
     } catch (error: any) {
-      this.logger.error(error.stack);
+      this.logger.error({ message: `Failed evaluating auth for method: ${methodName}`, error });
       return false;
     }
 

package/src/reference/ReferenceArray.ts

@@ -4,7 +4,6 @@ import { Record } from '../Record';
 import { tableByName } from '../Table';
 import { ReferenceArraySerializerId } from '../serializers/ReferenceArraySerializer';
 import { QueryBuilderFactory } from '../QueryBuilderFactory';
-import { Logger } from '@proteinjs/util';
 /**
  * The object returned by Db functions for each field of type ReferenceArrayColumn in a record.
  * The reason for this is to make loading of reference records on-demand. For theoretically

package/src/schema/TableManager.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@proteinjs/util';
+import { Logger } from '@proteinjs/logger';
 import { Column, Table, getTables } from '../Table';
 import { SchemaOperations, TableChanges } from './SchemaOperations';
 import { SchemaMetadata } from './SchemaMetadata';
@@ -9,7 +9,7 @@ export interface ColumnTypeFactory {
 }
 
 export class TableManager {
-  private logger = new Logger(this.constructor.name);
+  private logger = new Logger({ name: this.constructor.name });
   public columnTypeFactory: ColumnTypeFactory;
   public schemaOperations: SchemaOperations;
   public schemaMetadata: SchemaMetadata;
@@ -40,14 +40,14 @@ export class TableManager {
     if (await this.tableExists(table)) {
       const tableChanges = await this.getTableChanges(table);
       if (this.shouldAlterTable(tableChanges)) {
-        this.logger.info(`Altering table: ${table.name}`);
+        this.logger.info({ message: `Altering table: ${table.name}` });
         await this.schemaOperations.alterTable(table, tableChanges);
-        this.logger.info(`Finished altering table: ${table.name}`);
+        this.logger.info({ message: `Finished altering table: ${table.name}` });
       }
     } else {
-      this.logger.info(`Creating table: ${table.name}`);
+      this.logger.info({ message: `Creating table: ${table.name}` });
       await this.schemaOperations.createTable(table);
-      this.logger.info(`Finished creating table: ${table.name}`);
+      this.logger.info({ message: `Finished creating table: ${table.name}` });
     }
   }
 

package/src/source/SourceRecordLoader.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@proteinjs/util';
+import { Logger } from '@proteinjs/logger';
 import { QueryBuilder } from '@proteinjs/db-query';
 import { getSourceRecordLoaders, SourceRecord, getSourceRecordTables } from './SourceRecord';
 import { Table } from '../Table';
@@ -10,7 +10,7 @@ type SourceRecordsMap = {
 };
 
 export class SourceRecordLoader {
-  private logger = new Logger(this.constructor.name);
+  private logger = new Logger({ name: this.constructor.name });
 
   async load() {
     const sourceRecordsMap = await this.getSourceRecordsMap();
@@ -45,9 +45,14 @@ export class SourceRecordLoader {
         new SourceRecordRepo().loadSourceRecord(table.name, sourceRecord as any);
       }
 
-      this.logger.info(
-        `(${table.name}) Loaded ${sourceRecords.length} ${sourceRecords.length == 1 ? 'record' : 'records'} from source (inserts: ${insertCount}, updates: ${updateCount}, deletes: ${deleteCount})`
-      );
+      this.logger.info({
+        message: `(${table.name}) Loaded ${sourceRecords.length} ${sourceRecords.length == 1 ? 'record' : 'records'} from source`,
+        obj: {
+          inserts: insertCount,
+          updates: updateCount,
+          deletes: deleteCount,
+        },
+      });
     }
   }
 

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Brent Bahry
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.