@ghom/orm 1.1.1 → 1.1.2

package/dist/app/orm.d.ts

@@ -1,8 +1,8 @@
 import { Handler } from "@ghom/handler";
 import { Knex } from "knex";
 export interface ORMLogger {
-    log: (message: string | number, ...parts: (string | number)[]) => unknown;
-    error: (err: Error | string | number, ...parts: (string | number)[]) => unknown;
+    log: (message: string, section?: string) => void;
+    error: (text: string | Error, _path: string, full?: boolean) => void;
 }
 /**
  * @property tablePath - path to directory that contains js files of tables

package/dist/app/table.d.ts

@@ -17,7 +17,7 @@ export declare class Table<Type> {
     readonly options: TableOptions<Type>;
     orm?: ORM;
     constructor(options: TableOptions<Type>);
-    private get verbose();
+    private get filepath();
     private get logger();
     get db(): Knex<any, Record<string, any>[]>;
     get query(): Knex.QueryBuilder<Type, {

package/dist/app/table.js

@@ -1,14 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Table = void 0;
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
 class Table {
     constructor(options) {
         this.options = options;
     }
-    get verbose() {
+    get filepath() {
         if (!this.orm)
             throw new Error("missing ORM");
-        return !!this.orm.ormConfig.logger;
+        return path_1.default.relative(process.cwd(), path_1.default.join(this.orm.ormConfig.tablePath, this.options.name + ".ts"));
     }
     get logger() {
         if (!this.orm)
@@ -35,25 +40,25 @@ class Table {
     async make() {
         try {
             await this.db.schema.createTable(this.options.name, this.options.setup);
-            this.logger?.log(`created table ${this.options.name}`);
+            this.logger?.log(`created table ${chalk_1.default.blueBright(this.options.name)}`);
         }
         catch (error) {
             if (error.toString().includes("syntax error")) {
-                this.logger?.error(`you need to implement the "setup" method in options of your ${this.options.name} table!`);
+                this.logger?.error(`you need to implement the "setup" method in options of your ${chalk_1.default.blueBright(this.options.name)} table!`, this.filepath);
                 throw error;
             }
             else {
-                this.logger?.log("loaded table", this.options.name);
+                this.logger?.log(`loaded table ${chalk_1.default.blueBright(this.options.name)}`);
             }
         }
         try {
             const migrated = await this.migrate();
             if (migrated !== false) {
-                this.logger?.log("migrated table", this.options.name, "to version", migrated);
+                this.logger?.log(`migrated table ${chalk_1.default.blueBright(this.options.name)} to version ${chalk_1.default.magentaBright(migrated)}`);
             }
         }
         catch (error) {
-            this.logger?.error(error);
+            this.logger?.error(error, this.filepath);
         }
         await this.options.then?.bind(this)(this);
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@ghom/handler": "^1.1.0",
+    "chalk": "^4.1.2",
     "knex": "^1.0.3"
   }
 }

package/src/app/orm.ts

@@ -3,11 +3,8 @@ import { Knex, default as knex } from "knex"
 import { MigrationData, Table } from "./table"
 
 export interface ORMLogger {
-  log: (message: string | number, ...parts: (string | number)[]) => unknown
-  error: (
-    err: Error | string | number,
-    ...parts: (string | number)[]
-  ) => unknown
+  log: (message: string, section?: string) => void
+  error: (text: string | Error, _path: string, full?: boolean) => void
 }
 
 /**

package/src/app/table.ts

@@ -1,3 +1,5 @@
+import path from "path"
+import chalk from "chalk"
 import { Knex } from "knex"
 import { ORM } from "./orm.js"
 
@@ -19,9 +21,12 @@ export class Table<Type> {
 
   constructor(public readonly options: TableOptions<Type>) {}
 
-  private get verbose() {
+  private get filepath() {
     if (!this.orm) throw new Error("missing ORM")
-    return !!this.orm.ormConfig.logger
+    return path.relative(
+      process.cwd(),
+      path.join(this.orm.ormConfig.tablePath, this.options.name + ".ts")
+    )
   }
 
   private get logger() {
@@ -52,16 +57,19 @@ export class Table<Type> {
   async make(): Promise<this> {
     try {
       await this.db.schema.createTable(this.options.name, this.options.setup)
-      this.logger?.log(`created table ${this.options.name}`)
+      this.logger?.log(`created table ${chalk.blueBright(this.options.name)}`)
     } catch (error: any) {
       if (error.toString().includes("syntax error")) {
         this.logger?.error(
-          `you need to implement the "setup" method in options of your ${this.options.name} table!`
+          `you need to implement the "setup" method in options of your ${chalk.blueBright(
+            this.options.name
+          )} table!`,
+          this.filepath
         )
 
         throw error
       } else {
-        this.logger?.log("loaded table", this.options.name)
+        this.logger?.log(`loaded table ${chalk.blueBright(this.options.name)}`)
       }
     }
 
@@ -70,14 +78,13 @@ export class Table<Type> {
 
       if (migrated !== false) {
         this.logger?.log(
-          "migrated table",
-          this.options.name,
-          "to version",
-          migrated
+          `migrated table ${chalk.blueBright(
+            this.options.name
+          )} to version ${chalk.magentaBright(migrated)}`
         )
       }
     } catch (error: any) {
-      this.logger?.error(error)
+      this.logger?.error(error, this.filepath)
     }
 
     await this.options.then?.bind(this)(this)