@ghom/orm 1.9.0 → 1.9.2

package/dist/app/orm.d.ts

@@ -2,7 +2,7 @@ import { Handler } from "@ghom/handler";
 import { Knex } from "knex";
 import { TextStyle } from "./util.js";
 import { Table } from "./table.js";
-import { ResponseCache } from "./caching.js";
+import { CachedQuery } from "@ghom/query";
 export interface ILogger {
     log: (message: string) => void;
     error: (error: string | Error) => void;
@@ -49,7 +49,7 @@ export declare class ORM {
     private _ready;
     client: Knex<any, unknown[]>;
     handler: Handler<Table<any>>;
-    _rawCache: ResponseCache<[raw: string], Knex.Raw<any>>;
+    _rawCache: CachedQuery<[raw: string], any>;
     constructor(config: ORMConfig);
     get cachedTables(): Table<any>[];
     get cachedTableNames(): string[];
@@ -61,7 +61,7 @@ export declare class ORM {
     init(): Promise<void>;
     raw(sql: Knex.Value): Knex.Raw;
     cache: {
-        raw: (sql: string, anyDataUpdated?: boolean) => Knex.Raw;
+        raw: (sql: string, anyDataUpdated?: boolean) => Promise<Knex.Raw>;
         invalidate: () => void;
     };
     clientBasedOperation<Return>(operation: Partial<Record<"pg" | "mysql2" | "sqlite3", () => Return>>): Return | undefined;

package/dist/app/orm.js

@@ -3,7 +3,7 @@ import { Handler } from "@ghom/handler";
 import { default as knex } from "knex";
 import { isCJS } from "./util.js";
 import { Table } from "./table.js";
-import { ResponseCache } from "./caching.js";
+import { CachedQuery } from "@ghom/query";
 import { backupTable, restoreBackup, disableForeignKeys, enableForeignKeys, } from "./backup.js";
 export class ORM {
     config;
@@ -29,7 +29,7 @@ export class ORM {
                 throw new Error(`${filepath}: default export must be a Table instance`);
             },
         });
-        this._rawCache = new ResponseCache((raw) => this.raw(raw), config.caching ?? Infinity);
+        this._rawCache = new CachedQuery(async (raw) => await this.raw(raw), config.caching ?? Infinity);
     }
     get cachedTables() {
         return [...this.handler.elements.values()];

package/dist/app/table.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from "knex";
 import { ORM } from "./orm.js";
-import { ResponseCache } from "./caching.js";
+import { CachedQuery } from "@ghom/query";
 export interface MigrationData {
     table: string;
     version: number;
@@ -23,10 +23,10 @@ export interface TableOptions<Type extends object = object> {
 export declare class Table<Type extends object = object> {
     readonly options: TableOptions<Type>;
     orm?: ORM;
-    _whereCache?: ResponseCache<[
+    _whereCache?: CachedQuery<[
         cb: (query: Table<Type>["query"]) => unknown
     ], unknown>;
-    _countCache?: ResponseCache<[where: string | null], Promise<number>>;
+    _countCache?: CachedQuery<[where: string | null], number>;
     constructor(options: TableOptions<Type>);
     get db(): Knex<any, unknown[]>;
     get query(): Knex.QueryBuilder<Type, {

package/dist/app/table.js

@@ -1,5 +1,5 @@
 import { styled } from "./util.js";
-import { ResponseCache } from "./caching.js";
+import { CachedQuery } from "@ghom/query";
 export class Table {
     options;
     orm;
@@ -63,8 +63,8 @@ export class Table {
     }
     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);
+        this._whereCache = new CachedQuery((cb) => cb(this.query), this.options.caching ?? this.orm?.config.caching ?? Infinity);
+        this._countCache = new CachedQuery((where) => this.count(where ?? undefined), this.options.caching ?? this.orm?.config.caching ?? Infinity);
         const tableNameLog = `table ${styled(this.orm, this.options.name, "highlight")}${this.options.description
             ? ` ${styled(this.orm, this.options.description, "description")}`
             : ""}`;
@@ -109,14 +109,14 @@ export class Table {
             version: -Infinity,
         };
         const baseVersion = data.version;
-        await this.db.schema.alterTable(this.options.name, (builder) => {
-            migrations.forEach((migration, version) => {
+        for (const [version, migration] of migrations) {
+            await this.db.schema.alterTable(this.options.name, (builder) => {
                 if (version <= data.version)
                     return;
                 migration(builder);
                 data.version = version;
             });
-        });
+        }
         await this.db("migration")
             .insert(data)
             .onConflict("table")

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./app/orm.js";
 export * from "./app/table.js";
-export * from "./app/caching.js";
 export * from "./app/backup.js";
 export * from "./app/util.js";

package/dist/index.js

@@ -1,5 +1,4 @@
 export * from "./app/orm.js";
 export * from "./app/table.js";
-export * from "./app/caching.js";
 export * from "./app/backup.js";
 export * from "./app/util.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@ghom/handler": "^3.1.0",
+    "@ghom/query": "1.0.0",
     "csv-parser": "^3.0.0",
     "json-2-csv": "^5.5.6",
     "knex": "^3.0.1"

package/tests/tables/b.js

@@ -6,7 +6,9 @@ import { Table } from "../.."
 export default new Table({
   name: "b",
   migrations: {
-    0: (table) =>
+    0: (table) => table.string("c_id"),
+    1: (table) => table.dropColumn("c_id"),
+    2: (table) =>
       table
         .integer("c_id")
         .unsigned()

package/dist/app/caching.d.ts

@@ -1,18 +0,0 @@
-export interface ResponseCacheData<Value> {
-    value: Value;
-    expires: number;
-    outdated?: boolean;
-}
-/**
- * Advanced cache for async queries
- */
-export declare class ResponseCache<Params extends any[], Value> {
-    private _request;
-    private _timeout;
-    private _cache;
-    constructor(_request: (...params: Params) => Value, _timeout: number);
-    get(id: string, ...params: Params): Value;
-    fetch(id: string, ...params: Params): Value;
-    invalidate(): void;
-    invalidate(id: string): void;
-}

package/dist/app/caching.js

@@ -1,36 +0,0 @@
-/**
- * Advanced cache for async queries
- */
-export class ResponseCache {
-    _request;
-    _timeout;
-    _cache = new Map();
-    constructor(_request, _timeout) {
-        this._request = _request;
-        this._timeout = _timeout;
-    }
-    get(id, ...params) {
-        const cached = this._cache.get(id);
-        if (!cached || cached.expires < Date.now()) {
-            this._cache.set(id, {
-                value: this._request(...params),
-                expires: Date.now() + this._timeout,
-            });
-        }
-        return this._cache.get(id).value;
-    }
-    fetch(id, ...params) {
-        this._cache.set(id, {
-            value: this._request(...params),
-            expires: Date.now() + this._timeout,
-        });
-        return this._cache.get(id).value;
-    }
-    invalidate(id) {
-        if (!id) {
-            this._cache.clear();
-            return;
-        }
-        this._cache.delete(id);
-    }
-}