@paroicms/server 1.11.1 → 1.12.0

package/README.md

@@ -13,7 +13,10 @@ npm i
 npm run dev
 ```
 
-Then, connect to your back-office: http://localhost:8080/adm . Use `dev@localhost` for the login and `init` for the password.
+Then, connect to your back-office: http://localhost:8080/adm . Use `dev@localhost` for the login,
+and `init` for the password.
+
+### Tips
 
 Here are some tips:
 
@@ -33,7 +36,8 @@ Here are some tips:
 
 ## Documentation
 
-The documentation on how to configure ParoiCMS is [here](https://gitlab.com/paroi/opensource/paroicms/-/blob/main/documentation/configuration/index.md).
+- [Documentation on `config.json`](https://gitlab.com/paroi/opensource/paroicms/-/blob/main/documentation/configuration/index.md).
+- [Documentation on `site-schema.json`](https://gitlab.com/paroi/opensource/paroicms/-/blob/main/documentation/json-of-site-schema/README.md).
 
 ## Contribute
 

package/ddl/main.ddl.sql

@@ -6,7 +6,7 @@ create table PaDbMetadata (
   dbVersion integer not null
 );
 
-insert into PaDbMetadata (dbSchema, dbVersion) values ('main', 5);
+insert into PaDbMetadata (dbSchema, dbVersion) values ('main', 6);
 
 create table PaAccount (
   id integer not null primary key autoincrement,
@@ -22,7 +22,7 @@ create table PaLeaf (
   leafType varchar(100) not null,
   parentId integer references PaLeaf (id),
   depth smallint not null,
-  relativeId varchar(36) not null,
+  relativeId varchar(100) not null,
   publishDate timestamp,
   unique (parentId, relativeId)
 );

package/dist/common/serve-html-or.d.ts

@@ -1,16 +1,16 @@
 import { type Tracker } from "@paroicms/server-lib";
 import type { Request, Response } from "express";
 import type { SiteContext } from "../site-context/site-context.types";
-export interface ServeHtmlOr {
+export interface ServeTextOr {
     serveFromCache: () => Promise<boolean>;
     putInCacheAndServe: (html: string, dependencyKeys: string[]) => Promise<void>;
 }
-export declare function serveHtmlFromCacheOr(siteContext: SiteContext, tracker: Tracker, options: {
+export declare function serveTextFromCacheOr(siteContext: SiteContext, tracker: Tracker, options: {
     cacheKey: string;
     req: Request;
     res: Response;
     contentType?: string;
-}): ServeHtmlOr;
+}): ServeTextOr;
 export declare function render404Html(siteContext: SiteContext, res: Response, options?: {
     lang?: string;
 }): Promise<void>;

package/dist/common/serve-html-or.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.render404Html = exports.serveHtmlFromCacheOr = void 0;
+exports.render404Html = exports.serveTextFromCacheOr = void 0;
 const server_lib_1 = require("@paroicms/server-lib");
 const http_helpers_1 = require("../express/http-helpers");
 const render_liquidjs_1 = require("../liquidjs-tools/liquidjs-rendering/render-liquidjs");
@@ -8,63 +8,67 @@ const rendering_context_1 = require("../liquidjs-tools/liquidjs-rendering/render
 const make_basic_payload_1 = require("../public-payload/make-basic-payload");
 const text_cache_1 = require("./text-cache");
 const tracker_report_1 = require("./tracker-report");
-function serveHtmlFromCacheOr(siteContext, tracker, options) {
+function serveTextFromCacheOr(siteContext, tracker, options) {
     const { cacheKey, req, res, contentType } = options;
     return {
         async serveFromCache() {
-            const cacheHtml = await siteContext.textCache.getCacheValue(cacheKey, tracker);
-            if (!cacheHtml)
+            const cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
+            if (!cacheVal)
                 return false;
-            (0, http_helpers_1.serveContent)({
+            (0, http_helpers_1.serveTextContent)({
                 res,
                 contentType,
-                html: cacheHtml.value,
-                or304: {
-                    req,
-                    lastModified: cacheHtml.lastModified,
-                },
+                text: cacheVal.value,
+                or304: cacheVal.resourceVersion
+                    ? {
+                        req,
+                        etag: cacheVal.resourceVersion,
+                    }
+                    : undefined,
             });
             return true;
         },
         async putInCacheAndServe(html, dependencyKeys) {
-            const cacheHtml = await siteContext.textCache.setCacheValue({
+            const cacheVal = await siteContext.textCache.setCacheValue({
                 cacheKey,
                 dependencyKeys,
                 value: html,
             }, tracker);
-            (0, http_helpers_1.serveContent)({
+            (0, http_helpers_1.serveTextContent)({
                 res,
                 contentType,
-                html: cacheHtml.value,
-                or304: {
-                    req,
-                    lastModified: cacheHtml.lastModified,
-                },
+                text: cacheVal.value,
+                or304: cacheVal.resourceVersion
+                    ? {
+                        req,
+                        etag: cacheVal.resourceVersion,
+                    }
+                    : undefined,
             });
         },
     };
 }
-exports.serveHtmlFromCacheOr = serveHtmlFromCacheOr;
+exports.serveTextFromCacheOr = serveTextFromCacheOr;
 async function render404Html(siteContext, res, options) {
     const tracker = (0, server_lib_1.createTracker)();
     const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: "404" });
-    let cacheHtml = await siteContext.textCache.getCacheValue(cacheKey, tracker);
-    if (!cacheHtml) {
+    let cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
+    if (!cacheVal) {
         const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
         const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
             templateNames: ["404"],
             payload: (0, make_basic_payload_1.makePublicBasicPayload)(siteContext, renderingContext, options),
         });
-        cacheHtml = await siteContext.textCache.setCacheValue({
+        cacheVal = await siteContext.textCache.setCacheValue({
             cacheKey,
             dependencyKeys: renderingContext.getDependencyKeys(),
             value: html,
         }, tracker);
     }
-    (0, http_helpers_1.serveContent)({
-        status: 404,
+    (0, http_helpers_1.serveTextContent)({
         res,
-        html: cacheHtml.value,
+        status: 404,
+        text: cacheVal.value,
     });
     siteContext.siteLog.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${404}`));
 }

package/dist/common/serve-html-or.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-html-or.js","sourceRoot":"","sources":["../../src/common/serve-html-or.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AAEnE,0DAAuD;AACvD,0FAA4F;AAC5F,8FAAgG;AAChG,6EAA8E;AAE9E,6CAA4C;AAC5C,qDAA0D;AAO1D,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,OAAgB,EAChB,OAQC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC/E,IAAI,CAAC,SAAS;gBAAE,OAAO,KAAK,CAAC;YAE7B,IAAA,2BAAY,EAAC;gBACX,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,SAAS,CAAC,KAAK;gBACrB,KAAK,EAAE;oBACL,GAAG;oBACH,YAAY,EAAE,SAAS,CAAC,YAAY;iBACrC;aACF,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc;YAC3C,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACzD;gBACE,QAAQ;gBACR,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,IAAA,2BAAY,EAAC;gBACX,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,SAAS,CAAC,KAAK;gBACrB,KAAK,EAAE;oBACL,GAAG;oBACH,YAAY,EAAE,SAAS,CAAC,YAAY;iBACrC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AApDD,oDAoDC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA2B;IAE3B,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,IAAI,SAAS,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SACxE,CAAC,CAAC;QAEH,SAAS,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACnD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAA,2BAAY,EAAC;QACX,MAAM,EAAE,GAAG;QACX,GAAG;QACH,IAAI,EAAE,SAAS,CAAC,KAAK;KACtB,CAAC,CAAC;IACH,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC;AAhCD,sCAgCC"}
+{"version":3,"file":"serve-html-or.js","sourceRoot":"","sources":["../../src/common/serve-html-or.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AAEnE,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG,6EAA8E;AAE9E,6CAA4C;AAC5C,qDAA0D;AAO1D,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,OAAgB,EAChB,OAQC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc;YAC3C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ;gBACR,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAxDD,oDAwDC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA2B;IAE3B,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SACxE,CAAC,CAAC;QAEH,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAClD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAA,+BAAgB,EAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC;AAhCD,sCAgCC"}

package/dist/express/http-helpers.d.ts

@@ -1,16 +1,19 @@
 import type { Request, Response } from "express";
 import type { SiteContext } from "../site-context/site-context.types";
-export declare function serveContent({ res, status, contentType, html, or304, }: {
+export declare function serveTextContent({ res, status, contentType, text, or304, }: {
     res: Response;
     status?: number;
     contentType?: string;
-    html: string;
+    text: string;
     or304?: {
-        lastModified: string;
+        etag: string;
         req: Request;
     };
 }): void;
 export declare function serve500Html(res: Response, _siteContext?: SiteContext): void;
 export declare function serve404SimpleHtml(res: Response): void;
-export declare function serve304NotModified(res: Response): void;
+export declare function serve304NotModified(res: Response, headers: {
+    cacheControl: string;
+    etag: string;
+}): void;
 export declare function serve301Redirect(res: Response, redirectTo: string): void;

package/dist/express/http-helpers.js

@@ -1,44 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve301Redirect = exports.serve304NotModified = exports.serve404SimpleHtml = exports.serve500Html = exports.serveContent = void 0;
-function serveContent({ res, status, contentType, html, or304, }) {
-    res.status(status ?? 200);
-    res.setHeader("Content-Type", contentType ?? "text/html");
+exports.serve301Redirect = exports.serve304NotModified = exports.serve404SimpleHtml = exports.serve500Html = exports.serveTextContent = void 0;
+function serveTextContent({ res, status, contentType, text, or304, }) {
+    const cacheControl = "no-cache";
     if (or304) {
-        res.append("Last-Modified", or304.lastModified);
-        if (or304.req.headers["if-modified-since"] === or304.lastModified) {
-            serve304NotModified(res);
-            return;
+        if (or304.req.headers["if-none-match"] === or304.etag) {
+            return serve304NotModified(res, {
+                cacheControl,
+                etag: or304.etag,
+            });
         }
+        res.append("Cache-Control", cacheControl);
+        res.append("Etag", or304.etag);
+    }
+    else {
+        res.append("Cache-Control", cacheControl);
     }
-    res.send(html);
+    const buf = Buffer.from(text, "utf-8");
+    res.append("Content-Type", contentType ?? "text/html; charset=utf-8");
+    res.append("Content-Length", buf.byteLength.toString());
+    res.status(status ?? 200);
+    res.send(buf);
     res.end();
 }
-exports.serveContent = serveContent;
+exports.serveTextContent = serveTextContent;
 function serve500Html(res, _siteContext) {
-    res.status(500);
-    res.setHeader("Content-Type", "text/html");
-    res.send(`<!DOCTYPE html>
-<p>Internal error</p>`);
-    res.end();
+    const html = `<!DOCTYPE html>
+<p>Internal error</p>`;
+    serveTextContent({
+        res,
+        status: 500,
+        text: html,
+    });
 }
 exports.serve500Html = serve500Html;
 function serve404SimpleHtml(res) {
-    res.status(404);
-    res.setHeader("Content-Type", "text/html");
-    res.send(`<!DOCTYPE html>
-<p>404 Not Found</p>`);
-    res.end();
+    const html = `<!DOCTYPE html>
+<p>404 Not Found</p>`;
+    serveTextContent({
+        res,
+        status: 404,
+        text: html,
+    });
 }
 exports.serve404SimpleHtml = serve404SimpleHtml;
-function serve304NotModified(res) {
+function serve304NotModified(res, headers) {
+    res.append("Cache-Control", headers.cacheControl);
+    res.append("Etag", headers.etag);
     res.status(304);
+    res.send();
     res.end();
 }
 exports.serve304NotModified = serve304NotModified;
 function serve301Redirect(res, redirectTo) {
     res.set("location", redirectTo);
-    res.status(301).send();
+    res.status(301);
+    res.send();
+    res.end();
 }
 exports.serve301Redirect = serve301Redirect;
 //# sourceMappingURL=http-helpers.js.map

package/dist/express/http-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAAC,EAC3B,GAAG,EACH,MAAM,EACN,WAAW,EACX,IAAI,EACJ,KAAK,GAaN;IACC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,IAAI,WAAW,CAAC,CAAC;IAC1D,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;YAClE,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;IACH,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AA9BD,oCA8BC;AAED,SAAgB,YAAY,CAAC,GAAa,EAAE,YAA0B;IACpE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC3C,GAAG,CAAC,IAAI,CAAC;sBACW,CAAC,CAAC;IACtB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAND,oCAMC;AAED,SAAgB,kBAAkB,CAAC,GAAa;IAC9C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC3C,GAAG,CAAC,IAAI,CAAC;qBACU,CAAC,CAAC;IACrB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAND,gDAMC;AAED,SAAgB,mBAAmB,CAAC,GAAa;IAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAHD,kDAGC;AAED,SAAgB,gBAAgB,CAAC,GAAa,EAAE,UAAkB;IAChE,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AAHD,4CAGC"}
+{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,WAAW,EACX,IAAI,EACJ,KAAK,GAaN;IACC,MAAM,YAAY,GAAG,UAAU,CAAC;IAChC,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACtD,OAAO,mBAAmB,CAAC,GAAG,EAAE;gBAC9B,YAAY;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,IAAI,0BAA0B,CAAC,CAAC;IACtE,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxD,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAvCD,4CAuCC;AAED,SAAgB,YAAY,CAAC,GAAa,EAAE,YAA0B;IACpE,MAAM,IAAI,GAAG;sBACO,CAAC;IACrB,gBAAgB,CAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC;AARD,oCAQC;AAED,SAAgB,kBAAkB,CAAC,GAAa;IAC9C,MAAM,IAAI,GAAG;qBACM,CAAC;IACpB,gBAAgB,CAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC;AARD,gDAQC;AAED,SAAgB,mBAAmB,CACjC,GAAa,EACb,OAA+C;IAE/C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;IACX,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AATD,kDASC;AAED,SAAgB,gBAAgB,CAAC,GAAa,EAAE,UAAkB;IAChE,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;IACX,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AALD,4CAKC"}

package/dist/helpers/url.helpers.d.ts

@@ -1,2 +1,33 @@
+import type { CompleteVariantName } from "@paroicms/server-image-cache-engine";
 import type { SiteConf } from "../site-context/site-conf";
+import type { SiteContext } from "../site-context/site-context.types";
 export declare function getBoUrl(siteConf: SiteConf, path?: string): string;
+export interface UrlOfMediaFileValues {
+    mediaUid: string;
+    mediaType: string;
+    originalName: string | undefined;
+    absoluteUrl?: boolean;
+}
+export declare function makeUrlOfMediaFile(siteContext: Pick<SiteContext, "siteUrl">, values: UrlOfMediaFileValues): string;
+export declare function makeUrlOfMediaFile(siteContext: Pick<SiteContext, "siteUrl">, values: UrlOfMediaFileValues, options: {
+    returnObj: true;
+}): {
+    url: string;
+    fileName: string;
+};
+export interface UrlOfImageVariantValues {
+    mediaUid: string;
+    mediaType: string;
+    completeVariantName: CompleteVariantName;
+    resourceVersion: string | undefined;
+    slug: string | undefined;
+    absoluteUrl?: boolean;
+}
+export declare function makeUrlOfImageVariant(siteContext: Pick<SiteContext, "siteUrl">, values: UrlOfImageVariantValues): string;
+export declare function makeUrlOfImageVariant(siteContext: Pick<SiteContext, "siteUrl">, values: UrlOfImageVariantValues, options: {
+    returnObj: true;
+}): {
+    url: string;
+    fileName: string;
+};
+export declare function fileExtensionOf(mediaType: string): string;

package/dist/helpers/url.helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBoUrl = void 0;
+exports.fileExtensionOf = exports.makeUrlOfImageVariant = exports.makeUrlOfMediaFile = exports.getBoUrl = void 0;
 const context_1 = require("../context");
 function getBoUrl(siteConf, path) {
     const { https } = context_1.appConf.thisServer;
@@ -9,4 +9,34 @@ function getBoUrl(siteConf, path) {
     return `${protocol}://${fqdn}${context_1.boPublicPort !== 80 ? `:${context_1.boPublicPort}` : ""}${path ?? ""}`;
 }
 exports.getBoUrl = getBoUrl;
+function makeUrlOfMediaFile(siteContext, values, options) {
+    const { mediaUid, mediaType, originalName, absoluteUrl } = values;
+    const fileName = `${originalName ?? "unamed"}${fileExtensionOf(mediaType)}`;
+    const relUrl = `/medias/${encodeURIComponent(mediaUid)}/file/${encodeURIComponent(fileName)}`;
+    const url = absoluteUrl ? `${siteContext.siteUrl}${relUrl}` : relUrl;
+    return options?.returnObj ? { url, fileName } : url;
+}
+exports.makeUrlOfMediaFile = makeUrlOfMediaFile;
+function makeUrlOfImageVariant(siteContext, values, options) {
+    const { mediaUid, mediaType, completeVariantName, slug, resourceVersion, absoluteUrl } = values;
+    const fileName = `${slug ?? "unamed"}-${completeVariantName}${fileExtensionOf(mediaType)}`;
+    let relUrl;
+    if (resourceVersion) {
+        relUrl = `/medias/${encodeURIComponent(mediaUid)}/image/${encodeURIComponent(resourceVersion)}/${encodeURIComponent(fileName)}`;
+    }
+    else {
+        relUrl = `/medias/${encodeURIComponent(mediaUid)}/image/${encodeURIComponent(fileName)}`;
+    }
+    const url = absoluteUrl ? `${siteContext.siteUrl}${relUrl}` : relUrl;
+    return options?.returnObj ? { url, fileName } : url;
+}
+exports.makeUrlOfImageVariant = makeUrlOfImageVariant;
+function fileExtensionOf(mediaType) {
+    const regexMatchArray = mediaType.match(/\w+\/([-+.\w]+)/);
+    if (!regexMatchArray) {
+        throw new Error("media extension is incorrect.");
+    }
+    return `.${regexMatchArray[1]}`;
+}
+exports.fileExtensionOf = fileExtensionOf;
 //# sourceMappingURL=url.helpers.js.map

package/dist/helpers/url.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.helpers.js","sourceRoot":"","sources":["../../src/helpers/url.helpers.ts"],"names":[],"mappings":";;;AAAA,wCAAmD;AAGnD,SAAgB,QAAQ,CAAC,QAAkB,EAAE,IAAa;IACxD,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAO,CAAC,UAAU,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1C,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,sBAAY,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,sBAAY,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AAC9F,CAAC;AALD,4BAKC"}
+{"version":3,"file":"url.helpers.js","sourceRoot":"","sources":["../../src/helpers/url.helpers.ts"],"names":[],"mappings":";;;AACA,wCAAmD;AAInD,SAAgB,QAAQ,CAAC,QAAkB,EAAE,IAAa;IACxD,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAO,CAAC,UAAU,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1C,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,sBAAY,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,sBAAY,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AAC9F,CAAC;AALD,4BAKC;AAkBD,SAAgB,kBAAkB,CAChC,WAAyC,EACzC,MAA4B,EAC5B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAClE,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,SAAS,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAE9F,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAZD,gDAYC;AAoBD,SAAgB,qBAAqB,CACnC,WAAyC,EACzC,MAA+B,EAC/B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,mBAAmB,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAEhG,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,QAAQ,IAAI,mBAAmB,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3F,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAC1E,eAAe,CAChB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3F,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAnBD,sDAmBC;AAED,SAAgB,eAAe,CAAC,SAAiB;IAC/C,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;AAClC,CAAC;AARD,0CAQC"}

package/dist/helpers/utils-helper.d.ts

@@ -1,4 +1,3 @@
-export declare function toHttpHeaderIfModifiedSince(time: unknown): string;
-export declare function mediaTypeToFileExtension(mediaType: string): string;
 export declare function pascalCaseToDashed(s: string): string;
 export declare function toLeafId(leafOrSectionId: string): string;
+export declare function removeExtensionFromFileName(fileName: string): string;

package/dist/helpers/utils-helper.js

@@ -1,20 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLeafId = exports.pascalCaseToDashed = exports.mediaTypeToFileExtension = exports.toHttpHeaderIfModifiedSince = void 0;
-const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+exports.removeExtensionFromFileName = exports.toLeafId = exports.pascalCaseToDashed = void 0;
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
-function toHttpHeaderIfModifiedSince(time) {
-    return (0, data_formatters_lib_1.dateVal)(time).toUTCString();
-}
-exports.toHttpHeaderIfModifiedSince = toHttpHeaderIfModifiedSince;
-function mediaTypeToFileExtension(mediaType) {
-    const regexMatchArray = mediaType.match(/\w+\/([-+.\w]+)/);
-    if (!regexMatchArray) {
-        throw new Error("media extension is incorrect.");
-    }
-    return regexMatchArray[1];
-}
-exports.mediaTypeToFileExtension = mediaTypeToFileExtension;
 function pascalCaseToDashed(s) {
     return s
         .replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`)
@@ -29,4 +16,9 @@ function toLeafId(leafOrSectionId) {
         : leafOrSectionId;
 }
 exports.toLeafId = toLeafId;
+function removeExtensionFromFileName(fileName) {
+    const i = fileName.lastIndexOf(".");
+    return i === -1 ? fileName : fileName.slice(0, i);
+}
+exports.removeExtensionFromFileName = removeExtensionFromFileName;
 //# sourceMappingURL=utils-helper.js.map

package/dist/helpers/utils-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils-helper.js","sourceRoot":"","sources":["../../src/helpers/utils-helper.ts"],"names":[],"mappings":";;;AAAA,oEAAqD;AACrD,yDAAwD;AAExD,SAAgB,2BAA2B,CAAC,IAAa;IACvD,OAAO,IAAA,6BAAO,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;AACrC,CAAC;AAFD,kEAEC;AAED,SAAgB,wBAAwB,CAAC,SAAiB;IACxD,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AARD,4DAQC;AAED,SAAgB,kBAAkB,CAAC,CAAS;IAC1C,OAAO,CAAC;SACL,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;SAC/C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC;AAND,gDAMC;AAED,SAAgB,QAAQ,CAAC,eAAuB;IAC9C,OAAO,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,IAAA,6BAAc,EAAC,eAAe,CAAC,CAAC,MAAM;QACxC,CAAC,CAAC,eAAe,CAAC;AACtB,CAAC;AAJD,4BAIC"}
+{"version":3,"file":"utils-helper.js","sourceRoot":"","sources":["../../src/helpers/utils-helper.ts"],"names":[],"mappings":";;;AAAA,yDAAwD;AAExD,SAAgB,kBAAkB,CAAC,CAAS;IAC1C,OAAO,CAAC;SACL,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;SAC/C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC;AAND,gDAMC;AAED,SAAgB,QAAQ,CAAC,eAAuB;IAC9C,OAAO,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,IAAA,6BAAc,EAAC,eAAe,CAAC,CAAC,MAAM;QACxC,CAAC,CAAC,eAAe,CAAC;AACtB,CAAC;AAJD,4BAIC;AAED,SAAgB,2BAA2B,CAAC,QAAgB;IAC1D,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpD,CAAC;AAHD,kEAGC"}

package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTagCacheKeyForRendering = exports.createRenderingContext = void 0;
 let renderingSeq = 0n;
 async function createRenderingContext(siteContext, options) {
-    await siteContext.imageCache.resetCacheKey({ cacheKey: options.cacheKey });
+    await siteContext.imageCache.resetUsedKey({ usedKey: options.cacheKey });
     const { cacheKey, tracker } = options;
     const cache = new Map();
     const dependencies = new Set(options.dependencyKey ? [options.dependencyKey] : undefined);

package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"rendering-context.js","sourceRoot":"","sources":["../../../src/liquidjs-tools/liquidjs-rendering/rendering-context.ts"],"names":[],"mappings":";;;AAGA,IAAI,YAAY,GAAG,EAAE,CAAC;AAmBf,KAAK,UAAU,sBAAsB,CAC1C,WAA4C,EAC5C,OAIC;IAED,MAAM,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3E,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAClG,OAAO;QACL,WAAW,EAAE,EAAE,YAAY;QAC3B,QAAQ;QACR,OAAO;QACP,iBAAiB;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QACD,gBAAgB,CAAC,GAAG,cAAc;YAChC,KAAK,MAAM,GAAG,IAAI,cAAc;gBAAE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1D,CAAC;QACD,iBAAiB,CAAC,GAAG;YACnB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE3B,OAAO,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,iBAAiB,CAAC,GAAG,EAAE,GAAG;YACxB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC;AAhCD,wDAgCC;AAED,SAAgB,2BAA2B,CACzC,QAAgB,EAChB,EAAE,aAAa,EAA2B;IAE1C,OAAO,GAAG,QAAQ,IAAI,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;AAC5F,CAAC;AALD,kEAKC"}
+{"version":3,"file":"rendering-context.js","sourceRoot":"","sources":["../../../src/liquidjs-tools/liquidjs-rendering/rendering-context.ts"],"names":[],"mappings":";;;AAGA,IAAI,YAAY,GAAG,EAAE,CAAC;AAmBf,KAAK,UAAU,sBAAsB,CAC1C,WAA4C,EAC5C,OAIC;IAED,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEzE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAClG,OAAO;QACL,WAAW,EAAE,EAAE,YAAY;QAC3B,QAAQ;QACR,OAAO;QACP,iBAAiB;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QACD,gBAAgB,CAAC,GAAG,cAAc;YAChC,KAAK,MAAM,GAAG,IAAI,cAAc;gBAAE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1D,CAAC;QACD,iBAAiB,CAAC,GAAG;YACnB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE3B,OAAO,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,iBAAiB,CAAC,GAAG,EAAE,GAAG;YACxB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC;AAhCD,wDAgCC;AAED,SAAgB,2BAA2B,CACzC,QAAgB,EAChB,EAAE,aAAa,EAA2B;IAE1C,OAAO,GAAG,QAAQ,IAAI,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;AAC5F,CAAC;AALD,kEAKC"}

package/dist/modules/app.controller.js

@@ -13,17 +13,17 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppController = void 0;
-const node_stream_1 = require("node:stream");
 const common_1 = require("@nestjs/common");
+const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
+const node_stream_1 = require("node:stream");
 const media_handles_helpers_1 = require("../common/media-handles.helpers");
 const serve_html_or_1 = require("../common/serve-html-or");
 const context_1 = require("../context");
 const http_helpers_1 = require("../express/http-helpers");
-const utils_helper_1 = require("../helpers/utils-helper");
 const site_context_1 = require("../site-context/site-context");
 let AppController = class AppController {
     robotsTxt(res) {
-        res.setHeader("Content-Type", "text/plain");
+        res.setHeader("Content-Type", "text/plain; charset=utf-8");
         if (!context_1.appConf.allowRobots) {
             res.send(`User-agent: *
 Disallow: /`);
@@ -37,9 +37,12 @@ Disallow: /`);
         const media = await siteContext.mediaStorage.getMedia({ handle });
         if (media?.kind !== "image")
             return await (0, serve_html_or_1.render404Html)(siteContext, res);
-        const lastModified = (0, utils_helper_1.toHttpHeaderIfModifiedSince)(media.modifiedTs);
-        if (req.headers["if-modified-since"] === lastModified)
-            return (0, http_helpers_1.serve304NotModified)(res);
+        if (req.headers["if-none-match"] === media.resourceVersion) {
+            return (0, http_helpers_1.serve304NotModified)(res, {
+                cacheControl: "no-cache",
+                etag: media.resourceVersion,
+            });
+        }
         const file = await siteContext.imageCache.getOrCreateImageWithBinary({
             variantName: "16x16",
             imageRef: {
@@ -49,12 +52,13 @@ Disallow: /`);
                 mediaType: media.mediaType,
             },
             mediaType: "image/x-icon",
-            dependsOnCacheKey: "favicon16x16",
+            dependsOnUsedKey: "favicon16x16",
+            slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
         });
         if (!file)
             throw new Error(`favicon variant of '${media.uid}' should be available here`);
         res.setHeader("content-type", file.mediaType);
-        res.append("Last-Modified", lastModified);
+        res.append("Etag", file.resourceVersion);
         node_stream_1.Readable.from(file.binaryFile)
             .on("data", (chunk) => {
             res.write(chunk);

package/dist/modules/app.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/modules/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAuC;AACvC,2CAA2D;AAE3D,2EAAyE;AACzE,2DAAwD;AACxD,wCAAqC;AACrC,0DAA8D;AAC9D,0DAAsE;AACtE,+DAA8D;AAGvD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,SAAS,CAAQ,GAAa;QAC5B,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE5C,IAAI,CAAC,iBAAO,CAAC,WAAW,EAAE,CAAC;YACzB,GAAG,CAAC,IAAI,CAAC;YACH,CAAC,CAAC;YACR,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAQ,GAAY,EAAS,GAAa;QACrD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,8CAAsB,GAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE,IAAI,KAAK,OAAO;YAAE,OAAO,MAAM,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAE1E,MAAM,YAAY,GAAG,IAAA,0CAA2B,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnE,IAAI,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,YAAY;YAAE,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,CAAC;QAEvF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACnE,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE;gBACR,QAAQ,EAAE,KAAK,CAAC,GAAG;gBACnB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,SAAS,EAAE,KAAK,CAAC,SAAS;aAC3B;YACD,SAAS,EAAE,cAAc;YACzB,iBAAiB,EAAE,cAAc;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,CAAC,GAAG,4BAA4B,CAAC,CAAC;QAEzF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAE1C,sBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;aAC3B,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACpB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC;aACD,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACd,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;CACF,CAAA;AApDY,sCAAa;AAExB;IADC,IAAA,YAAG,EAAC,aAAa,CAAC;IACR,WAAA,IAAA,YAAG,GAAE,CAAA;;;;8CAUf;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4CAoCxC;wBAnDU,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAoDzB"}
+{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/modules/app.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/account/account.resolver.d.ts

@@ -1,6 +1,6 @@
+import { AccountObjectType, AccountPreferencesInput, AuthenticatedAccountObjectType, CreateAccountInput, UpdateAccountInput } from "./account.schema";
 import { JwtService } from "@nestjs/jwt";
 import type { GraphqlContext } from "../../graphql.types";
-import { AccountObjectType, AccountPreferencesInput, AuthenticatedAccountObjectType, CreateAccountInput, UpdateAccountInput } from "./account.schema";
 export declare class AccountResolver {
     private jwtService;
     constructor(jwtService: JwtService);

package/dist/modules/core/account/account.resolver.js

@@ -13,13 +13,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountResolver = void 0;
-const graphql_1 = require("@nestjs/graphql");
+const account_schema_1 = require("./account.schema");
 const common_1 = require("@nestjs/common");
+const graphql_1 = require("@nestjs/graphql");
 const jwt_1 = require("@nestjs/jwt");
 const site_context_1 = require("../../../site-context/site-context");
 const jwt_auth_guard_1 = require("../auth/jwt.auth.guard");
 const account_queries_1 = require("./account.queries");
-const account_schema_1 = require("./account.schema");
 let AccountResolver = class AccountResolver {
     jwtService;
     constructor(jwtService) {

package/dist/modules/core/account/account.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/account/account.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/document/document.resolver.d.ts

@@ -1,5 +1,5 @@
-import type { GraphqlContext } from "../../graphql.types";
 import { CreateDocumentValuesInput, CreateLeafWithDocumentValuesInput, DocumentObjectType, UpdateDocumentMetaValuesInput, UpdateDocumentTitleValuesInput } from "./document.schema";
+import type { GraphqlContext } from "../../graphql.types";
 export declare class DocumentResolver {
     document({ fqdn }: GraphqlContext, id: string): Promise<DocumentObjectType>;
     updateDocumentTitle({ fqdn }: GraphqlContext, values: UpdateDocumentTitleValuesInput, id: string): Promise<DocumentObjectType>;

package/dist/modules/core/document/document.resolver.js

@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentResolver = void 0;
+const document_schema_1 = require("./document.schema");
 const common_1 = require("@nestjs/common");
 const graphql_1 = require("@nestjs/graphql");
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
@@ -21,7 +22,6 @@ const data_format_1 = require("../../../common/data-format");
 const site_context_1 = require("../../../site-context/site-context");
 const make_url_1 = require("../../public-site/public-route/make-url");
 const jwt_auth_guard_1 = require("../auth/jwt.auth.guard");
-const document_schema_1 = require("./document.schema");
 const load_documents_queries_1 = require("./load-documents.queries");
 const save_documents_queries_1 = require("./save-documents.queries");
 let DocumentResolver = class DocumentResolver {

package/dist/modules/core/document/document.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/document/document.resolver.ts"],"names":[],"mappings":"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"}