@paroicms/server 1.87.3 → 1.88.0

package/dist/helpers/make-backend-plugin-service.js

@@ -1,27 +1,51 @@
+import { messageOf } from "@paroi/data-formatters-lib";
 import { getPluginAssetsUrl } from "@paroicms/connector";
+import { createTracker, toAbsoluteUrl } from "@paroicms/internal-server-lib";
 import { parseNodelId, unwrapReadFieldValue } from "@paroicms/public-anywhere-lib";
-import { toAbsoluteUrl, } from "@paroicms/public-server-lib";
+import { generateImageSlug, } from "@paroicms/public-server-lib";
 import { getSiteFieldValue } from "../bo-backend/fields/load-fields.queries.js";
 import { sendMail } from "../common/mail/sendMail.helpers.js";
-import { makeCacheDependencyKey } from "../common/text-cache.js";
+import { registerImageVariant } from "../common/medias/media-lib.js";
+import { toMSourceMedia } from "../common/medias/to-media-values.js";
+import { dependencyKeyOfMedia, makeCacheDependencyKey, makePluginCacheKey, } from "../common/text-cache.js";
 import { appConf } from "../context.js";
+import { createRenderingContext, } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { validateRecaptchaResponse } from "../public-api/mail/validate-recaptcha-response.js";
 import { renderChildPartials, renderSearchPartials } from "../public-api/public-api-rendering.js";
 import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
 import { getDocItem } from "../rendering-payload/doc-values.queries.js";
-import { makeImageAvailable } from "../rendering-payload/make-image-available.js";
+import { makeImageAvailableById } from "../rendering-payload/make-image-available.js";
 import { createRunningInstanceConnector } from "./running-instance-connector.js";
-export function executeHook(siteContext, hookName, params) {
+export async function executeHook(siteContext, hookName, params) {
     const hook = siteContext.hooks.get(hookName);
     if (!hook)
         return [];
-    return hook.map(({ handler, plugin }) => {
-        return handler(makeBackendPluginService(siteContext, plugin), params);
-    });
+    const results = [];
+    for (const { handler, plugin } of hook) {
+        const service = createBackendPluginService(siteContext, plugin);
+        try {
+            results.push(await handler(service, params));
+        }
+        catch (error) {
+            siteContext.logger.error(`Error while executing hook "${hookName}" for plugin "${plugin.slug}": ${messageOf(error)}`);
+        }
+    }
+    return results;
 }
-export function makeBackendPluginRenderService(siteContext, renderingContext, plugin) {
-    return {
-        ...makeBackendPluginService(siteContext, plugin),
+export function createBackendPluginService(siteContext, plugin) {
+    const service = {
+        fqdn: siteContext.fqdn,
+        logger: siteContext.logger,
+        siteSchema: siteContext.siteSchema,
+        siteUrl: siteContext.siteUrl,
+        themeConf: siteContext.themeConf,
+        validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
+        sendMail: (mailData) => sendMail(mailData, { logger: siteContext.logger }),
+        executeHook: (hookName, params) => executeHook(siteContext, hookName, params),
+        configuration: plugin.configuration,
+        pluginAssetsUrl: getPluginAssetsUrl(plugin),
+        registeredSite: siteContext.regSite,
+        connector: createRunningInstanceConnector(),
         getSiteFieldValue: async (options) => {
             const value = await getSiteFieldValue(siteContext, {
                 ...options,
@@ -29,32 +53,40 @@ export function makeBackendPluginRenderService(siteContext, renderingContext, pl
             });
             return unwrapReadFieldValue(value).value;
         },
+        getMedia: createGetMediaFn(siteContext),
+        useUnversionedImage: createUseUnversionedImageFn(siteContext, plugin),
+        openRenderingService: async ({ language, urlLike }) => {
+            const tracker = createTracker();
+            const cacheKey = makePluginCacheKey(siteContext.logger, { pluginSlug: plugin.slug, urlLike });
+            const renderingContext = await createRenderingContext(siteContext, {
+                cacheKey,
+                language,
+                tracker,
+            });
+            return createPluginRenderingService(renderingContext, service, {
+                closeService: () => renderingContext.close(),
+            });
+        },
+    };
+    return service;
+}
+export function createPluginRenderingService(renderingContext, pluginService, options) {
+    return {
+        pluginService,
+        language: renderingContext.language,
         renderChildPartials: async (httpContext, options) => {
-            return await renderChildPartials(siteContext, httpContext, options);
+            return await renderChildPartials(renderingContext, httpContext, options);
         },
         renderSearchPartials: async (httpContext, options) => {
-            return await renderSearchPartials(siteContext, httpContext, options);
+            return await renderSearchPartials(renderingContext, httpContext, options);
         },
-        useImage: createUseImageFn(siteContext, renderingContext),
+        useImage: createUseImageFn(renderingContext),
         getDocument: async (documentId) => {
-            return await getDocument(siteContext, renderingContext, documentId);
+            return await getDocument(renderingContext, documentId);
         },
-    };
-}
-function makeBackendPluginService(siteContext, plugin) {
-    return {
-        fqdn: siteContext.fqdn,
-        logger: siteContext.logger,
-        siteSchema: siteContext.siteSchema,
-        siteUrl: siteContext.siteUrl,
-        themeConf: siteContext.themeConf,
-        validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
-        sendMail: (mailData) => sendMail(mailData, { logger: siteContext.logger }),
-        executeHook: (hookName, params) => executeHook(siteContext, hookName, params),
-        configuration: plugin.configuration,
-        pluginAssetsUrl: getPluginAssetsUrl(plugin),
-        registeredSite: siteContext.regSite,
-        connector: createRunningInstanceConnector(),
+        close: options?.closeService ??
+            (async () => {
+            }),
     };
 }
 function createValidateRecaptchaResponseForPlugin(siteContext) {
@@ -64,18 +96,77 @@ function createValidateRecaptchaResponseForPlugin(siteContext) {
     const { secretKey } = appConf.googleRecaptcha;
     return (gRecaptchaResponse) => validateRecaptchaResponse(siteContext, { gRecaptchaResponse, secretKey });
 }
-function createUseImageFn(siteContext, renderingContext) {
-    return async (options) => {
-        const image = await makeImageAvailable(siteContext, renderingContext, {
-            size: options.size,
-            imageSel: { uid: options.imageUid },
+function createGetMediaFn(siteContext) {
+    return async (sel, options = {}) => {
+        const { absoluteUrl, withAttachedData } = options;
+        let media;
+        if ("mediaId" in sel) {
+            const { mediaId } = sel;
+            media = await siteContext.mediaStorage.getMedia({ mediaId, withAttachedData });
+        }
+        else {
+            const { handle } = sel;
+            media = await siteContext.mediaStorage.getMedia({ handle, withAttachedData });
+        }
+        if (!media)
+            return;
+        return toMSourceMedia(siteContext, media, { absoluteUrl });
+    };
+}
+function createUseUnversionedImageFn(siteContext, plugin) {
+    return async (image, resizeRule, { pixelRatio, absoluteUrl } = {}) => {
+        if (!siteContext.themeConf.fTextImageResizeRules.includes(resizeRule)) {
+            throw new Error(`Invalid unversioned resize rule "${resizeRule}" for plugin "${plugin.slug}"`);
+        }
+        const mediaId = typeof image === "string" ? image : image.mediaId;
+        let source = typeof image === "string" ? undefined : image;
+        if (!source) {
+            const media = await siteContext.mediaStorage.getMedia({
+                mediaId,
+            });
+            if (media?.kind !== "image")
+                return;
+            source = toMSourceMedia(siteContext, media, { absoluteUrl: true });
+        }
+        if (!source)
+            return;
+        const variant = await registerImageVariant(siteContext, {
+            autoCrop: false,
+            sourceImage: {
+                mediaId: source.mediaId,
+                mediaType: source.mediaType,
+                rawWidth: source.rawWidth,
+                rawHeight: source.rawHeight,
+                slug: generateImageSlug(source.originalName),
+            },
+            resizeRule,
+            pixelRatio: pixelRatio ?? source.pixelRatio ?? siteContext.themeConf.pixelRatio,
+            absoluteUrl: absoluteUrl ?? false,
+            versionedUrl: false,
+            ownerHandle: `plugin:${plugin.slug}:unversioned`,
+            isHandleReusable: true,
+            canBeRetrievedByOwner: false,
+            originalName: source.originalName,
+            mediaType: source.mediaType,
         });
-        if (!image)
-            throw new Error("useImage: missing image");
-        return image;
+        return variant;
+    };
+}
+function createUseImageFn(renderingContext) {
+    return async (image, resizeRule, { pixelRatio, absoluteUrl } = {}) => {
+        const mediaId = typeof image === "string" ? image : image.mediaId || image.mediaId;
+        renderingContext.addDependencyKey(dependencyKeyOfMedia(mediaId));
+        try {
+            return await makeImageAvailableById(renderingContext, { mediaId: typeof image === "string" ? image : image.mediaId }, { resizeRule, pixelRatio, absoluteUrl });
+        }
+        catch (err) {
+            renderingContext.siteContext.logger.debug(`Error while making image available: ${messageOf(err)}`);
+            return;
+        }
     };
 }
-async function getDocument(siteContext, renderingContext, rawDocumentId) {
+async function getDocument(renderingContext, rawDocumentId) {
+    const { siteContext } = renderingContext;
     const documentId = parseNodelId(rawDocumentId);
     renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
     const docPayload = await getDocItem(siteContext, renderingContext.tracker, documentId, {

package/dist/helpers/make-backend-plugin-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAmB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAIL,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAEL,sBAAsB,GACvB,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAEtF,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,WAAwB,EAAE,QAAgB,EAAE,MAAY;IACxF,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,MAAM,OAAO,GAAc,EAAE,CAAC;IAC9B,KAAK,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,CACtB,+BAA+B,QAAQ,iBAAiB,MAAM,CAAC,IAAI,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,CAC5F,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,WAAwB,EACxB,MAAkB;IAElB,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,yBAAyB,EAAE,wCAAwC,CAAC,WAAW,CAAC;QAChF,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;QAC1E,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;QAC7E,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,eAAe,EAAE,kBAAkB,CAAC,MAAM,CAAC;QAC3C,cAAc,EAAE,WAAW,CAAC,OAAO;QACnC,SAAS,EAAE,8BAA8B,EAAE;QAC3C,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;gBACjD,GAAG,OAAO;gBACV,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC3C,CAAC;QACD,QAAQ,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACvC,mBAAmB,EAAE,2BAA2B,CAAC,WAAW,EAAE,MAAM,CAAC;QAErE,oBAAoB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9F,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;gBACjE,QAAQ;gBACR,QAAQ;gBACR,OAAO;aACR,CAAC,CAAC;YACH,OAAO,4BAA4B,CAAC,gBAAgB,EAAE,OAAO,EAAE;gBAC7D,YAAY,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE;aAC7C,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,gBAAkC,EAClC,aAAmC,EACnC,OAEC;IAED,OAAO;QACL,aAAa;QACb,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;QACnC,mBAAmB,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YAClD,OAAO,MAAM,mBAAmB,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC3E,CAAC;QACD,oBAAoB,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YACnD,OAAO,MAAM,oBAAoB,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC5E,CAAC;QACD,QAAQ,EAAE,gBAAgB,CAAC,gBAAgB,CAAC;QAC5C,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAChC,OAAO,MAAM,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,EACH,OAAO,EAAE,YAAY;YACrB,CAAC,KAAK,IAAI,EAAE;YAEZ,CAAC,CAAC;KACL,CAAC;AACJ,CAAC;AAED,SAAS,wCAAwC,CAC/C,WAAsC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACjE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAC5B,yBAAyB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAwB;IAChD,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;QACjC,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QAClD,IAAI,KAA0B,CAAC;QAC/B,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;YACxB,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjF,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;YACvB,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,OAAO,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC7D,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,WAAwB,EACxB,MAAkB;IAElB,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,EAAE;QACnE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CACb,oCAAoC,UAAU,iBAAiB,MAAM,CAAC,IAAI,GAAG,CAC9E,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QAClE,IAAI,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;gBACpD,OAAO;aACR,CAAC,CAAC;YACH,IAAI,KAAK,EAAE,IAAI,KAAK,OAAO;gBAAE,OAAO;YACpC,MAAM,GAAG,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;YACtD,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE;gBACX,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC;aAC7C;YACD,UAAU;YACV,UAAU,EAAE,UAAU,IAAI,MAAM,CAAC,UAAU,IAAI,WAAW,CAAC,SAAS,CAAC,UAAU;YAC/E,WAAW,EAAE,WAAW,IAAI,KAAK;YACjC,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,UAAU,MAAM,CAAC,IAAI,cAAc;YAChD,gBAAgB,EAAE,IAAI;YACtB,qBAAqB,EAAE,KAAK;YAC5B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,gBAAkC;IAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,EAAE;QACnE,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;QACnF,gBAAgB,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,OAAO,MAAM,sBAAsB,CACjC,gBAAgB,EAChB,EAAE,OAAO,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,EAC9D,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CACxC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CACvC,uCAAuC,SAAS,CAAC,GAAG,CAAC,EAAE,CACxD,CAAC;YACF,OAAO;QACT,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,gBAAkC,EAClC,aAAqB;IAErB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IAC/C,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAE1E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACrF,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,OAAO;QACL,EAAE,EAAE,aAAa;QACjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACxB,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,gBAAgB,CACpD,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,CAAC;YACrD,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,CAAC;QACD,QAAQ,EAAE,UAAU,CAAC,IAAI;QACzB,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,WAAW,EAAE,UAAU,CAAC,WAAW;KACpC,CAAC;AACJ,CAAC"}

package/dist/helpers/running-instance-connector.js

@@ -237,7 +237,7 @@ async function addFieldMedia(siteContext, fieldMedia, nodeId, nodeType) {
 }
 async function addMediaFile(siteContext, options) {
     const { nodeId, nodeType, path, handle } = options;
-    const fileName = basename(path);
+    const filename = basename(path);
     const binaryFile = await readFile(path);
     const mediaType = mime.getType(path);
     if (!mediaType) {
@@ -245,7 +245,7 @@ async function addMediaFile(siteContext, options) {
     }
     await addMediaToNode(siteContext, {
         binaryFile,
-        originalName: fileName,
+        originalName: filename,
         weightB: binaryFile.byteLength,
         mediaType,
     }, {

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

@@ -0,0 +1,45 @@
+import type { ResizeRule, SizeName } from "@paroicms/public-anywhere-lib";
+import type { BackendPluginService } from "@paroicms/public-server-lib";
+export interface UrlOfMediaFileValues {
+    mediaId: string;
+    mediaType: string;
+    originalName: string | undefined;
+    absoluteUrl?: boolean;
+}
+export declare function makeUrlOfMediaFile(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfMediaFileValues): string;
+export declare function makeUrlOfMediaFile(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfMediaFileValues, options: {
+    returnObj: true;
+}): {
+    url: string;
+    filename: string;
+};
+export interface UrlOfImageVariantValues {
+    mediaId: string;
+    mediaType: string;
+    rawSizeName: SizeName;
+    resourceVersion: string;
+    slug: string | undefined;
+    absoluteUrl?: boolean;
+}
+export declare function makeUrlOfImageVariant(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfImageVariantValues): string;
+export declare function makeUrlOfImageVariant(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfImageVariantValues, options: {
+    returnObj: true;
+}): {
+    url: string;
+    filename: string;
+};
+export interface UrlOfUnversionedImageVariantValues {
+    mediaId: string;
+    mediaType: string;
+    resizeRule: ResizeRule;
+    slug: string | undefined;
+    absoluteUrl?: boolean;
+}
+export declare function makeUrlOfUnversionedImageVariant(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfUnversionedImageVariantValues): string;
+export declare function makeUrlOfUnversionedImageVariant(service: Pick<BackendPluginService, "siteUrl">, values: UrlOfUnversionedImageVariantValues, options: {
+    returnObj: true;
+}): {
+    url: string;
+    filename: string;
+};
+export declare function makeFeedUrl(service: Pick<BackendPluginService, "siteSchema" | "siteUrl">, language?: string): string;

package/dist/helpers/url-helpers.js

@@ -0,0 +1,37 @@
+import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
+import mime from "mime";
+export function makeUrlOfMediaFile(service, values, options) {
+    const { mediaId, mediaType, originalName, absoluteUrl } = values;
+    const filename = `${originalName ?? "unamed"}${fileExtensionOf(mediaType)}`;
+    const relUrl = `/medias/${encodeURIComponent(mediaId)}/file/${encodeURIComponent(filename)}`;
+    const url = absoluteUrl ? toAbsoluteUrl(service, relUrl) : relUrl;
+    return options?.returnObj ? { url, filename } : url;
+}
+export function makeUrlOfImageVariant(service, values, options) {
+    const { mediaId, mediaType, rawSizeName, slug, resourceVersion, absoluteUrl } = values;
+    const filename = `${slug ?? "unamed"}-${rawSizeName}${fileExtensionOf(mediaType)}`;
+    const relUrl = `/medias/${encodeURIComponent(mediaId)}/cache/${encodeURIComponent(resourceVersion)}/${encodeURIComponent(filename)}`;
+    const url = absoluteUrl ? toAbsoluteUrl(service, relUrl) : relUrl;
+    return options?.returnObj ? { url, filename } : url;
+}
+export function makeUrlOfUnversionedImageVariant(service, values, options) {
+    const { mediaId, mediaType, resizeRule, slug, absoluteUrl } = values;
+    const filename = `${slug ?? "unamed"}-${resizeRule}-rendered${fileExtensionOf(mediaType)}`;
+    const relUrl = `/medias/${encodeURIComponent(mediaId)}/cache/unversioned/${encodeURIComponent(filename)}`;
+    const url = absoluteUrl ? toAbsoluteUrl(service, relUrl) : relUrl;
+    return options?.returnObj ? { url, filename } : url;
+}
+function fileExtensionOf(mediaType) {
+    if (mediaType === "image/jpeg")
+        return ".jpeg";
+    const ext = mime.getExtension(mediaType);
+    return ext ? `.${ext}` : "";
+}
+export function makeFeedUrl(service, language) {
+    const isMultilingual = service.siteSchema.isMultilingual;
+    if (isMultilingual && !language) {
+        throw new Error("language is required for multilingual site");
+    }
+    return toAbsoluteUrl(service, isMultilingual ? `/${language}/feed` : "/feed");
+}
+//# sourceMappingURL=url-helpers.js.map

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

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

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

@@ -1,2 +1,2 @@
 export declare function toNodeId(nodeOrNodelId: string): string;
-export declare function removeExtensionFromFileName(fileName: string): string;
+export declare function removeExtensionFromFileName(filename: string): string;

package/dist/helpers/utils-helper.js

@@ -2,8 +2,8 @@ import { parseNodelId } from "@paroicms/public-anywhere-lib";
 export function toNodeId(nodeOrNodelId) {
     return nodeOrNodelId.indexOf(":") !== -1 ? parseNodelId(nodeOrNodelId).nodeId : nodeOrNodelId;
 }
-export function removeExtensionFromFileName(fileName) {
-    const i = fileName.lastIndexOf(".");
-    return i === -1 ? fileName : fileName.slice(0, i);
+export function removeExtensionFromFileName(filename) {
+    const i = filename.lastIndexOf(".");
+    return i === -1 ? filename : filename.slice(0, i);
 }
 //# sourceMappingURL=utils-helper.js.map

package/dist/index.js

@@ -1,6 +1,5 @@
 import { createRegisteredSitesFromSingle, loadRegisteredSitesFromPacks, readCommonSchemaLibrary, } from "@paroicms/connector";
-import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
-import { makeUrl } from "@paroicms/public-server-lib";
+import { eachDay, makeUrl, startCronLike } from "@paroicms/internal-server-lib";
 import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
 import compression from "compression";
 import cookieParser from "cookie-parser";

package/dist/index.js.map

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

package/dist/liquidjs-tools/liquidjs-drop.d.ts

@@ -1,7 +1,7 @@
 import { Drop } from "liquidjs";
-import type { SiteContext } from "../site-context/site-context.types.js";
 import type { RenderingContext } from "./liquidjs-rendering/rendering-context.js";
 export declare const valuesSymbol: unique symbol;
+export declare const promiseSymbol: unique symbol;
 export type DropValues<T> = {
     [name in keyof T]: DropOrLiquidValue;
 };
@@ -15,5 +15,10 @@ export declare function createLiquidJsDrop<T>({ renderingContext, renderingCache
     renderingContext: RenderingContext;
     renderingCacheKey: string;
     values: DropValues<T>;
-}, { logger }: Pick<SiteContext, "logger">): DropInst<T>;
+}): DropInst<T>;
 export declare function loadOrFromRenderingCache<T>(renderingContext: RenderingContext, renderingCacheKey: string, load: () => Promise<T>): Promise<T>;
+export declare function createLiquidJsDropFromPromise<T>({ renderingContext, renderingCacheKey, value, }: {
+    renderingContext: RenderingContext;
+    renderingCacheKey: string;
+    value: Promise<T>;
+}): DropInst<T>;

package/dist/liquidjs-tools/liquidjs-drop.js

@@ -1,6 +1,8 @@
 import { Drop } from "liquidjs";
 export const valuesSymbol = Symbol("values");
-export function createLiquidJsDrop({ renderingContext, renderingCacheKey, values, }, { logger }) {
+export const promiseSymbol = Symbol("promise");
+export function createLiquidJsDrop({ renderingContext, renderingCacheKey, values, }) {
+    const { siteContext } = renderingContext;
     const drop = Object.create(Drop.prototype);
     drop.liquidMethodMissing = async (name) => {
         const val = values[name];
@@ -10,7 +12,7 @@ export function createLiquidJsDrop({ renderingContext, renderingCacheKey, values
             return await loadOrFromRenderingCache(renderingContext, `${renderingCacheKey}:${name}`, val);
         }
         catch (error) {
-            logger.error(`Error when generating '${name}':`, error);
+            siteContext.logger.error(`Error when generating '${name}':`, error);
             throw error;
         }
     };
@@ -25,4 +27,22 @@ export async function loadOrFromRenderingCache(renderingContext, renderingCacheK
     renderingContext.setValueIntoCache(renderingCacheKey, result);
     return result;
 }
+export function createLiquidJsDropFromPromise({ renderingContext, renderingCacheKey, value, }) {
+    const { siteContext } = renderingContext;
+    const drop = Object.create(Drop.prototype);
+    drop.liquidMethodMissing = async (name) => {
+        const val = (await value)[name];
+        if (typeof val !== "function")
+            return val;
+        try {
+            return await loadOrFromRenderingCache(renderingContext, `${renderingCacheKey}:${name}`, val);
+        }
+        catch (error) {
+            siteContext.logger.error(`Error when generating '${name}':`, error);
+            throw error;
+        }
+    };
+    drop[promiseSymbol] = value;
+    return drop;
+}
 //# sourceMappingURL=liquidjs-drop.js.map

package/dist/liquidjs-tools/liquidjs-drop.js.map

@@ -1 +1 @@
-{"version":3,"file":"liquidjs-drop.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAIhC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAmB7C,MAAM,UAAU,kBAAkB,CAChC,EACE,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,GAKP,EACD,EAAE,MAAM,EAA+B;IAEvC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,mBAAmB,GAAG,KAAK,EAAE,IAAY,EAAgB,EAAE;QAC9D,MAAM,GAAG,GAAI,MAAc,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO,GAAG,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,iBAAiB,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;YACxD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,gBAAkC,EAClC,iBAAyB,EACzB,IAAsB;IAEtB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,GAAG,CAAC;IAExC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"liquidjs-drop.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC7C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAmB/C,MAAM,UAAU,kBAAkB,CAAI,EACpC,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,GAKP;IACC,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,mBAAmB,GAAG,KAAK,EAAE,IAAY,EAAgB,EAAE;QAC9D,MAAM,GAAG,GAAI,MAAc,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO,GAAG,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,iBAAiB,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,gBAAkC,EAClC,iBAAyB,EACzB,IAAsB;IAEtB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,GAAG,CAAC;IAExC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAI,EAC/C,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,GAKN;IACC,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,mBAAmB,GAAG,KAAK,EAAE,IAAY,EAAgB,EAAE;QAC9D,MAAM,GAAG,GAAI,CAAC,MAAM,KAAK,CAAS,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO,GAAG,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,iBAAiB,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.d.ts

@@ -1,6 +1,5 @@
-import type { SiteContext } from "../../site-context/site-context.types.js";
 import type { RenderingContext } from "./rendering-context.js";
-export declare function renderLiquidTemplate(siteContext: SiteContext, renderingContext: RenderingContext, { templateNames, payload }: {
+export declare function renderLiquidTemplate(renderingContext: RenderingContext, { templateNames, payload }: {
     templateNames: string[];
     payload: object;
 }): Promise<string>;

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

@@ -1,6 +1,7 @@
 import { minify } from "html-minifier-terser";
 import RenderTag from "../render-clone/render.js";
-export async function renderLiquidTemplate(siteContext, renderingContext, { templateNames, payload }) {
+export async function renderLiquidTemplate(renderingContext, { templateNames, payload }) {
+    const { siteContext } = renderingContext;
     let html;
     let usedTemplate;
     for (const templateName of templateNames) {

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

@@ -1 +1 @@
-{"version":3,"file":"render-liquidjs.js","sourceRoot":"","sources":["../../../src/liquidjs-tools/liquidjs-rendering/render-liquidjs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,gBAAkC,EAClC,EAAE,aAAa,EAAE,OAAO,EAAgD;IAExE,IAAI,IAAwB,CAAC;IAC7B,IAAI,YAAgC,CAAC;IACrC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,EAAE;gBAC7D,GAAG,OAAO;gBACV,IAAI,IAAI;oBACN,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;oBACnE,OAAQ,OAAe,CAAC,GAAG,CAAC;gBAC9B,CAAC;gBACD,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,gBAAgB;aAChD,CAAC,CAAC;YACH,YAAY,GAAG,YAAY,CAAC;YAC5B,MAAM;QACR,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,SAAS;YACpC,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,IAAI,EAAE;YACxB,kBAAkB,EAAE,IAAI;YACxB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,gCAAgC,YAAY,GAAG,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"render-liquidjs.js","sourceRoot":"","sources":["../../../src/liquidjs-tools/liquidjs-rendering/render-liquidjs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,gBAAkC,EAClC,EAAE,aAAa,EAAE,OAAO,EAAgD;IAExE,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,IAAI,IAAwB,CAAC;IAC7B,IAAI,YAAgC,CAAC;IACrC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,EAAE;gBAC7D,GAAG,OAAO;gBACV,IAAI,IAAI;oBACN,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;oBACnE,OAAQ,OAAe,CAAC,GAAG,CAAC;gBAC9B,CAAC;gBACD,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,gBAAgB;aAChD,CAAC,CAAC;YACH,YAAY,GAAG,YAAY,CAAC;YAC5B,MAAM;QACR,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,SAAS;YACpC,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,IAAI,EAAE;YACxB,kBAAkB,EAAE,IAAI;YACxB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,gCAAgC,YAAY,GAAG,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.d.ts

@@ -1,13 +1,23 @@
 import { type Tracker } from "@paroicms/internal-server-lib";
+import type { WithAttachedData } from "@paroicms/public-anywhere-lib";
+import type { ImageCacheOwnerTransaction } from "@paroicms/server-image-cache-engine";
+import type { TpSourceImage } from "../../rendering-payload/rendering-payload.types.js";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface RenderingContext {
+    siteContext: SiteContext;
     renderingId: bigint;
     cacheKey: string;
+    language: string;
+    withAttachedData: WithAttachedData;
     tracker: Tracker;
-    getDependencyKeys: () => string[];
-    addDependencyKey: (...dependencyKeys: string[]) => void;
-    getValueFromCache: (key: string) => RenderingCacheResult;
-    setValueIntoCache: (key: string, val: any) => void;
+    sourceImagesByGalleryHandles: Map<string, TpSourceImage[]>;
+    imageCacheTransaction: ImageCacheOwnerTransaction;
+    addDependencyKey(...dependencyKeys: string[]): void;
+    getDependencyKeys(): string[];
+    setValueIntoCache(key: string, val: any): void;
+    getValueFromCache(key: string): RenderingCacheResult;
+    close(): Promise<void>;
+    flush(): Promise<void>;
 }
 export type RenderingCacheResult = {
     found: false;
@@ -15,12 +25,13 @@ export type RenderingCacheResult = {
     found: true;
     val: any;
 };
-export declare function createRenderingContext(siteContext: Pick<SiteContext, "imageCache">, options: {
+export declare function createRenderingContext(siteContext: SiteContext, options: {
     cacheKey: string;
+    language: string | undefined;
     tracker: Tracker;
     dependencyKey?: string;
 }): Promise<RenderingContext>;
 export declare function makeTagCacheKeyForRendering(cacheKey: string, { tagParameters }: {
     tagParameters?: any;
 }): string;
-export declare function createNoRenderingContext(): RenderingContext;
+export declare function createNoRenderingContext(siteContext: SiteContext): RenderingContext;

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

@@ -1,14 +1,20 @@
 import { createNoTracker } from "@paroicms/internal-server-lib";
 let renderingSeq = 0n;
 export async function createRenderingContext(siteContext, options) {
-    await siteContext.imageCache.resetUsedKey({ usedKey: options.cacheKey });
     const { cacheKey, tracker } = options;
-    const cache = new Map();
+    const language = options.language ?? siteContext.siteSchema.defaultLanguage;
     const dependencies = new Set(options.dependencyKey ? [options.dependencyKey] : undefined);
+    const cache = new Map();
+    const imageCacheTransaction = siteContext.imageCache.createOwnerTransaction(options.cacheKey);
     return {
+        siteContext,
         renderingId: ++renderingSeq,
         cacheKey,
+        language,
+        withAttachedData: { language },
         tracker,
+        sourceImagesByGalleryHandles: new Map(),
+        imageCacheTransaction,
         getDependencyKeys() {
             return Array.from(dependencies);
         },
@@ -23,17 +29,31 @@ export async function createRenderingContext(siteContext, options) {
         setValueIntoCache(key, val) {
             cache.set(key, { found: true, val });
         },
+        async close() {
+            await imageCacheTransaction.flush();
+        },
+        async flush() {
+            await imageCacheTransaction.flush();
+        },
     };
 }
 export function makeTagCacheKeyForRendering(cacheKey, { tagParameters }) {
     return `${cacheKey}:${tagParameters === undefined ? "-" : JSON.stringify(tagParameters)}`;
 }
-export function createNoRenderingContext() {
+export function createNoRenderingContext(siteContext) {
     const cache = new Map();
+    const cacheKey = "outside-rendering";
+    const imageCacheTransaction = siteContext.imageCache.createOwnerTransaction(cacheKey);
+    const language = siteContext.siteSchema.defaultLanguage;
     return {
+        siteContext,
         renderingId: -1n,
-        cacheKey: "noCache",
+        cacheKey,
+        language,
+        withAttachedData: { language },
         tracker: createNoTracker(),
+        sourceImagesByGalleryHandles: new Map(),
+        imageCacheTransaction,
         getDependencyKeys() {
             return [];
         },
@@ -44,6 +64,12 @@ export function createNoRenderingContext() {
         setValueIntoCache(key, val) {
             cache.set(key, { found: true, val });
         },
+        async close() {
+            await imageCacheTransaction.flush();
+        },
+        async flush() {
+            await imageCacheTransaction.flush();
+        },
     };
 }
 //# sourceMappingURL=rendering-context.js.map