@paroicms/server-image-cache-engine 1.23.3 → 1.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,3 @@
1
- import { nbVal } from "@paroi/data-formatters-lib";
2
1
  import { isResizeRule } from "@paroicms/public-anywhere-lib";
3
2
  export function computeImageVariantSize({ sourceImage, rawResizeR, autoCrop, }) {
4
3
  if (!isResizeRule(rawResizeR)) {
@@ -19,8 +18,8 @@ export function computeImageVariantSize({ sourceImage, rawResizeR, autoCrop, })
19
18
  }
20
19
  const [rawWidth, rawHeight] = rawResizeR.split("x");
21
20
  const v = {
22
- width: rawWidth === "" ? undefined : nbVal(rawWidth),
23
- height: rawHeight === "" ? undefined : nbVal(rawHeight),
21
+ width: rawWidth === "" ? undefined : Number.parseInt(rawWidth),
22
+ height: rawHeight === "" ? undefined : Number.parseInt(rawHeight),
24
23
  };
25
24
  if (v.height !== undefined && v.width !== undefined) {
26
25
  return toParsedResizeRuleWithVariant(reduceSizeIfNecessary({ rawWidth: v.width, rawHeight: v.height }, sourceImage));
@@ -1 +1 @@
1
- {"version":3,"file":"compute-variant-size.js","sourceRoot":"","sources":["../src/compute-variant-size.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compute-variant-size.js","sourceRoot":"","sources":["../src/compute-variant-size.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { createOrOpenSqliteConnection, createSqlLogger, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
2
1
  import { join } from "node:path";
2
+ import { createOrOpenSqliteConnection, createSqlLogger, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
3
3
  import { packageDir } from "../constants.js";
4
4
  import { currentDbSchemaVersion, dbSchemaName, migrateImageCacheDb } from "./ddl-migration.js";
5
5
  export async function createOrOpenConnection({ sqliteFile, logger, }) {
@@ -1 +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;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"}
1
+ {"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAGL,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,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"}
@@ -1,5 +1,5 @@
1
- import { executeDdl, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
2
1
  import { join } from "node:path";
2
+ import { executeDdl, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
3
3
  import { packageDir } from "../constants.js";
4
4
  export const dbSchemaName = "image-cache";
5
5
  export const currentDbSchemaVersion = 7;
@@ -1 +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;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,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"}
1
+ {"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAEL,UAAU,EACV,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,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"}
@@ -0,0 +1,2 @@
1
+ import type { OriginalImage } from "./original-images-processing.js";
2
+ export declare function createDefaultAdminFavicon(binaryFile: Buffer): Promise<OriginalImage>;
@@ -7,7 +7,7 @@ const drawPixelByChannels = {
7
7
  3: drawPixel3Channels,
8
8
  4: drawPixel4Channels,
9
9
  };
10
- export async function createDefaultBoFavicon(binaryFile) {
10
+ export async function createDefaultAdminFavicon(binaryFile) {
11
11
  const sharpInst = sharp(binaryFile);
12
12
  const metadata = await sharpQueue(() => sharpInst.metadata());
13
13
  if (metadata.width === undefined || metadata.height === undefined) {
@@ -97,4 +97,4 @@ function drawPixel4Channels(data, index) {
97
97
  drawPixel3Channels(data, index);
98
98
  data[index + 3] = 255;
99
99
  }
100
- //# sourceMappingURL=default-bo-favicon.js.map
100
+ //# sourceMappingURL=default-admin-ui-favicon.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"default-admin-ui-favicon.js","sourceRoot":"","sources":["../src/default-admin-ui-favicon.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export * from "./compute-variant-size.js";
2
- export * from "./default-bo-favicon.js";
2
+ export * from "./default-admin-ui-favicon.js";
3
3
  export * from "./engine-types.js";
4
4
  export * from "./image-cache-engine.js";
5
5
  export { setupImageProcessor, type SetupImageProcessorOptions } from "./image-processor-setup.js";
package/dist/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  export * from "./compute-variant-size.js";
2
- export * from "./default-bo-favicon.js";
2
+ export * from "./default-admin-ui-favicon.js";
3
3
  export * from "./engine-types.js";
4
4
  export * from "./image-cache-engine.js";
5
5
  export { setupImageProcessor } from "./image-processor-setup.js";
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAmC,MAAM,4BAA4B,CAAC;AAClG,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAmC,MAAM,4BAA4B,CAAC;AAClG,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC"}
@@ -0,0 +1,60 @@
1
+ import type { ImageVariant } from "../engine-types.js";
2
+ export declare const ImageVariantRowAT: import("arktype/internal/methods/object.ts").ObjectType<(In: {
3
+ id: number;
4
+ mediaType: string;
5
+ resourceVersion: string;
6
+ rawWidth: number;
7
+ rawHeight: number;
8
+ slug: string | null;
9
+ mediaId: string;
10
+ }) => import("arktype").Out<{
11
+ imageCacheId: string;
12
+ variant: ImageVariant;
13
+ }>, {}>;
14
+ export declare const BatchStoredCacheItemRowAT: import("arktype/internal/methods/object.ts").ObjectType<(In: {
15
+ id: number;
16
+ mediaType: string;
17
+ resourceVersion: string;
18
+ rawWidth: number;
19
+ rawHeight: number;
20
+ slug: string | null;
21
+ mediaId: string;
22
+ ownerHandle: string | null;
23
+ }) => import("arktype").Out<{
24
+ ownerHandle: string | undefined;
25
+ imageCacheId: string;
26
+ variant: ImageVariant;
27
+ }>, {}>;
28
+ export declare const ImageVariantWithBinaryRowAT: import("arktype/internal/methods/object.ts").ObjectType<(In: {
29
+ id: number;
30
+ mediaType: string;
31
+ resourceVersion: string;
32
+ rawWidth: number;
33
+ rawHeight: number;
34
+ slug: string | null;
35
+ mediaId: string;
36
+ modifiedAt: string | number | Date;
37
+ weightB: number;
38
+ }) => import("arktype").Out<{
39
+ modifiedAt: Date;
40
+ weightB: number;
41
+ imageCacheId: string;
42
+ variant: ImageVariant;
43
+ }>, {}>;
44
+ export declare const ImageVariantWithBinaryByOwnerRowAT: import("arktype/internal/methods/object.ts").ObjectType<(In: {
45
+ id: number;
46
+ mediaType: string;
47
+ resourceVersion: string;
48
+ rawWidth: number;
49
+ rawHeight: number;
50
+ slug: string | null;
51
+ modifiedAt: string | number | Date;
52
+ weightB: number;
53
+ mediaId: string;
54
+ }) => import("arktype").Out<{
55
+ mediaId: string;
56
+ modifiedAt: Date;
57
+ weightB: number;
58
+ imageCacheId: string;
59
+ variant: ImageVariant;
60
+ }>, {}>;
@@ -0,0 +1,66 @@
1
+ import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
2
+ import { type } from "arktype";
3
+ const ImageVariantBaseAT = type({
4
+ id: "number",
5
+ mediaType: "string",
6
+ resourceVersion: "string",
7
+ rawWidth: "number",
8
+ rawHeight: "number",
9
+ slug: "string|null",
10
+ mediaId: "string",
11
+ "+": "reject",
12
+ });
13
+ function pipeImageVariantBaseAT(r) {
14
+ return {
15
+ imageCacheId: String(r.id),
16
+ variant: {
17
+ mediaId: r.mediaId,
18
+ mediaType: r.mediaType,
19
+ resourceVersion: r.resourceVersion,
20
+ rawWidth: r.rawWidth,
21
+ rawHeight: r.rawHeight,
22
+ slug: r.slug ?? undefined,
23
+ rawSizeName: `${r.rawWidth}x${r.rawHeight}`,
24
+ },
25
+ };
26
+ }
27
+ export const ImageVariantRowAT = ImageVariantBaseAT.pipe(pipeImageVariantBaseAT);
28
+ const BatchStoredCacheItemBaseAT = type({
29
+ "...": ImageVariantBaseAT,
30
+ ownerHandle: "string|null",
31
+ "+": "reject",
32
+ });
33
+ function pipeBatchStoredCacheItemBaseAT(r) {
34
+ return {
35
+ ...pipeImageVariantBaseAT(r),
36
+ ownerHandle: r.ownerHandle ?? undefined,
37
+ };
38
+ }
39
+ export const BatchStoredCacheItemRowAT = BatchStoredCacheItemBaseAT.pipe(pipeBatchStoredCacheItemBaseAT);
40
+ const ImageVariantWithBinaryBaseAT = type({
41
+ "...": ImageVariantBaseAT,
42
+ modifiedAt: "string|number|Date",
43
+ weightB: "number",
44
+ "+": "reject",
45
+ });
46
+ function pipeImageVariantWithBinaryBaseAT(r) {
47
+ return {
48
+ ...pipeImageVariantBaseAT(r),
49
+ modifiedAt: parseSqliteDateTime(r.modifiedAt),
50
+ weightB: r.weightB,
51
+ };
52
+ }
53
+ export const ImageVariantWithBinaryRowAT = ImageVariantWithBinaryBaseAT.pipe(pipeImageVariantWithBinaryBaseAT);
54
+ const ImageVariantWithBinaryByOwnerBaseAT = type({
55
+ "...": ImageVariantWithBinaryBaseAT,
56
+ mediaId: "string",
57
+ "+": "reject",
58
+ });
59
+ function pipeImageVariantWithBinaryByOwnerBaseAT(r) {
60
+ return {
61
+ ...pipeImageVariantWithBinaryBaseAT(r),
62
+ mediaId: r.mediaId,
63
+ };
64
+ }
65
+ export const ImageVariantWithBinaryByOwnerRowAT = ImageVariantWithBinaryByOwnerBaseAT.pipe(pipeImageVariantWithBinaryByOwnerBaseAT);
66
+ //# sourceMappingURL=queries-at.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queries-at.js","sourceRoot":"","sources":["../../src/internal/queries-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAC9B,EAAE,EAAE,QAAQ;IACZ,SAAS,EAAE,QAAQ;IACnB,eAAe,EAAE,QAAQ;IACzB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,QAAQ;IACnB,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,SAAS,sBAAsB,CAAC,CAAkC;IAIhE,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE;YACP,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,SAAS;YACzB,WAAW,EAAE,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,SAAS,EAAE;SAC5C;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEjF,MAAM,0BAA0B,GAAG,IAAI,CAAC;IACtC,KAAK,EAAE,kBAAkB;IACzB,WAAW,EAAE,aAAa;IAC1B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,SAAS,8BAA8B,CAAC,CAA0C;IAChF,OAAO;QACL,GAAG,sBAAsB,CAAC,CAAC,CAAC;QAC5B,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,SAAS;KACxC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,0BAA0B,CAAC,IAAI,CACtE,8BAA8B,CAC/B,CAAC;AAEF,MAAM,4BAA4B,GAAG,IAAI,CAAC;IACxC,KAAK,EAAE,kBAAkB;IACzB,UAAU,EAAE,oBAAoB;IAChC,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,SAAS,gCAAgC,CAAC,CAA4C;IACpF,OAAO;QACL,GAAG,sBAAsB,CAAC,CAAC,CAAC;QAC5B,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC;QAC7C,OAAO,EAAE,CAAC,CAAC,OAAO;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,4BAA4B,CAAC,IAAI,CAC1E,gCAAgC,CACjC,CAAC;AAEF,MAAM,mCAAmC,GAAG,IAAI,CAAC;IAC/C,KAAK,EAAE,4BAA4B;IACnC,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,SAAS,uCAAuC,CAC9C,CAAmD;IAEnD,OAAO;QACL,GAAG,gCAAgC,CAAC,CAAC,CAAC;QACtC,OAAO,EAAE,CAAC,CAAC,OAAO;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,kCAAkC,GAAG,mCAAmC,CAAC,IAAI,CACxF,uCAAuC,CACxC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { ResizeRule } from "@paroicms/public-anywhere-lib";
2
- import type { ImageVariant, ImageVariantWithBinary, UsedRawSize } from "../engine-types.js";
2
+ import type { ImageVariantWithBinary, UsedRawSize } from "../engine-types.js";
3
3
  import type { VariantEngineContext } from "./engine-context.js";
4
4
  import type { ResizeOwner, StoredCacheItem } from "./internal.types.js";
5
5
  export declare function insertIntoImageVariant(ctx: Pick<VariantEngineContext, "cn">, data: {
@@ -19,15 +19,6 @@ export declare function insertIntoPaImageCacheOwner(ctx: Pick<VariantEngineConte
19
19
  imageCacheId: string;
20
20
  owners: ResizeOwner[];
21
21
  }): Promise<void>;
22
- export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "logger">, input: {
23
- mediaId: string;
24
- mediaType: string;
25
- rawWidth: number;
26
- rawHeight: number;
27
- }): Promise<{
28
- id: string;
29
- variant: ImageVariant;
30
- } | undefined>;
31
22
  export declare function fetchImageVariantWithBinary(ctx: Pick<VariantEngineContext, "cn" | "logger">, input: {
32
23
  mediaId: string;
33
24
  mediaType: string;
@@ -80,4 +71,9 @@ export declare function fetchBatchOfStoredCacheItems(ctx: Pick<VariantEngineCont
80
71
  mediaIds: string[];
81
72
  }[], alreadyOwnedBy: string): Promise<StoredCacheItem[]>;
82
73
  export declare function clearAll({ cn }: VariantEngineContext): Promise<void>;
74
+ export declare function makeMTypeRSizeKey(image: {
75
+ mediaType: string;
76
+ rawWidth: number;
77
+ rawHeight: number;
78
+ }): string;
83
79
  export declare function fetchUsedRawSizesByMedia(ctx: Pick<VariantEngineContext, "cn" | "logger">, mediaId: string): Promise<UsedRawSize[]>;
@@ -1,4 +1,27 @@
1
- import { dateVal, isDef, nbVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
1
+ import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
2
+ import { isDef } from "@paroicms/public-anywhere-lib";
3
+ import { type } from "arktype";
4
+ import { BatchStoredCacheItemRowAT, ImageVariantRowAT, ImageVariantWithBinaryByOwnerRowAT, ImageVariantWithBinaryRowAT, } from "./queries-at.js";
5
+ const ExistingImageCacheRowAT = type({
6
+ id: "number",
7
+ "+": "reject",
8
+ }).pipe((r) => ({
9
+ id: String(r.id),
10
+ }));
11
+ const InsertedImageCacheRowAT = type({
12
+ id: "number",
13
+ modifiedAt: "string|number|Date",
14
+ "+": "reject",
15
+ }).pipe((r) => ({
16
+ id: String(r.id),
17
+ modifiedAt: parseSqliteDateTime(r.modifiedAt),
18
+ }));
19
+ const ModifiedAtRowAT = type({
20
+ modifiedAt: "string|number|Date",
21
+ "+": "reject",
22
+ }).pipe((r) => ({
23
+ modifiedAt: parseSqliteDateTime(r.modifiedAt),
24
+ }));
2
25
  export async function insertIntoImageVariant(ctx, data, owners) {
3
26
  const { cn } = ctx;
4
27
  const mTypeRSize = makeMTypeRSizeKey(data);
@@ -9,7 +32,7 @@ export async function insertIntoImageVariant(ctx, data, owners) {
9
32
  mTypeRSize,
10
33
  })
11
34
  .first();
12
- let imageCacheId = existingRow ? strVal(existingRow.id) : undefined;
35
+ let imageCacheId = existingRow ? ExistingImageCacheRowAT.assert(existingRow).id : undefined;
13
36
  let modifiedAt;
14
37
  if (imageCacheId === undefined) {
15
38
  const [inserted] = await cn("PaImageCache")
@@ -26,8 +49,9 @@ export async function insertIntoImageVariant(ctx, data, owners) {
26
49
  modifiedAt: cn.fn.now(),
27
50
  })
28
51
  .returning(["id", "modifiedAt"]);
29
- imageCacheId = strVal(inserted.id);
30
- modifiedAt = dateVal(inserted.modifiedAt);
52
+ const newValues = InsertedImageCacheRowAT.assert(inserted);
53
+ imageCacheId = newValues.id;
54
+ modifiedAt = newValues.modifiedAt;
31
55
  }
32
56
  else {
33
57
  await cn("PaImageCache")
@@ -45,7 +69,7 @@ export async function insertIntoImageVariant(ctx, data, owners) {
45
69
  .first();
46
70
  if (!row)
47
71
  throw new Error(`missing cache row: ${imageCacheId}`);
48
- modifiedAt = dateVal(row.modifiedAt);
72
+ modifiedAt = ModifiedAtRowAT.assert(row).modifiedAt;
49
73
  }
50
74
  await insertIntoPaImageCacheOwner(ctx, { imageCacheId, owners });
51
75
  return { imageCacheId, lastModified: modifiedAt.toISOString() };
@@ -66,40 +90,6 @@ export async function insertIntoPaImageCacheOwner(ctx, input) {
66
90
  .ignore();
67
91
  }
68
92
  }
69
- export async function fetchImageVariant(ctx, input) {
70
- const { mediaId, rawWidth, rawHeight } = input;
71
- const row = await ctx
72
- .cn("PaImageCache as v")
73
- .select([
74
- "v.id",
75
- "v.mediaType",
76
- "v.rawWidth",
77
- "v.rawHeight",
78
- "v.modifiedAt",
79
- "v.resourceVersion",
80
- "v.slug",
81
- ])
82
- .where({
83
- "v.mediaId": mediaId,
84
- "v.mTypeRSize": makeMTypeRSizeKey(input),
85
- })
86
- .first();
87
- if (!row)
88
- return;
89
- const id = strVal(row.id);
90
- return {
91
- id,
92
- variant: {
93
- mediaId,
94
- resourceVersion: strVal(row.resourceVersion),
95
- slug: strValOrUndef(row.slug),
96
- mediaType: strVal(row.mediaType),
97
- rawWidth: nbVal(row.rawWidth),
98
- rawHeight: nbVal(row.rawHeight),
99
- rawSizeName: `${rawWidth}x${rawHeight}`,
100
- },
101
- };
102
- }
103
93
  export async function fetchImageVariantWithBinary(ctx, input) {
104
94
  const { mediaId } = input;
105
95
  const row = await ctx
@@ -122,22 +112,18 @@ export async function fetchImageVariantWithBinary(ctx, input) {
122
112
  .first();
123
113
  if (!row)
124
114
  return;
125
- const id = strVal(row.id);
126
- const rawWidth = nbVal(row.rawWidth);
127
- const rawHeight = nbVal(row.rawHeight);
115
+ const { binaryFile, ...rest } = row;
116
+ const { imageCacheId, variant, modifiedAt, weightB } = ImageVariantWithBinaryRowAT.assert({
117
+ ...rest,
118
+ mediaId,
119
+ });
128
120
  return {
129
- id,
121
+ id: imageCacheId,
130
122
  variant: {
131
- mediaId,
132
- resourceVersion: strVal(row.resourceVersion),
133
- slug: strValOrUndef(row.slug),
134
- mediaType: strVal(row.mediaType),
135
- rawWidth,
136
- rawHeight,
137
- weightB: nbVal(row.weightB),
138
- binaryFile: row.binaryFile,
139
- lastModified: dateVal(row.modifiedAt).toISOString(),
140
- rawSizeName: `${rawWidth}x${rawHeight}`,
123
+ ...variant,
124
+ weightB,
125
+ binaryFile: binaryFile,
126
+ lastModified: modifiedAt.toISOString(),
141
127
  },
142
128
  };
143
129
  }
@@ -167,22 +153,15 @@ export async function fetchImageVariantWithBinaryByOwner(ctx, input) {
167
153
  .first();
168
154
  if (!row)
169
155
  return;
170
- const id = strVal(row.id);
171
- const rawWidth = nbVal(row.rawWidth);
172
- const rawHeight = nbVal(row.rawHeight);
156
+ const { binaryFile, ...rest } = row;
157
+ const { imageCacheId: id, modifiedAt, variant, weightB, } = ImageVariantWithBinaryByOwnerRowAT.assert(rest);
173
158
  return {
174
159
  id,
175
160
  variant: {
176
- mediaId: strVal(row.mediaId),
177
- resourceVersion: strVal(row.resourceVersion),
178
- slug: strValOrUndef(row.slug),
179
- mediaType: strVal(row.mediaType),
180
- rawWidth,
181
- rawHeight,
182
- weightB: nbVal(row.weightB),
183
- binaryFile: row.binaryFile,
184
- lastModified: dateVal(row.modifiedAt).toISOString(),
185
- rawSizeName: `${rawWidth}x${rawHeight}`,
161
+ ...variant,
162
+ weightB,
163
+ binaryFile: binaryFile,
164
+ lastModified: modifiedAt.toISOString(),
186
165
  },
187
166
  };
188
167
  }
@@ -219,6 +198,14 @@ export async function deleteOrphanVariants(ctx) {
219
198
  .delete();
220
199
  return result;
221
200
  }
201
+ const PreviousOwnedRowAT = type({
202
+ imageCacheId: "number",
203
+ rawResizeR: "string",
204
+ "+": "reject",
205
+ }).pipe((r) => ({
206
+ imageCacheId: String(r.imageCacheId),
207
+ rawResizeR: r.rawResizeR,
208
+ }));
222
209
  export async function associateOwnerToImages(ctx, { ownerHandle, cacheImages, isHandleReusable, }) {
223
210
  const { cn } = ctx;
224
211
  await cn.transaction(async (tx) => {
@@ -226,10 +213,7 @@ export async function associateOwnerToImages(ctx, { ownerHandle, cacheImages, is
226
213
  .select(["imageCacheId", "rawResizeR"])
227
214
  .where({ ownerHandle });
228
215
  const prevOwnedItems = new Map(prevRows.map((row) => {
229
- const item = {
230
- imageCacheId: strVal(row.imageCacheId),
231
- rawResizeR: strVal(row.rawResizeR),
232
- };
216
+ const item = PreviousOwnedRowAT.assert(row);
233
217
  return [makeCacheImageKey(item), item];
234
218
  }));
235
219
  const newCacheImages = new Map(cacheImages.map((i) => [makeCacheImageKey(i), i.rawResizeR]));
@@ -272,18 +256,20 @@ export async function fetchStoredCacheItems(ctx, ownerHandle) {
272
256
  "v.mediaType",
273
257
  "v.rawWidth",
274
258
  "v.rawHeight",
275
- "v.modifiedAt",
276
259
  "v.resourceVersion",
277
260
  "v.slug",
278
261
  ])
279
262
  .join("PaImageCacheOwner as o", "o.imageCacheId", "v.id")
280
263
  .where("o.ownerHandle", ownerHandle);
281
264
  const rows = await query;
282
- return rows.map((row) => ({
283
- imageCacheId: strVal(row.id),
284
- variant: formatImageVariant(row),
285
- alreadyOwned: true,
286
- }));
265
+ return rows.map((row) => {
266
+ const { imageCacheId, variant } = ImageVariantRowAT.assert(row);
267
+ return {
268
+ imageCacheId,
269
+ variant,
270
+ alreadyOwned: true,
271
+ };
272
+ });
287
273
  }
288
274
  export async function fetchBatchOfStoredCacheItems(ctx, groups, alreadyOwnedBy) {
289
275
  if (groups.length === 0)
@@ -296,7 +282,6 @@ export async function fetchBatchOfStoredCacheItems(ctx, groups, alreadyOwnedBy)
296
282
  "v.mediaType",
297
283
  "v.rawWidth",
298
284
  "v.rawHeight",
299
- "v.modifiedAt",
300
285
  "v.resourceVersion",
301
286
  "v.slug",
302
287
  "o.ownerHandle",
@@ -315,30 +300,28 @@ export async function fetchBatchOfStoredCacheItems(ctx, groups, alreadyOwnedBy)
315
300
  }
316
301
  });
317
302
  const rows = await query;
318
- return rows.map((row) => ({
319
- imageCacheId: strVal(row.id),
320
- variant: formatImageVariant(row),
321
- alreadyOwned: isDef(row.ownerHandle),
322
- }));
303
+ return rows.map((row) => {
304
+ const { imageCacheId, variant, ownerHandle } = BatchStoredCacheItemRowAT.assert(row);
305
+ return {
306
+ imageCacheId,
307
+ variant,
308
+ alreadyOwned: isDef(ownerHandle),
309
+ };
310
+ });
323
311
  }
324
312
  export async function clearAll({ cn }) {
325
313
  await cn("PaImageCacheOwner").delete();
326
314
  await cn("PaImageCache").delete();
327
315
  }
328
- function makeMTypeRSizeKey(image) {
316
+ const UsedRawSizeRowAT = type({
317
+ rawResizeR: "string",
318
+ rawWidth: "number",
319
+ rawHeight: "number",
320
+ "+": "reject",
321
+ });
322
+ export function makeMTypeRSizeKey(image) {
329
323
  return `${image.rawWidth}x${image.rawHeight}:${image.mediaType}`;
330
324
  }
331
- function formatImageVariant(row) {
332
- return {
333
- mediaId: strVal(row.mediaId),
334
- resourceVersion: strVal(row.resourceVersion),
335
- slug: strValOrUndef(row.slug),
336
- mediaType: strVal(row.mediaType),
337
- rawWidth: nbVal(row.rawWidth),
338
- rawHeight: nbVal(row.rawHeight),
339
- rawSizeName: `${nbVal(row.rawWidth)}x${nbVal(row.rawHeight)}`,
340
- };
341
- }
342
325
  export async function fetchUsedRawSizesByMedia(ctx, mediaId) {
343
326
  const { cn } = ctx;
344
327
  const rows = await cn("PaImageCache as v")
@@ -348,9 +331,12 @@ export async function fetchUsedRawSizesByMedia(ctx, mediaId) {
348
331
  .orderBy("v.rawWidth", "asc")
349
332
  .orderBy("v.rawHeight", "asc")
350
333
  .distinct();
351
- return rows.map((row) => ({
352
- rawResizeR: strVal(row.rawResizeR),
353
- rawSizeName: `${nbVal(row.rawWidth)}x${nbVal(row.rawHeight)}`,
354
- }));
334
+ return rows.map((row) => {
335
+ const { rawResizeR, rawWidth, rawHeight } = UsedRawSizeRowAT.assert(row);
336
+ return {
337
+ rawResizeR: rawResizeR,
338
+ rawSizeName: `${rawWidth}x${rawHeight}`,
339
+ };
340
+ });
355
341
  }
356
342
  //# sourceMappingURL=queries.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paroicms/server-image-cache-engine",
3
- "version": "1.23.3",
3
+ "version": "1.25.0",
4
4
  "description": "The image variant engine that we use at Paroi.",
5
5
  "author": "Paroi Team",
6
6
  "keywords": [
@@ -34,11 +34,11 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@paroi/async-lib": "~0.3.1",
37
- "@paroi/data-formatters-lib": "~0.4.0",
38
- "@paroicms/internal-anywhere-lib": "1.29.1",
39
- "@paroicms/internal-server-lib": "1.16.3",
40
- "@paroicms/public-anywhere-lib": "0.23.1",
41
- "@paroicms/public-server-lib": "0.35.1",
37
+ "@paroicms/internal-anywhere-lib": "1.31.0",
38
+ "@paroicms/internal-server-lib": "1.18.0",
39
+ "@paroicms/public-anywhere-lib": "0.25.0",
40
+ "@paroicms/public-server-lib": "0.37.0",
41
+ "arktype": "~2.1.20",
42
42
  "ico-endec": "~0.1.6",
43
43
  "sharp": "~0.34.2"
44
44
  },
@@ -1,2 +0,0 @@
1
- import type { OriginalImage } from "./original-images-processing.js";
2
- export declare function createDefaultBoFavicon(binaryFile: Buffer): Promise<OriginalImage>;
@@ -1 +0,0 @@
1
- {"version":3,"file":"default-bo-favicon.js","sourceRoot":"","sources":["../src/default-bo-favicon.ts"],"names":[],"mappings":"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"}