@paroicms/server-image-cache-engine 1.19.0 → 1.20.0

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

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

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

@@ -2,19 +2,16 @@ import { createOrOpenSqliteConnection, createSqlLogger, getMetadataDbSchemaVersi
 import { join } from "node:path";
 import { packageDir } from "../constants.js";
 import { currentDbSchemaVersion, dbSchemaName, migrateImageCacheDb } from "./ddl-migration.js";
-import { PaImageCacheEntity } from "./entities/PaImageCache.entity.js";
-import { PaImageCacheUsedEntity } from "./entities/PaImageCacheUsed.entity.js";
 export async function createOrOpenConnection({ sqliteFile, 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", "image-cache.ddl.sql"),
         migrateDb,
-        entities: [PaImageCacheEntity, PaImageCacheUsedEntity],
-        typeOrmLogger,
         logger,
+        knexLogger,
     });
     async function migrateDb(cn) {
         const dbVersion = await getMetadataDbSchemaVersion(cn, { dbSchemaName });

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,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,MAAM,GACyC;IAC/C,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,qBAAqB,CAAC;QACvD,SAAS;QACT,QAAQ,EAAE,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;QACtD,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,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,mBAAmB,CAAC,EAAE,EAAE;YAC5B,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,aAAa,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpF,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,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,MAAM,GACyC;IAC/C,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,qBAAqB,CAAC;QACvD,SAAS;QACT,MAAM;QACN,UAAU;KACX,CAAC,CAAC;IAEH,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,mBAAmB,CAAC,EAAE,EAAE;YAC5B,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,aAAa,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpF,CAAC"}

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

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

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

@@ -7,7 +7,7 @@ export async function migrateImageCacheDb(cn, { fromVersion, logger }) {
     const toVersion = currentDbSchemaVersion;
     let currentVersion = fromVersion;
     if (currentVersion === 4) {
-        await cn.query("drop table PaImageCacheKey");
+        await cn.schema.dropTableIfExists("PaImageCacheKey");
     }
     // We don't care losing cache data
     // Warning: don't reset the image cache until the text cache is reset too

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,EAEL,UAAU,EACV,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,EAAmD;IAExE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC/C,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,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;IAED,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,EAEL,UAAU,EACV,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAQ,EACR,EAAE,WAAW,EAAE,MAAM,EAAmD;IAExE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,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;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC"}

package/dist/internal/engine-context.d.ts

@@ -1,6 +1,6 @@
 import type { PromiseToHandle } from "@paroi/async-lib";
 import type { BasicAppLogger } from "@paroicms/internal-server-lib";
-import type { DataSource } from "typeorm";
+import type { Knex } from "knex";
 import type { ImageVariantWithBinary } from "../engine-types.js";
 import type { CreateImageCacheEngineOptions } from "../image-cache-engine.js";
 import type { TaskData, TaskKey } from "./internal.types.js";
@@ -9,7 +9,7 @@ export interface VariantEngineContext extends Omit<CreateImageCacheEngineOptions
     logger: BasicAppLogger;
     queue: TaskData[];
     pendingTasks: Map<TaskKey, PromiseToHandle<ImageVariantWithBinary>>;
-    cn: DataSource;
+    cn: Knex;
     logNextQuery: (count?: number) => void;
     timeToIdleDays?: number;
 }

package/dist/internal/queries.d.ts

@@ -1,8 +1,8 @@
-import type { QueryBuilderConnection } from "@paroicms/internal-server-lib";
 import type { VariantName } from "@paroicms/public-anywhere-lib";
+import type { Knex } from "knex";
 import type { ImageVariant, ImageVariantWithBinary } from "../engine-types.js";
 import type { VariantEngineContext } from "../internal/engine-context.js";
-export declare function insertIntoImageVariant(cn: QueryBuilderConnection, data: {
+export declare function insertIntoImageVariant(cn: Knex, data: {
     resourceVersion: string;
     imageUid: string;
     variantName: VariantName;
@@ -16,7 +16,7 @@ export declare function insertIntoImageVariant(cn: QueryBuilderConnection, data:
     newId: string;
     lastModified: string;
 }>;
-export declare function deleteVariants(cn: QueryBuilderConnection, options: {
+export declare function deleteVariants(cn: Knex, options: {
     imageUid: string;
     variantName?: string;
 } | {
@@ -25,7 +25,7 @@ export declare function deleteVariants(cn: QueryBuilderConnection, options: {
 /**
  * @returns the list of cache usedKeys that were deleted
  */
-export declare function deleteVariantsByDependencies(cn: QueryBuilderConnection, options: {
+export declare function deleteVariantsByDependencies(cn: Knex, options: {
     usedKeys: string[];
 }): Promise<number>;
 export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "logger">, { imageUid, variantName, }: {

package/dist/internal/queries.js

@@ -1,97 +1,112 @@
 import { dateVal, nbVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { isSameTimeUnit } from "@paroicms/internal-anywhere-lib";
 export async function insertIntoImageVariant(cn, data, usedKey) {
-    const result = await cn
-        .createQueryBuilder()
-        .insert()
-        .into("PaImageCache")
-        .values({
-        ...data,
-        modifiedAt: () => "current_timestamp",
-        readAt: () => "current_timestamp",
+    const existingRow = await cn("PaImageCache")
+        .select("id")
+        .where({
+        imageUid: data.imageUid,
+        variantName: data.variantName,
     })
-        .orUpdate(["mediaType", "width", "height", "weightB", "binaryFile", "modifiedAt", "readAt"], ["imageUid", "variantName"])
-        .execute();
-    let newId = strValOrUndef(result.identifiers[0].id, { varName: "PaImageCache.id" });
-    if (newId === undefined) {
-        const row = await cn
-            .createQueryBuilder()
-            .select("v.id", "id")
-            .from("PaImageCache", "v")
-            .andWhere("v.imageUid = :imageUid", { imageUid: data.imageUid })
-            .andWhere("v.variantName = :variantName", { variantName: data.variantName })
-            .getRawOne();
+        .first();
+    let imageCacheId = existingRow ? strVal(existingRow.id) : undefined;
+    let modifiedAt;
+    if (imageCacheId === undefined) {
+        const [inserted] = await cn("PaImageCache")
+            .insert({
+            resourceVersion: data.resourceVersion,
+            imageUid: data.imageUid,
+            variantName: data.variantName,
+            slug: data.slug,
+            mediaType: data.mediaType,
+            width: data.width,
+            height: data.height,
+            weightB: data.weightB,
+            binaryFile: data.binaryFile,
+            modifiedAt: cn.fn.now(),
+            readAt: cn.fn.now(),
+        })
+            .returning(["id", "modifiedAt"]);
+        imageCacheId = strVal(inserted.id);
+        modifiedAt = dateVal(inserted.modifiedAt);
+    }
+    else {
+        await cn("PaImageCache")
+            .where({
+            id: imageCacheId,
+        })
+            .update({
+            mediaType: data.mediaType,
+            width: data.width,
+            height: data.height,
+            weightB: data.weightB,
+            binaryFile: data.binaryFile,
+            modifiedAt: cn.fn.now(),
+            readAt: cn.fn.now(),
+        });
+        const row = await cn("PaImageCache").select("modifiedAt").where("id", imageCacheId).first();
         if (!row)
-            throw new Error(`unable to find variant row '${data.imageUid}-${data.variantName}'`);
-        newId = strVal(row.id);
+            throw new Error(`missing cache row: ${imageCacheId}`);
+        modifiedAt = dateVal(row.modifiedAt);
     }
-    await cn
-        .createQueryBuilder()
-        .insert()
-        .into("PaImageCacheUsed")
-        .values({
-        imageCacheId: newId,
+    // Insert into PaImageCacheUsed if it doesn't exist
+    const usedCountRow = await cn("PaImageCacheUsed")
+        .count("* as cnt")
+        .where({
+        imageCacheId,
         usedKey,
     })
-        .execute();
-    const row = await cn
-        .createQueryBuilder()
-        .select("v.modifiedAt", "modifiedAt")
-        .from("PaImageCache", "v")
-        .andWhere("v.id = :id", { id: newId })
-        .getRawOne();
-    if (!row)
-        throw new Error(`missing cache row: ${newId}`);
-    const lastModified = dateVal(row.modifiedAt).toISOString();
-    return { newId, lastModified };
+        .first();
+    if (!usedCountRow || usedCountRow.cnt === 0) {
+        await cn("PaImageCacheUsed").insert({
+            imageCacheId,
+            usedKey,
+        });
+    }
+    return { newId: imageCacheId, lastModified: modifiedAt.toISOString() };
 }
 export async function deleteVariants(cn, options) {
-    const query = cn.createQueryBuilder().delete().from("PaImageCache");
     if ("imageUids" in options) {
-        query.andWhere("imageUid in (:...imageUids)", { imageUids: options.imageUids });
+        await cn("PaImageCache").whereIn("imageUid", options.imageUids).delete();
     }
     else {
-        query.andWhere("imageUid = :imageUid", { imageUid: options.imageUid });
+        const query = cn("PaImageCache").where("imageUid", options.imageUid);
         if (options.variantName) {
-            query.andWhere("variantName = :variantName", { variantName: options.variantName });
+            query.where("variantName", options.variantName);
         }
+        await query.delete();
     }
-    await query.execute();
 }
 /**
  * @returns the list of cache usedKeys that were deleted
  */
 export async function deleteVariantsByDependencies(cn, options) {
-    const rows = await cn
-        .createQueryBuilder()
-        .select("k.imageCacheId", "imageCacheId")
-        .from("PaImageCacheUsed", "k")
-        .andWhere("k.usedKey in (:...usedKeys)", { usedKeys: options.usedKeys })
-        .getRawMany();
+    const rows = await cn("PaImageCacheUsed as k")
+        .select("k.imageCacheId")
+        .whereIn("k.usedKey", options.usedKeys);
     const imageCacheIds = rows.map((row) => strVal(row.imageCacheId));
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaImageCache")
-        .andWhere("id in (:...imageCacheIds)", { imageCacheIds: imageCacheIds })
-        .execute();
+    if (imageCacheIds.length > 0) {
+        await cn("PaImageCache").whereIn("id", imageCacheIds).delete();
+    }
     return imageCacheIds.length;
 }
 export async function fetchImageVariant(ctx, { imageUid, variantName, }) {
-    const row = await ctx.cn
-        .createQueryBuilder()
-        .select("v.id", "id")
-        .addSelect("v.mediaType", "mediaType")
-        .addSelect("v.width", "width")
-        .addSelect("v.height", "height")
-        .addSelect("v.modifiedAt", "modifiedAt")
-        .addSelect("v.resourceVersion", "resourceVersion")
-        .addSelect("v.slug", "slug")
-        .addSelect("v.readAt", "readAt")
-        .from("PaImageCache", "v")
-        .andWhere("v.imageUid = :imageUid", { imageUid })
-        .andWhere("v.variantName = :variantName", { variantName })
-        .getRawOne();
+    const row = await ctx
+        .cn("PaImageCache as v")
+        .select([
+        "v.id",
+        "v.mediaType",
+        "v.width",
+        "v.height",
+        "v.modifiedAt",
+        "v.resourceVersion",
+        "v.slug",
+        "v.readAt",
+    ])
+        .where({
+        "v.imageUid": imageUid,
+        "v.variantName": variantName,
+    })
+        .first();
     if (!row)
         return;
     const id = strVal(row.id);
@@ -115,22 +130,25 @@ export async function fetchImageVariant(ctx, { imageUid, variantName, }) {
     };
 }
 export async function fetchImageVariantWithBinary(ctx, { imageUid, variantName, }) {
-    const row = await ctx.cn
-        .createQueryBuilder()
-        .select("v.id", "id")
-        .addSelect("v.mediaType", "mediaType")
-        .addSelect("v.width", "width")
-        .addSelect("v.height", "height")
-        .addSelect("v.weightB", "weightB")
-        .addSelect("v.binaryFile", "binaryFile")
-        .addSelect("v.modifiedAt", "modifiedAt")
-        .addSelect("v.readAt", "readAt")
-        .addSelect("v.resourceVersion", "resourceVersion")
-        .addSelect("v.slug", "slug")
-        .from("PaImageCache", "v")
-        .andWhere("v.imageUid = :imageUid", { imageUid })
-        .andWhere("v.variantName = :variantName", { variantName })
-        .getRawOne();
+    const row = await ctx
+        .cn("PaImageCache as v")
+        .select([
+        "v.id",
+        "v.mediaType",
+        "v.width",
+        "v.height",
+        "v.weightB",
+        "v.binaryFile",
+        "v.modifiedAt",
+        "v.readAt",
+        "v.resourceVersion",
+        "v.slug",
+    ])
+        .where({
+        "v.imageUid": imageUid,
+        "v.variantName": variantName,
+    })
+        .first();
     if (!row)
         return;
     const id = strVal(row.id);
@@ -156,52 +174,40 @@ async function updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, variantNa
     if (timeToIdleDays === undefined || isSameTimeUnit(readAt, "day"))
         return;
     logger.debug(`updating readAt of image cache: ${imageUid}, ${variantName}`);
-    await cn
-        .createQueryBuilder()
-        .update("PaImageCache")
-        .set({
-        readAt: () => "current_timestamp",
-    })
-        .andWhere("id = :id", { id })
-        .execute();
+    await cn("PaImageCache").where("id", id).update({
+        readAt: cn.fn.now(),
+    });
 }
 /**
  * Delete the images that have no usedKey and that have not been used recently.
  * @returns the number of cache identifiers that were deleted
  */
 export async function deleteUnusedVariants({ cn, timeToIdleDays, }) {
-    const result = await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaImageCache")
-        .andWhere(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
-        .andWhere(`not exists (
-  select 1
-  from PaImageCacheUsed k
-  where k.imageCacheId = PaImageCache.id and k.used = 1
-)`)
-        .execute();
-    return result.affected ?? undefined;
+    // Find records to delete
+    const subquery = cn("PaImageCacheUsed as k")
+        .select(1)
+        .whereRaw("k.imageCacheId = PaImageCache.id")
+        .where("k.used", 1);
+    const result = await cn("PaImageCache")
+        .whereRaw(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
+        .whereNotExists(subquery)
+        .delete();
+    return result;
 }
 export async function markOneUsedKeyAsUsed(ctx, { imageCacheId, usedKey, }) {
-    await ctx.cn
-        .createQueryBuilder()
-        .update("PaImageCacheUsed")
-        .set({ used: 1 })
-        .andWhere("imageCacheId = :imageCacheId", { imageCacheId })
-        .andWhere("usedKey = :usedKey", { usedKey })
-        .execute();
+    await ctx
+        .cn("PaImageCacheUsed")
+        .where({
+        imageCacheId,
+        usedKey,
+    })
+        .update({ used: 1 });
 }
 export async function markUsedKeyAsUnused(ctx, { usedKey, }) {
-    await ctx.cn
-        .createQueryBuilder()
-        .update("PaImageCacheUsed")
-        .set({ used: 0 })
-        .andWhere("usedKey = :usedKey", { usedKey })
-        .execute();
+    await ctx.cn("PaImageCacheUsed").where({ usedKey }).update({ used: 0 });
 }
 export async function clearVariantCache({ cn }) {
-    await cn.createQueryBuilder().delete().from("PaImageCacheUsed").execute();
-    await cn.createQueryBuilder().delete().from("PaImageCache").execute();
+    await cn("PaImageCacheUsed").delete();
+    await cn("PaImageCache").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":"AAAA,OAAO,EAAY,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMjE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,EAA0B,EAC1B,IAUC,EACD,OAAe;IAEf,MAAM,MAAM,GAAG,MAAM,EAAE;SACpB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,cAAc,CAAC;SACpB,MAAM,CAAC;QACN,GAAG,IAAI;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,mBAAmB;QACrC,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB;KAClC,CAAC;SACD,QAAQ,CACP,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,CAAC,EACjF,CAAC,UAAU,EAAE,aAAa,CAAC,CAC5B;SACA,OAAO,EAAE,CAAC;IAEb,IAAI,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAEpF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,MAAM,EAAE;aACjB,kBAAkB,EAAE;aACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC;aACpB,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;aACzB,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC/D,QAAQ,CAAC,8BAA8B,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;aAC3E,SAAS,EAAE,CAAC;QACf,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAC/F,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,kBAAkB,CAAC;SACxB,MAAM,CAAC;QACN,YAAY,EAAE,KAAK;QACnB,OAAO;KACR,CAAC;SACD,OAAO,EAAE,CAAC;IAEb,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC;SACpC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;SACzB,QAAQ,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;SACrC,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAE3D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAA0B,EAC1B,OAA6E;IAE7E,MAAM,KAAK,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAEpE,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;QAC3B,KAAK,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,KAAK,CAAC,QAAQ,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,EAA0B,EAC1B,OAA+B;IAE/B,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,kBAAkB,EAAE;SACpB,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC;SACxC,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC;SAC7B,QAAQ,CAAC,6BAA6B,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;SACvE,UAAU,EAAO,CAAC;IAErB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IAElE,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,cAAc,CAAC;SACpB,QAAQ,CAAC,2BAA2B,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC;SACvE,OAAO,EAAE,CAAC;IAEb,OAAO,aAAa,CAAC,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAmE,EACnE,EACE,QAAQ,EACR,WAAW,GAIZ;IAED,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE;SACrB,kBAAkB,EAAE;SACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC;SACpB,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;SACrC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;SAC7B,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC;SACvC,SAAS,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SACjD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC3B,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;SACzB,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;SAChD,QAAQ,CAAC,8BAA8B,EAAE,EAAE,WAAW,EAAE,CAAC;SACzD,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,0BAA0B,CAAC,GAAG,EAAE;QACpC,EAAE;QACF,MAAM;QACN,QAAQ;QACR,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO;QACL,EAAE;QACF,OAAO,EAAE;YACP,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YAC5C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;YAC7B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;YACvB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YACzB,WAAW;SACZ;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,GAAmE,EACnE,EACE,QAAQ,EACR,WAAW,GAIZ;IAED,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE;SACrB,kBAAkB,EAAE;SACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC;SACpB,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;SACrC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;SAC7B,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC;SACjC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC;SACvC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC;SACvC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SACjD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC3B,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;SACzB,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;SAChD,QAAQ,CAAC,8BAA8B,EAAE,EAAE,WAAW,EAAE,CAAC;SACzD,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,0BAA0B,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAE7E,OAAO;QACL,EAAE;QACF,OAAO,EAAE;YACP,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YAC5C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;YAC7B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;YACvB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YACzB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;YAC3B,UAAU,EAAE,GAAG,CAAC,UAAoB;YACpC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE;YACnD,WAAW;SACZ;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,GAAmE,EACnE,EACE,EAAE,EACF,MAAM,EACN,QAAQ,EACR,WAAW,GAMZ;IAED,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAC3C,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO;IAC1E,MAAM,CAAC,KAAK,CAAC,mCAAmC,QAAQ,KAAK,WAAW,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,CAAC,cAAc,CAAC;SACtB,GAAG,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB;KAClC,CAAC;SACD,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC;SAC5B,OAAO,EAAE,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,EAAE,EACF,cAAc,GACO;IACrB,MAAM,MAAM,GAAG,MAAM,EAAE;SACpB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,cAAc,CAAC;SACpB,QAAQ,CAAC,4CAA4C,cAAc,QAAQ,CAAC;SAC5E,QAAQ,CAAC;;;;EAIZ,CAAC;SACE,OAAO,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAqC,EACrC,EACE,YAAY,EACZ,OAAO,GAIR;IAED,MAAM,GAAG,CAAC,EAAE;SACT,kBAAkB,EAAE;SACpB,MAAM,CAAC,kBAAkB,CAAC;SAC1B,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;SAChB,QAAQ,CAAC,8BAA8B,EAAE,EAAE,YAAY,EAAE,CAAC;SAC1D,QAAQ,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC;SAC3C,OAAO,EAAE,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAqC,EACrC,EACE,OAAO,GAGR;IAED,MAAM,GAAG,CAAC,EAAE;SACT,kBAAkB,EAAE;SACpB,MAAM,CAAC,kBAAkB,CAAC;SAC1B,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;SAChB,QAAQ,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC;SAC3C,OAAO,EAAE,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EAAE,EAAE,EAAwB;IAClE,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1E,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;AACxE,CAAC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server-image-cache-engine",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "The image variant engine that we use at Paroi.",
   "author": "Paroi Team",
   "keywords": [
@@ -35,15 +35,16 @@
   "dependencies": {
     "@paroi/async-lib": "~0.3.1",
     "@paroi/data-formatters-lib": "~0.4.0",
-    "@paroicms/internal-anywhere-lib": "1.25.0",
-    "@paroicms/public-anywhere-lib": "0.19.0",
-    "@paroicms/public-server-lib": "0.26.0",
-    "@paroicms/internal-server-lib": "1.12.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",
     "ico-endec": "~0.1.6",
     "sharp": "~0.33.4"
   },
   "peerDependencies": {
-    "typeorm": "0.3"
+    "knex": "~3.1.0",
+    "sqlite3": "^5.1.7"
   },
   "files": [
     "ddl",

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

@@ -1,14 +0,0 @@
-export declare class PaImageCacheEntity {
-    id: string;
-    resourceVersion: string;
-    imageUid: string;
-    variantName: string;
-    mediaType: string;
-    width: number;
-    height: number;
-    weightB: number;
-    modifiedAt: Date;
-    readAt: Date;
-    binaryFile: Buffer;
-    slug?: string;
-}

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

@@ -1,78 +0,0 @@
-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, PrimaryGeneratedColumn, Unique } from "typeorm";
-let PaImageCacheEntity = class PaImageCacheEntity {
-    id;
-    resourceVersion;
-    imageUid;
-    variantName;
-    mediaType;
-    width;
-    height;
-    weightB;
-    modifiedAt;
-    readAt;
-    binaryFile;
-    slug;
-};
-__decorate([
-    PrimaryGeneratedColumn(),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "id", void 0);
-__decorate([
-    Column({ type: "varchar" }),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "resourceVersion", void 0);
-__decorate([
-    Column(),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "imageUid", void 0);
-__decorate([
-    Column(),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "variantName", void 0);
-__decorate([
-    Column(),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "mediaType", void 0);
-__decorate([
-    Column({ type: "integer" }),
-    __metadata("design:type", Number)
-], PaImageCacheEntity.prototype, "width", void 0);
-__decorate([
-    Column({ type: "integer" }),
-    __metadata("design:type", Number)
-], PaImageCacheEntity.prototype, "height", void 0);
-__decorate([
-    Column({ type: "integer" }),
-    __metadata("design:type", Number)
-], PaImageCacheEntity.prototype, "weightB", void 0);
-__decorate([
-    Column({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaImageCacheEntity.prototype, "modifiedAt", void 0);
-__decorate([
-    Column({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaImageCacheEntity.prototype, "readAt", void 0);
-__decorate([
-    Column({ type: "blob" }),
-    __metadata("design:type", Buffer)
-], PaImageCacheEntity.prototype, "binaryFile", void 0);
-__decorate([
-    Column({ type: "varchar", nullable: true }),
-    __metadata("design:type", String)
-], PaImageCacheEntity.prototype, "slug", void 0);
-PaImageCacheEntity = __decorate([
-    Entity("PaImageCache"),
-    Unique(["imageUid", "variantName"])
-], PaImageCacheEntity);
-export { PaImageCacheEntity };
-//# sourceMappingURL=PaImageCache.entity.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"PaImageCache.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaImageCache.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIlE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE7B,EAAE,CAAU;IAGZ,eAAe,CAAU;IAGzB,QAAQ,CAAU;IAGlB,WAAW,CAAU;IAGrB,SAAS,CAAU;IAGnB,KAAK,CAAU;IAGf,MAAM,CAAU;IAGhB,OAAO,CAAU;IAGjB,UAAU,CAAQ;IAGlB,MAAM,CAAQ;IAGd,UAAU,CAAU;IAGpB,IAAI,CAAU;CACf,CAAA;AAlCC;IADC,sBAAsB,EAAE;;8CACb;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;2DACH;AAGzB;IADC,MAAM,EAAE;;oDACS;AAGlB;IADC,MAAM,EAAE;;uDACY;AAGrB;IADC,MAAM,EAAE;;qDACU;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;iDACb;AAGf;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kDACZ;AAGhB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;mDACX;AAGjB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACpD,IAAI;sDAAC;AAGlB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACxD,IAAI;kDAAC;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;8BACZ,MAAM;sDAAC;AAGpB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC9B;AAnCH,kBAAkB;IAF9B,MAAM,CAAC,cAAc,CAAC;IACtB,MAAM,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;GACvB,kBAAkB,CAoC9B"}

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

@@ -1,5 +0,0 @@
-export declare class PaImageCacheUsedEntity {
-    imageCacheId: string;
-    usedKey: string;
-    used: boolean;
-}

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

@@ -1,32 +0,0 @@
-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 PaImageCacheUsedEntity = class PaImageCacheUsedEntity {
-    imageCacheId;
-    usedKey;
-    used;
-};
-__decorate([
-    Column({ type: "integer", primary: true }),
-    __metadata("design:type", String)
-], PaImageCacheUsedEntity.prototype, "imageCacheId", void 0);
-__decorate([
-    Column({ primary: true }),
-    __metadata("design:type", String)
-], PaImageCacheUsedEntity.prototype, "usedKey", void 0);
-__decorate([
-    Column({ type: "boolean", default: true }),
-    __metadata("design:type", Boolean)
-], PaImageCacheUsedEntity.prototype, "used", void 0);
-PaImageCacheUsedEntity = __decorate([
-    Entity("PaImageCacheUsed")
-], PaImageCacheUsedEntity);
-export { PaImageCacheUsedEntity };
-//# sourceMappingURL=PaImageCacheUsed.entity.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"PaImageCacheUsed.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaImageCacheUsed.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEjC,YAAY,CAAU;IAGtB,OAAO,CAAU;IAGjB,IAAI,CAAW;CAChB,CAAA;AAPC;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;4DACrB;AAGtB;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;uDACT;AAGjB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AARJ,sBAAsB;IADlC,MAAM,CAAC,kBAAkB,CAAC;GACd,sBAAsB,CASlC"}