@ghom/orm 1.8.6 → 1.8.8

package/dist/app/backup.js

@@ -102,7 +102,6 @@ export async function enableForeignKeys(orm, trx) {
         sqlite3: () => ctx.raw("PRAGMA foreign_keys = 1;"),
         pg: () => ctx.raw("SET session_replication_role = DEFAULT;"),
     });
-    console.log("Foreign key constraints enabled.");
 }
 export async function disableForeignKeys(orm, run) {
     const trx = orm.clientBasedOperation({
@@ -132,7 +131,6 @@ export async function disableForeignKeys(orm, run) {
             return check;
         },
     });
-    console.log(`Foreign key constraints ${ran ? "" : "already "}disabled.`);
     try {
         await run(trx);
         await enableForeignKeys(orm, trx);

package/dist/app/orm.d.ts

@@ -46,9 +46,9 @@ export interface ORMConfig {
 export declare class ORM {
     config: ORMConfig;
     private _ready;
-    database: Knex;
+    database: Knex<any, unknown[]>;
     handler: Handler<Table<any>>;
-    _rawCache: ResponseCache<[sql: string], Knex.Raw>;
+    _rawCache: ResponseCache<[raw: string], Knex.Raw<any>>;
     constructor(config: ORMConfig);
     get cachedTables(): Table<any>[];
     get cachedTableNames(): string[];

package/dist/app/orm.js

@@ -21,8 +21,13 @@ export class ORM {
             },
         });
         this.handler = new Handler(config.tableLocation, {
-            loader: (filepath) => import(isCJS ? filepath : url.pathToFileURL(filepath).href).then((file) => file.default),
-            pattern: /\.js$/,
+            pattern: /\.[jt]s$/,
+            loader: async (filepath) => {
+                const file = await import(isCJS ? filepath : url.pathToFileURL(filepath).href);
+                if (file.default instanceof Table)
+                    return file.default;
+                throw new Error(`${filepath}: default export must be a Table instance`);
+            },
         });
         this._rawCache = new ResponseCache((raw) => this.raw(raw), config.caching ?? Infinity);
     }
@@ -57,8 +62,7 @@ export class ORM {
         }));
         const sortedTables = this.cachedTables.toSorted((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0));
         for (const table of sortedTables) {
-            table.orm = this;
-            await table.make();
+            await table.make(this);
         }
         this._ready = true;
     }

package/dist/app/table.d.ts

@@ -28,7 +28,7 @@ export declare class Table<Type extends object = object> {
     ], unknown>;
     _countCache?: ResponseCache<[where: string | null], Promise<number>>;
     constructor(options: TableOptions<Type>);
-    get db(): Knex<any, any[]>;
+    get db(): Knex<any, unknown[]>;
     get query(): Knex.QueryBuilder<Type, {
         _base: Type;
         _hasSelection: false;
@@ -50,6 +50,6 @@ export declare class Table<Type extends object = object> {
     getColumns(): Promise<Record<keyof Type & string, Knex.ColumnInfo>>;
     getColumnNames(): Promise<Array<keyof Type & string>>;
     isEmpty(): Promise<boolean>;
-    make(): Promise<this>;
+    make(orm: ORM): Promise<this>;
     private migrate;
 }

package/dist/app/table.js

@@ -62,9 +62,8 @@ export class Table {
     async isEmpty() {
         return this.count().then((count) => count === 0);
     }
-    async make() {
-        if (!this.orm)
-            throw new Error("missing ORM");
+    async make(orm) {
+        this.orm = orm;
         this._whereCache = new ResponseCache((cb) => cb(this.query), this.options.caching ?? this.orm?.config.caching ?? Infinity);
         this._countCache = new ResponseCache((where) => this.count(where ?? undefined), this.options.caching ?? this.orm?.config.caching ?? Infinity);
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.8.6",
+  "version": "1.8.8",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "sqlite3": "^5.1.6"
   },
   "dependencies": {
-    "@ghom/handler": "^2.0.0",
+    "@ghom/handler": "^3.1.0",
     "csv-parser": "^3.0.0",
     "json-2-csv": "^5.5.6",
     "knex": "^3.0.1"