@paroicms/server-text-cache-system 1.12.1 → 1.13.0

package/dist/db-init/db-init.d.ts

@@ -1,11 +1,11 @@
 import { type AppLogger } from "@paroicms/internal-server-lib";
-import type { DataSource } from "typeorm";
+import type { Knex } from "knex";
 export declare function createOrOpenConnection({ sqliteFile, appVersion, logger, }: {
     sqliteFile: string;
     appVersion: string;
     logger: AppLogger;
 }): Promise<{
-    cn: DataSource;
+    cn: Knex<any, any[]>;
     logNextQuery: (count?: number) => void;
     isCleared: boolean;
 }>;

package/dist/db-init/db-init.js

@@ -3,18 +3,15 @@ import { join } from "node:path";
 import { packageDir } from "../constants.js";
 import { clearCacheValues } from "../internal/queries.js";
 import { currentDbSchemaVersion, dbSchemaName, migrateTextCacheDb } from "./ddl-migration.js";
-import { PaTextCacheEntity } from "./entities/PaTextCache.entity.js";
-import { PaTextCacheDependencyEntity } from "./entities/PaTextCacheDependency.entity.js";
 export async function createOrOpenConnection({ sqliteFile, appVersion, logger, }) {
-    const { logNextQuery, typeOrmLogger } = createSqlLogger({ logger, dbSchemaName });
+    const { logNextQuery, knexLogger } = createSqlLogger({ logger, dbSchemaName });
     const { cn, isNewDatabase, migrationReport } = await createOrOpenSqliteConnection({
         canCreate: true,
         dbSchemaName,
         sqliteFile,
         ddlFile: join(packageDir, "ddl", "text-cache.ddl.sql"),
         migrateDb,
-        entities: [PaTextCacheEntity, PaTextCacheDependencyEntity],
-        typeOrmLogger,
+        knexLogger,
         logger,
     });
     let isCleared = isNewDatabase || migrationReport.migrated;

package/dist/db-init/db-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAEzF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,UAAU,EACV,MAAM,GACwD;IAC9D,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IAElF,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,MAAM,4BAA4B,CAAC;QAChF,SAAS,EAAE,IAAI;QACf,YAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC;QACtD,SAAS;QACT,QAAQ,EAAE,CAAC,iBAAiB,EAAE,2BAA2B,CAAC;QAC1D,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,SAAS,GAAG,aAAa,IAAI,eAAe,CAAC,QAAQ,CAAC;IAE1D,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IACzF,IAAI,gBAAgB,KAAK,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CACT,qDAAqD,gBAAgB,OAAO,UAAU,EAAE,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,kBAAkB,CAAC,EAAE,EAAE;YAC3B,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sBAAsB;SACtC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC"}
+{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE9F,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,UAAU,EACV,MAAM,GACwD;IAC9D,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IAE/E,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,MAAM,4BAA4B,CAAC;QAChF,SAAS,EAAE,IAAI;QACf,YAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC;QACtD,SAAS;QACT,UAAU;QACV,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,SAAS,GAAG,aAAa,IAAI,eAAe,CAAC,QAAQ,CAAC;IAE1D,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IACzF,IAAI,gBAAgB,KAAK,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CACT,qDAAqD,gBAAgB,OAAO,UAAU,EAAE,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,UAAU,SAAS,CAAC,EAAQ;QAC/B,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,kBAAkB,CAAC,EAAE,EAAE;YAC3B,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sBAAsB;SACtC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC"}

package/dist/db-init/ddl-migration.d.ts

@@ -1,8 +1,8 @@
 import type { AppLogger } from "@paroicms/public-server-lib";
-import type { DataSource } from "typeorm";
+import type { Knex } from "knex";
 export declare const dbSchemaName = "text-cache";
 export declare const currentDbSchemaVersion = 3;
-export declare function migrateTextCacheDb(cn: DataSource, { fromVersion, logger }: {
+export declare function migrateTextCacheDb(cn: Knex, { fromVersion, logger }: {
     fromVersion: number;
     logger: AppLogger;
 }): Promise<void>;

package/dist/db-init/ddl-migration.js

@@ -7,10 +7,10 @@ export async function migrateTextCacheDb(cn, { fromVersion, logger }) {
     const toVersion = currentDbSchemaVersion;
     let currentVersion = fromVersion;
     if (currentVersion <= 2) {
-        await cn.query("drop table if exists PaTextCacheScheduledInvalidation");
-        await cn.query("drop index if exists PaTextCacheDependency_depK_index");
-        await cn.query("drop table if exists PaTextCacheDependency");
-        await cn.query("drop table if exists PaTextCache");
+        await cn.schema.dropTableIfExists("PaTextCacheScheduledInvalidation");
+        await cn.schema.raw("drop index if exists PaTextCacheDependency_depK_index");
+        await cn.schema.dropTableIfExists("PaTextCacheDependency");
+        await cn.schema.dropTableIfExists("PaTextCache");
     }
     // We don't care losing cache data
     if (currentVersion < toVersion) {

package/dist/db-init/ddl-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAEvF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,EAA8C;IAEnE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC7D,MAAM,EAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACrD,CAAC;IAED,kCAAkC;IAClC,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,cAAc,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,YAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAEvF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,EAAQ,EACR,EAAE,WAAW,EAAE,MAAM,EAA8C;IAEnE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;QACtE,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QAC7E,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;QAC3D,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC;IAED,kCAAkC;IAClC,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,cAAc,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,YAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC"}

package/dist/db-init/entities/PaTextCache.entity.d.ts

@@ -1,4 +1,4 @@
-export declare class PaTextCacheEntity {
+export interface PaTextCacheEntity {
     k: string;
     resourceVersion: string;
     val: string;

package/dist/db-init/entities/PaTextCache.entity.js

@@ -1,42 +1,2 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Column, Entity } from "typeorm";
-let PaTextCacheEntity = class PaTextCacheEntity {
-    k;
-    resourceVersion;
-    val;
-    modifiedAt;
-    readAt;
-};
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaTextCacheEntity.prototype, "k", void 0);
-__decorate([
-    Column(),
-    __metadata("design:type", String)
-], PaTextCacheEntity.prototype, "resourceVersion", void 0);
-__decorate([
-    Column({ type: "text" }),
-    __metadata("design:type", String)
-], PaTextCacheEntity.prototype, "val", void 0);
-__decorate([
-    Column({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaTextCacheEntity.prototype, "modifiedAt", void 0);
-__decorate([
-    Column({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaTextCacheEntity.prototype, "readAt", void 0);
-PaTextCacheEntity = __decorate([
-    Entity("PaTextCache")
-], PaTextCacheEntity);
-export { PaTextCacheEntity };
+export {};
 //# sourceMappingURL=PaTextCache.entity.js.map

package/dist/db-init/entities/PaTextCache.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaTextCache.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCache.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE5B,CAAC,CAAU;IAGX,eAAe,CAAU;IAGzB,GAAG,CAAU;IAGb,UAAU,CAAQ;IAGlB,MAAM,CAAQ;CACf,CAAA;AAbC;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;4CACf;AAGX;IADC,MAAM,EAAE;;0DACgB;AAGzB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;8CACZ;AAGb;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACpD,IAAI;qDAAC;AAGlB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACxD,IAAI;iDAAC;AAdH,iBAAiB;IAD7B,MAAM,CAAC,aAAa,CAAC;GACT,iBAAiB,CAe7B"}
+{"version":3,"file":"PaTextCache.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCache.entity.ts"],"names":[],"mappings":""}

package/dist/db-init/entities/PaTextCacheDependency.entity.d.ts

@@ -1,4 +1,4 @@
-export declare class PaTextCacheDependencyEntity {
+export interface PaTextCacheDependencyEntity {
     cacheK: string;
     depK: string;
 }

package/dist/db-init/entities/PaTextCacheDependency.entity.js

@@ -1,27 +1,2 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Column, Entity } from "typeorm";
-let PaTextCacheDependencyEntity = class PaTextCacheDependencyEntity {
-    cacheK;
-    depK;
-};
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaTextCacheDependencyEntity.prototype, "cacheK", void 0);
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaTextCacheDependencyEntity.prototype, "depK", void 0);
-PaTextCacheDependencyEntity = __decorate([
-    Entity("PaTextCacheDependency")
-], PaTextCacheDependencyEntity);
-export { PaTextCacheDependencyEntity };
+export {};
 //# sourceMappingURL=PaTextCacheDependency.entity.js.map

package/dist/db-init/entities/PaTextCacheDependency.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaTextCacheDependency.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheDependency.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlC,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAEtC,MAAM,CAAU;IAGhB,IAAI,CAAU;CACf,CAAA;AAJC;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;2DACV;AAGhB;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;yDACZ;AALH,2BAA2B;IADvC,MAAM,CAAC,uBAAuB,CAAC;GACnB,2BAA2B,CAMvC"}
+{"version":3,"file":"PaTextCacheDependency.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheDependency.entity.ts"],"names":[],"mappings":""}

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.d.ts

@@ -1,4 +1,4 @@
-export declare class PaTextCacheScheduledInvalidationEntity {
+export interface PaTextCacheScheduledInvalidationEntity {
     eventK: string;
     depK: string;
     scheduledAt: Date;

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.js

@@ -1,37 +1,2 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Column, Entity } from "typeorm";
-let PaTextCacheScheduledInvalidationEntity = class PaTextCacheScheduledInvalidationEntity {
-    eventK;
-    depK;
-    scheduledAt;
-    scheduledSince;
-};
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaTextCacheScheduledInvalidationEntity.prototype, "eventK", void 0);
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaTextCacheScheduledInvalidationEntity.prototype, "depK", void 0);
-__decorate([
-    Column({ type: "datetime" }),
-    __metadata("design:type", Date)
-], PaTextCacheScheduledInvalidationEntity.prototype, "scheduledAt", void 0);
-__decorate([
-    Column({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaTextCacheScheduledInvalidationEntity.prototype, "scheduledSince", void 0);
-PaTextCacheScheduledInvalidationEntity = __decorate([
-    Entity("PaTextCacheScheduledInvalidation")
-], PaTextCacheScheduledInvalidationEntity);
-export { PaTextCacheScheduledInvalidationEntity };
+export {};
 //# sourceMappingURL=PaTextCacheScheduledInvalidation.entity.js.map

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaTextCacheScheduledInvalidation.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheScheduledInvalidation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlC,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAEjD,MAAM,CAAU;IAGhB,IAAI,CAAU;IAGd,WAAW,CAAQ;IAGnB,cAAc,CAAQ;CACvB,CAAA;AAVC;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;sEACV;AAGhB;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oEACZ;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;8BACf,IAAI;2EAAC;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BAChD,IAAI;8EAAC;AAXX,sCAAsC;IADlD,MAAM,CAAC,kCAAkC,CAAC;GAC9B,sCAAsC,CAYlD"}
+{"version":3,"file":"PaTextCacheScheduledInvalidation.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheScheduledInvalidation.entity.ts"],"names":[],"mappings":""}

package/dist/internal/cache-system-context.d.ts

@@ -1,12 +1,12 @@
 import type { AppLogger } from "@paroicms/internal-server-lib";
-import type { DataSource } from "typeorm";
+import type { Knex } from "knex";
 import type { CreateTextCacheSystemOptions } from "../cache-system.js";
 import type { TextCacheSystemStorage } from "../public-types.js";
 import { type InvalidationScheduler } from "./scheduler.js";
 export interface TextCacheSystemContext extends CreateTextCacheSystemOptions {
     status: "ready" | "destroyed";
     logger: AppLogger;
-    cn: DataSource;
+    cn: Knex;
     storage: TextCacheSystemStorage;
     logNextQuery: (count?: number) => void;
     timeToIdleDays?: number;

package/dist/internal/queries.d.ts

@@ -1,13 +1,14 @@
-import { type QueryBuilderConnection, type Tracker } from "@paroicms/internal-server-lib";
+import { type Tracker } from "@paroicms/internal-server-lib";
+import type { Knex } from "knex";
 import type { CacheSetData, CacheValue } from "../public-types.js";
 import type { TextCacheSystemContext } from "./cache-system-context.js";
-export declare function insertOrUpdateCacheValue(cn: QueryBuilderConnection, data: CacheSetData, tracker: Tracker): Promise<CacheValue>;
+export declare function insertOrUpdateCacheValue(cn: Knex, data: CacheSetData, tracker: Tracker): Promise<CacheValue>;
 export declare function getCacheValue({ cn, timeToIdleDays, logger }: TextCacheSystemContext, cacheKey: string, tracker: Tracker): Promise<CacheValue | undefined>;
 export declare function getDependencyKeys({ cn }: TextCacheSystemContext, cacheKey: string, tracker: Tracker): Promise<string[]>;
 /**
  * @returns the list of cache cacheKeys that were deleted
  */
-export declare function deleteCacheValues(cn: QueryBuilderConnection, options: {
+export declare function deleteCacheValues(cn: Knex, options: {
     dependencyKeys: string[];
 }): Promise<string[]>;
 /**

package/dist/internal/queries.js

@@ -1,67 +1,48 @@
 import { dateVal, strVal } from "@paroi/data-formatters-lib";
 import { isSameTimeUnit } from "@paroicms/internal-anywhere-lib";
-import { generateResourceVersion, } from "@paroicms/internal-server-lib";
+import { generateResourceVersion } from "@paroicms/internal-server-lib";
 import { dbSchemaName } from "../db-init/ddl-migration.js";
 export async function insertOrUpdateCacheValue(cn, data, tracker) {
     const resourceVersion = generateResourceVersion();
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaTextCache")
-        .andWhere("k = :k", { k: data.cacheKey })
-        .execute();
+    // Delete existing cache entry
+    await cn("PaTextCache").where("k", data.cacheKey).delete();
     tracker.trackAccess(dbSchemaName, "PaTextCache", "delete");
-    await cn
-        .createQueryBuilder()
-        .insert()
-        .into("PaTextCache")
-        .values({
+    // Insert new cache entry
+    await cn("PaTextCache").insert({
         k: data.cacheKey,
         val: data.value,
         resourceVersion,
-        modifiedAt: () => "current_timestamp",
-        readAt: () => "current_timestamp",
-    })
-        .execute();
+        modifiedAt: cn.fn.now(),
+        readAt: cn.fn.now(),
+    });
     tracker.trackAccess(dbSchemaName, "PaTextCache", "write");
-    await cn
-        .createQueryBuilder()
-        .insert()
-        .into("PaTextCacheDependency")
-        .values(data.dependencyKeys.map((depK) => ({
-        cacheK: data.cacheKey,
-        depK,
-    })))
-        .execute();
-    tracker.trackAccess(dbSchemaName, "PaTextCacheDependency", "write");
+    // Insert dependencies
+    if (data.dependencyKeys.length > 0) {
+        await cn("PaTextCacheDependency").insert(data.dependencyKeys.map((depK) => ({
+            cacheK: data.cacheKey,
+            depK,
+        })));
+        tracker.trackAccess(dbSchemaName, "PaTextCacheDependency", "write");
+    }
     return {
         resourceVersion,
         value: data.value,
     };
 }
 export async function getCacheValue({ cn, timeToIdleDays, logger }, cacheKey, tracker) {
-    const row = await cn
-        .createQueryBuilder()
-        .select("c.val", "val")
-        .addSelect("c.resourceVersion", "resourceVersion")
-        .addSelect("c.readAt", "readAt")
-        .from("PaTextCache", "c")
-        .andWhere("c.k = :k", { k: cacheKey })
-        .getRawOne();
+    const row = await cn("PaTextCache as c")
+        .select(["c.val", "c.resourceVersion", "c.readAt"])
+        .where("c.k", cacheKey)
+        .first();
     tracker.trackAccess(dbSchemaName, "PaTextCache", "read");
     if (!row)
         return;
     const readAt = dateVal(row.readAt);
     if (timeToIdleDays !== undefined && !isSameTimeUnit(readAt, "day")) {
         logger.debug(`updating readAt of cache: ${cacheKey}`);
-        await cn
-            .createQueryBuilder()
-            .update("PaTextCache")
-            .set({
-            readAt: () => "current_timestamp",
-        })
-            .andWhere("k = :k", { k: cacheKey })
-            .execute();
+        await cn("PaTextCache").where("k", cacheKey).update({
+            readAt: cn.fn.now(),
+        });
         tracker.trackAccess(dbSchemaName, "PaTextCache", "write");
     }
     return {
@@ -70,13 +51,10 @@ export async function getCacheValue({ cn, timeToIdleDays, logger }, cacheKey, tr
     };
 }
 export async function getDependencyKeys({ cn }, cacheKey, tracker) {
-    const rows = await cn
-        .createQueryBuilder()
-        .select("d.depK", "depK")
-        .from("PaTextCacheDependency", "d")
-        .innerJoin("PaTextCache", "c", "c.k = d.cacheK")
-        .andWhere("c.k = :k", { k: cacheKey })
-        .getRawMany();
+    const rows = await cn("PaTextCacheDependency as d")
+        .select("d.depK")
+        .join("PaTextCache as c", "c.k", "d.cacheK")
+        .where("c.k", cacheKey);
     tracker.trackAccess(dbSchemaName, "PaTextCacheDependency", "read");
     return rows.map((row) => strVal(row.depK));
 }
@@ -84,22 +62,14 @@ export async function getDependencyKeys({ cn }, cacheKey, tracker) {
  * @returns the list of cache cacheKeys that were deleted
  */
 export async function deleteCacheValues(cn, options) {
-    const rows = await cn
-        .createQueryBuilder()
-        .select("c.k", "k")
-        .from("PaTextCache", "c")
-        .innerJoin("PaTextCacheDependency", "d", "d.cacheK = c.k")
-        .andWhere("d.depK in (:...dependencyKeys)", { dependencyKeys: options.dependencyKeys })
-        .getRawMany();
+    const rows = await cn("PaTextCache as c")
+        .select("c.k")
+        .join("PaTextCacheDependency as d", "d.cacheK", "c.k")
+        .whereIn("d.depK", options.dependencyKeys);
     const cacheKeys = rows.map((row) => strVal(row.k));
     if (cacheKeys.length === 0)
         return [];
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaTextCache")
-        .andWhere("k in (:...cacheKeys)", { cacheKeys })
-        .execute();
+    await cn("PaTextCache").whereIn("k", cacheKeys).delete();
     return cacheKeys;
 }
 /**
@@ -108,20 +78,17 @@ export async function deleteCacheValues(cn, options) {
 export async function deleteUnusedCacheValues({ cn, timeToIdleDays, }) {
     if (timeToIdleDays === undefined)
         return;
-    const result = await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaTextCache")
-        .andWhere(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
-        .execute();
-    return result.affected ?? undefined;
+    const result = await cn("PaTextCache")
+        .whereRaw(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
+        .delete();
+    return result;
 }
 export async function invalidateAllCacheValues({ cn, }) {
-    await cn.createQueryBuilder().delete().from("PaTextCacheDependency").execute();
-    await cn.createQueryBuilder().delete().from("PaTextCache").execute();
+    await cn("PaTextCacheDependency").delete();
+    await cn("PaTextCache").delete();
 }
 export async function clearCacheValues({ cn }) {
     await invalidateAllCacheValues({ cn });
-    await cn.createQueryBuilder().delete().from("PaTextCacheScheduledInvalidation").execute();
+    await cn("PaTextCacheScheduledInvalidation").delete();
 }
 //# sourceMappingURL=queries.js.map

package/dist/internal/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAgB,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,EAAQ,EACR,IAAkB,EAClB,OAAgB;IAEhB,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAC;IAElD,8BAA8B;IAC9B,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3D,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IAE3D,yBAAyB;IACzB,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC;QAC7B,CAAC,EAAE,IAAI,CAAC,QAAQ;QAChB,GAAG,EAAE,IAAI,CAAC,KAAK;QACf,eAAe;QACf,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;QACvB,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;KACpB,CAAC,CAAC;IACH,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAE1D,sBAAsB;IACtB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,EAAE,CAAC,uBAAuB,CAAC,CAAC,MAAM,CACtC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACjC,MAAM,EAAE,IAAI,CAAC,QAAQ;YACrB,IAAI;SACL,CAAC,CAAC,CACJ,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAED,OAAO;QACL,eAAe;QACf,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,EAA0B,EACtD,QAAgB,EAChB,OAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,kBAAkB,CAAC;SACrC,MAAM,CAAC,CAAC,OAAO,EAAE,mBAAmB,EAAE,UAAU,CAAC,CAAC;SAClD,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC;SACtB,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAEzD,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;QACtD,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC;YAClD,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;SACpB,CAAC,CAAC;QACH,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,EAAE,EAAE,EAA0B,EAC9B,QAAgB,EAChB,OAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,4BAA4B,CAAC;SAChD,MAAM,CAAC,QAAQ,CAAC;SAChB,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,UAAU,CAAC;SAC3C,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1B,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;IAEnE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,EAAQ,EACR,OAAqC;IAErC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,kBAAkB,CAAC;SACtC,MAAM,CAAC,KAAK,CAAC;SACb,IAAI,CAAC,4BAA4B,EAAE,UAAU,EAAE,KAAK,CAAC;SACrD,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAE7C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEtC,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAC5C,EAAE,EACF,cAAc,GACS;IACvB,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO;IAEzC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC;SACnC,QAAQ,CAAC,4CAA4C,cAAc,QAAQ,CAAC;SAC5E,MAAM,EAAE,CAAC;IAEZ,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC7C,EAAE,GACiC;IACnC,MAAM,EAAE,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3C,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAE,EAAE,EAAsC;IAC/E,MAAM,wBAAwB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE,CAAC,kCAAkC,CAAC,CAAC,MAAM,EAAE,CAAC;AACxD,CAAC"}

package/dist/internal/scheduled-invalidation-queries.d.ts

@@ -1,14 +1,14 @@
-import type { QueryBuilderConnection } from "@paroicms/internal-server-lib";
+import type { Knex } from "knex";
 import type { TextCacheSystemContext } from "./cache-system-context.js";
 export declare function getNextScheduledDate({ cn, }: Pick<TextCacheSystemContext, "cn">): Promise<Date | undefined>;
 export declare function getScheduledInvalidationEventsToFire({ cn, }: Pick<TextCacheSystemContext, "cn">): Promise<{
     eventKey: string;
     dependencyKeys: string[];
 }[]>;
-export declare function setScheduledInvalidation(cn: QueryBuilderConnection, options: {
+export declare function setScheduledInvalidation(cn: Knex, options: {
     eventKey: string;
     dependencyKeys: string[];
     scheduledAt: Date;
 }): Promise<void>;
-export declare function deleteScheduledInvalidation(cn: QueryBuilderConnection, eventKey: string): Promise<void>;
-export declare function deleteScheduledInvalidations(cn: QueryBuilderConnection, eventKeys: string[]): Promise<void>;
+export declare function deleteScheduledInvalidation(cn: Knex, eventKey: string): Promise<void>;
+export declare function deleteScheduledInvalidations(cn: Knex, eventKeys: string[]): Promise<void>;

package/dist/internal/scheduled-invalidation-queries.js

@@ -1,22 +1,16 @@
 import { dateVal, strVal } from "@paroi/data-formatters-lib";
 export async function getNextScheduledDate({ cn, }) {
-    const row = await cn
-        .createQueryBuilder()
-        .select("s.scheduledAt", "scheduledAt")
-        .from("PaTextCacheScheduledInvalidation", "s")
+    const row = await cn("PaTextCacheScheduledInvalidation as s")
+        .select("s.scheduledAt")
         .orderBy("s.scheduledAt")
         .limit(1)
-        .getRawOne();
+        .first();
     return row ? dateVal(row.scheduledAt) : undefined;
 }
 export async function getScheduledInvalidationEventsToFire({ cn, }) {
-    const rows = await cn
-        .createQueryBuilder()
-        .select("s.eventK", "eventK")
-        .addSelect("s.depK", "depK")
-        .from("PaTextCacheScheduledInvalidation", "s")
-        .andWhere("s.scheduledAt <= current_timestamp")
-        .getRawMany();
+    const rows = await cn("PaTextCacheScheduledInvalidation as s")
+        .select(["s.eventK", "s.depK"])
+        .whereRaw("s.scheduledAt <= current_timestamp");
     const events = new Map();
     for (const row of rows) {
         const eventKey = strVal(row.eventK);
@@ -36,32 +30,19 @@ export async function getScheduledInvalidationEventsToFire({ cn, }) {
 }
 export async function setScheduledInvalidation(cn, options) {
     await deleteScheduledInvalidation(cn, options.eventKey);
-    await cn
-        .createQueryBuilder()
-        .insert()
-        .into("PaTextCacheScheduledInvalidation")
-        .values(options.dependencyKeys.map((depK) => ({
-        eventK: options.eventKey,
-        depK,
-        scheduledAt: options.scheduledAt,
-        scheduledSince: () => "current_timestamp",
-    })))
-        .execute();
+    if (options.dependencyKeys.length > 0) {
+        await cn("PaTextCacheScheduledInvalidation").insert(options.dependencyKeys.map((depK) => ({
+            eventK: options.eventKey,
+            depK,
+            scheduledAt: options.scheduledAt,
+            scheduledSince: cn.fn.now(),
+        })));
+    }
 }
 export async function deleteScheduledInvalidation(cn, eventKey) {
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaTextCacheScheduledInvalidation")
-        .andWhere("eventK = :eventK", { eventK: eventKey })
-        .execute();
+    await cn("PaTextCacheScheduledInvalidation").where("eventK", eventKey).delete();
 }
 export async function deleteScheduledInvalidations(cn, eventKeys) {
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaTextCacheScheduledInvalidation")
-        .andWhere("eventK in (:...eventKeys)", { eventKeys })
-        .execute();
+    await cn("PaTextCacheScheduledInvalidation").whereIn("eventK", eventKeys).delete();
 }
 //# sourceMappingURL=scheduled-invalidation-queries.js.map

package/dist/internal/scheduled-invalidation-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-invalidation-queries.js","sourceRoot":"","sources":["../../src/internal/scheduled-invalidation-queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduled-invalidation-queries.js","sourceRoot":"","sources":["../../src/internal/scheduled-invalidation-queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAI7D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,EAAE,GACiC;IACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,uCAAuC,CAAC;SAC1D,MAAM,CAAC,eAAe,CAAC;SACvB,OAAO,CAAC,eAAe,CAAC;SACxB,KAAK,CAAC,CAAC,CAAC;SACR,KAAK,EAAE,CAAC;IACX,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAC,EACzD,EAAE,GACiC;IACnC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,uCAAuC,CAAC;SAC3D,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SAC9B,QAAQ,CAAC,oCAAoC,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,cAAc,EAAE,CAAC;YACnB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QACvE,QAAQ;QACR,cAAc;KACf,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,EAAQ,EACR,OAA0E;IAE1E,MAAM,2BAA2B,CAAC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,CAAC,kCAAkC,CAAC,CAAC,MAAM,CACjD,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,MAAM,EAAE,OAAO,CAAC,QAAQ;YACxB,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;SAC5B,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAAQ,EAAE,QAAgB;IAC1E,MAAM,EAAE,CAAC,kCAAkC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;AAClF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,EAAQ,EAAE,SAAmB;IAC9E,MAAM,EAAE,CAAC,kCAAkC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;AACrF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server-text-cache-system",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Cache system.",
   "keywords": [
     "paroicms",
@@ -29,10 +29,10 @@
   "dependencies": {
     "@paroi/async-lib": "~0.3.1",
     "@paroi/data-formatters-lib": "~0.4.0",
-    "@paroicms/internal-server-lib": "1.12.1",
-    "@paroicms/internal-anywhere-lib": "1.25.0",
-    "@paroicms/public-anywhere-lib": "0.19.0",
-    "@paroicms/public-server-lib": "0.27.0"
+    "@paroicms/internal-anywhere-lib": "1.26.0",
+    "@paroicms/internal-server-lib": "1.13.0",
+    "@paroicms/public-anywhere-lib": "0.20.0",
+    "@paroicms/public-server-lib": "0.28.0"
   },
   "devDependencies": {
     "@types/node": "~22.13.10",
@@ -40,6 +40,7 @@
     "typescript": "~5.8.2"
   },
   "peerDependencies": {
-    "typeorm": "0.3"
+    "knex": "~3.1.0",
+    "sqlite3": "^5.1.7"
   }
 }