@paroicms/server 1.87.3 → 1.88.1

package/dist/rendering-payload/field-values.js

@@ -1,16 +1,17 @@
 import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
 import { encodeNodelId, isJsonFieldValue, isMediaHandleValue, isReadLabelingFieldValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
-import { makeUrlOfMediaFile } from "@paroicms/public-server-lib";
 import { languageIfNodel } from "../bo-backend/fields/_fields.helpers.js";
 import { loadFieldValues } from "../bo-backend/fields/load-fields.queries.js";
 import { preprocessFields } from "../bo-backend/fields/preprocess-fields.js";
 import { getHandleOfFieldOnNode } from "../common/media-handles.helpers.js";
+import { toTpSourceMedia } from "../common/medias/to-media-values.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { createLiquidJsDrop } from "../liquidjs-tools/liquidjs-drop.js";
 import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
 import { createDocPayloadDrop } from "./create-doc-drop.js";
 import { getDocItem } from "./doc-values.queries.js";
-export function getPublicSiteFieldValues(siteContext, renderingContext, language, { deprecated } = {}) {
+export function getPublicSiteFieldValues(renderingContext, language, { deprecated } = {}) {
+    const { siteContext } = renderingContext;
     const { siteNodeId } = siteContext.siteIds;
     const values = {};
     for (const fType of siteContext.siteSchema.nodeTypes._site.fields) {
@@ -25,23 +26,26 @@ export function getPublicSiteFieldValues(siteContext, renderingContext, language
                 language: languageIfNodel(language, fType),
                 publishedOnly: true,
             });
-            const fValues = await preprocessFields(siteContext, renderingContext, rawFValues, fieldTypes, {
+            const fValues = await preprocessFields(renderingContext, rawFValues, fieldTypes, {
                 absoluteUrls: false,
             });
             const val = fValues[fType.name];
-            return val === undefined ? undefined : await makePublicFieldValue(siteContext, fType, val);
+            return val === undefined
+                ? undefined
+                : await makePublicFieldValue(renderingContext, fType, val);
         };
         if (fType.withGallery) {
-            values[`${fType.name}_gallery`] = createWithGalleryFieldLoader(siteContext, fType, siteNodeId);
+            values[`${fType.name}_gallery`] = createWithGalleryFieldLoader(renderingContext, fType, siteNodeId);
         }
     }
     return createLiquidJsDrop({
         renderingContext,
         renderingCacheKey: `siteFields:${language}`,
         values,
-    }, siteContext);
+    });
 }
-export async function loadPublicFieldValues(siteContext, renderingContext, options) {
+export async function loadPublicFieldValues(renderingContext, options) {
+    const { siteContext } = renderingContext;
     let fieldTypes = getNodeTypeByName(siteContext.siteSchema, options.typeName).fields ?? [];
     const { fieldNames } = options;
     if (fieldNames) {
@@ -53,7 +57,7 @@ export async function loadPublicFieldValues(siteContext, renderingContext, optio
         language: options.nodelId.language,
         publishedOnly: true,
     });
-    const values = await preprocessFields(siteContext, renderingContext, rawValues, fieldTypes, {
+    const values = await preprocessFields(renderingContext, rawValues, fieldTypes, {
         absoluteUrls: false,
     });
     const map = new Map(fieldTypes.map((f) => [f.name, f]));
@@ -62,31 +66,32 @@ export async function loadPublicFieldValues(siteContext, renderingContext, optio
         const fType = map.get(fieldName);
         if (!fType || !(fType.name in values))
             throw new Error(`missing field type for '${fieldName}'`);
-        result[fieldName] = makeFieldValueOrLoader(siteContext, renderingContext, fType, value, options.nodelId.language);
+        result[fieldName] = makeFieldValueOrLoader(renderingContext, fType, value, options.nodelId.language);
         if (fType.withGallery) {
-            result[`${fieldName}_gallery`] = createWithGalleryFieldLoader(siteContext, fType, options.nodelId.nodeId);
+            result[`${fieldName}_gallery`] = createWithGalleryFieldLoader(renderingContext, fType, options.nodelId.nodeId);
         }
     }
     return createLiquidJsDrop({
         renderingContext,
         renderingCacheKey: `fields:${encodeNodelId(options.nodelId)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: result,
-    }, siteContext);
+    });
 }
-function createWithGalleryFieldLoader(siteContext, fieldType, nodeId) {
+function createWithGalleryFieldLoader(renderingContext, fieldType, nodeId) {
+    const { siteContext } = renderingContext;
     const handle = getHandleOfFieldOnNode(siteContext, {
         fieldType,
         nodeId,
     });
-    return makeMediaFieldLoader(siteContext, {
+    return makeMediaFieldLoader(renderingContext, {
         dataType: "gallery",
     }, handle);
 }
-function makeFieldValueOrLoader(siteContext, renderingContext, fType, val, language) {
+function makeFieldValueOrLoader(renderingContext, fType, val, language) {
     if (fType.storedAs === "mediaHandle") {
         if (!isMediaHandleValue(val))
             throw new Error(`invalid media handle value for "${fType.name}"`);
-        return makeMediaFieldLoader(siteContext, fType, val.h);
+        return makeMediaFieldLoader(renderingContext, fType, val.h);
     }
     if (val === undefined)
         return;
@@ -94,13 +99,14 @@ function makeFieldValueOrLoader(siteContext, renderingContext, fType, val, langu
         if (!isReadLabelingFieldValue(val)) {
             throw new Error(`invalid labeling field value for "${fType.name}"`);
         }
-        return val.t.map((t) => createTpTerm(siteContext, renderingContext, t, language));
+        return val.t.map((t) => createTpTerm(renderingContext, t, language));
     }
     if (isJsonFieldValue(val))
         return val.j;
     return val;
 }
-function createTpTerm(siteContext, renderingContext, term, rightLanguage) {
+function createTpTerm(renderingContext, term, rightLanguage) {
+    const { siteContext } = renderingContext;
     const { language, title } = pickATermTitle(term, rightLanguage);
     const termId = { language, nodeId: term.nodeId };
     const inRightLanguage = rightLanguage === language;
@@ -120,42 +126,36 @@ function createTpTerm(siteContext, renderingContext, term, rightLanguage) {
                     language,
                 })
                 : undefined,
-            doc: async () => createDocPayloadDrop(siteContext, renderingContext, await getDocItem(siteContext, renderingContext.tracker, termId)),
+            doc: async () => createDocPayloadDrop(renderingContext, await getDocItem(siteContext, renderingContext.tracker, termId)),
         },
-    }, siteContext);
+    });
 }
-function makeMediaFieldLoader(siteContext, fType, handle) {
+function makeMediaFieldLoader(renderingContext, fType, handle) {
+    const { siteContext, withAttachedData } = renderingContext;
     return async () => {
         if (fType.dataType === "media") {
-            const media = await siteContext.mediaStorage.getMedia({ handle });
-            return media ? toPublicMedia(siteContext, media) : undefined;
+            const media = await siteContext.mediaStorage.getMedia({ handle, withAttachedData });
+            return media ? toTpSourceMedia(renderingContext, media) : undefined;
         }
-        const medias = await siteContext.mediaStorage.getMedias({ handle });
-        return medias.length === 0 ? undefined : medias.map((m) => toPublicMedia(siteContext, m));
+        const medias = await siteContext.mediaStorage.getMedias({ handle, withAttachedData });
+        const renderedMedias = medias.map((m) => toTpSourceMedia(renderingContext, m, { galleryHandle: handle }));
+        renderingContext.sourceImagesByGalleryHandles.set(handle, renderedMedias.filter((m) => m.kind === "image"));
+        return medias.length === 0 ? undefined : renderedMedias;
     };
 }
-async function makePublicFieldValue(siteContext, fType, val) {
+async function makePublicFieldValue(renderingContext, fType, val) {
+    const { siteContext, withAttachedData } = renderingContext;
     if (fType.storedAs === "mediaHandle") {
         const handle = val.h;
         if (fType.dataType === "media") {
-            const media = await siteContext.mediaStorage.getMedia({ handle });
-            return media ? toPublicMedia(siteContext, media) : undefined;
+            const media = await siteContext.mediaStorage.getMedia({ handle, withAttachedData });
+            return media ? toTpSourceMedia(renderingContext, media) : undefined;
         }
-        const medias = await siteContext.mediaStorage.getMedias({ handle });
-        return medias.length === 0 ? undefined : medias.map((m) => toPublicMedia(siteContext, m));
+        const medias = await siteContext.mediaStorage.getMedias({ handle, withAttachedData });
+        return medias.length === 0
+            ? undefined
+            : medias.map((m) => toTpSourceMedia(renderingContext, m));
     }
     return val;
 }
-export function toPublicMedia(siteContext, media) {
-    return {
-        kind: media.kind === "image" ? "image" : "file",
-        mediaType: media.mediaType,
-        uid: media.uid,
-        permanentUrl: makeUrlOfMediaFile(siteContext, {
-            mediaType: media.mediaType,
-            mediaUid: media.uid,
-            originalName: media.originalName,
-        }),
-    };
-}
 //# sourceMappingURL=field-values.js.map

package/dist/rendering-payload/field-values.js.map

@@ -1 +1 @@
-{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAML,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAiB,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAEvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,MAAM,UAAU,wBAAwB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,QAAgB,EAChB,EAAE,UAAU,KAA+B,EAAE;IAE7C,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC;IAE3C,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;YAC9B,IAAI,UAAU,EAAE,CAAC;gBACf,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACpF,CAAC;YACD,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;gBACpD,UAAU;gBACV,MAAM,EAAE,UAAU;gBAClB,QAAQ,EAAE,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC;gBAC1C,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV;gBACE,YAAY,EAAE,KAAK;aACpB,CACF,CAAC;YACF,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7F,CAAC,CAAC;QAEF,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,UAAU,CAAC,GAAG,4BAA4B,CAC5D,WAAW,EACX,KAAK,EACL,UAAU,CACX,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CACvB;QACE,gBAAgB;QAChB,iBAAiB,EAAE,cAAc,QAAQ,EAAE;QAC3C,MAAM;KACP,EACD,WAAW,CACZ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAwB,EACxB,gBAAkC,EAClC,OAOC;IAED,IAAI,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;IAC1F,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,IAAI,UAAU,EAAE,CAAC;QACf,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;QACnD,UAAU;QACV,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;QAC9B,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;QAClC,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE;QAC1F,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAExD,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,GAAG,CAAC,CAAC;QAChG,MAAM,CAAC,SAAS,CAAC,GAAG,sBAAsB,CACxC,WAAW,EACX,gBAAgB,EAChB,KAAK,EACL,KAAK,EACL,OAAO,CAAC,OAAO,CAAC,QAAQ,CACzB,CAAC;QAEF,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,SAAS,UAAU,CAAC,GAAG,4BAA4B,CAC3D,WAAW,EACX,KAAK,EACL,OAAO,CAAC,OAAO,CAAC,MAAM,CACvB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CACvB;QACE,gBAAgB;QAChB,iBAAiB,EAAE,UAAU,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,EAAE;QACxG,MAAM,EAAE,MAAM;KACf,EACD,WAAW,CACL,CAAC;AACX,CAAC;AAED,SAAS,4BAA4B,CACnC,WAAwB,EACxB,SAAsB,EACtB,MAAc;IAEd,MAAM,MAAM,GAAG,sBAAsB,CAAC,WAAW,EAAE;QACjD,SAAS;QACT,MAAM;KACP,CAAC,CAAC;IACH,OAAO,oBAAoB,CACzB,WAAW,EACX;QACE,QAAQ,EAAE,SAAS;KACpB,EACD,MAAM,CACP,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,KAAkB,EAClB,GAA+B,EAC/B,QAAgB;IAEhB,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QAChG,OAAO,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO;IAC9B,IAAI,KAAK,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,gBAAgB,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,CAAQ,CAAC;IAC/C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CACnB,WAAwB,EACxB,gBAAkC,EAClC,IAAwB,EACxB,aAAqB;IAErB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACjD,MAAM,eAAe,GAAG,aAAa,KAAK,QAAQ,CAAC;IAEnD,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAElF,OAAO,kBAAkB,CACvB;QACE,gBAAgB;QAChB,iBAAiB,EAAE,QAAQ,aAAa,CAAC,MAAM,CAAC,EAAE;QAClD,MAAM,EAAE;YACN,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK;YACL,eAAe;YACf,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,GAAG,EAAE,eAAe;gBAClB,CAAC,CAAC,KAAK,IAAI,EAAE,CACT,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;oBAC5D,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,QAAQ;iBACT,CAAC;gBACN,CAAC,CAAC,SAAS;YACb,GAAG,EAAE,KAAK,IAAI,EAAE,CACd,oBAAoB,CAClB,WAAW,EACX,gBAAgB,EAChB,MAAM,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAChE;SACJ;KACF,EACD,WAAW,CACZ,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,WAAwB,EACxB,KAAwC,EACxC,MAAc;IAEd,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAClE,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/D,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5F,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,WAAwB,EAAE,KAAkB,EAAE,GAAY;IAC5F,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;QACrC,MAAM,MAAM,GAAI,GAAwB,CAAC,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAClE,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/D,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5F,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,WAAwB,EAAE,KAAoB;IAC1E,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QAC/C,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,YAAY,EAAE,kBAAkB,CAAC,WAAW,EAAE;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"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"}

package/dist/rendering-payload/get-siblings.queries.d.ts

@@ -1,5 +1,4 @@
 import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import type { SiteContext } from "../site-context/site-context.types.js";
 import type { TpSiblingDocuments } from "./rendering-payload.types.js";
-export declare function getSiblingDocuments(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpSiblingDocuments>;
+export declare function getSiblingDocuments(renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpSiblingDocuments>;

package/dist/rendering-payload/get-siblings.queries.js

@@ -5,7 +5,8 @@ import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-que
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { createDocPayloadDrop } from "./create-doc-drop.js";
 import { getDocItem } from "./doc-values.queries.js";
-export async function getSiblingDocuments(siteContext, renderingContext, documentId) {
+export async function getSiblingDocuments(renderingContext, documentId) {
+    const { siteContext } = renderingContext;
     const parentNode = await getParentNode(siteContext, renderingContext.tracker, documentId.nodeId);
     if (!parentNode || parentNode.parentTypeName === "_site") {
         return { previous: undefined, next: undefined };
@@ -26,10 +27,10 @@ export async function getSiblingDocuments(siteContext, renderingContext, documen
     }
     return {
         previous: previousDocumentId
-            ? createDocPayloadDrop(siteContext, renderingContext, await getDocItem(siteContext, renderingContext.tracker, previousDocumentId))
+            ? createDocPayloadDrop(renderingContext, await getDocItem(siteContext, renderingContext.tracker, previousDocumentId))
             : undefined,
         next: nextDocumentId
-            ? createDocPayloadDrop(siteContext, renderingContext, await getDocItem(siteContext, renderingContext.tracker, nextDocumentId))
+            ? createDocPayloadDrop(renderingContext, await getDocItem(siteContext, renderingContext.tracker, nextDocumentId))
             : undefined,
     };
 }

package/dist/rendering-payload/get-siblings.queries.js.map

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

package/dist/rendering-payload/load-default-image.d.ts

@@ -1,9 +1,8 @@
-import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ScFieldType } from "@paroicms/public-anywhere-lib";
-import type { Image } from "@paroicms/server-database-media-storage";
-import type { SiteContext } from "../site-context/site-context.types.js";
-export declare function loadDefaultImage(siteContext: SiteContext, tracker: Tracker, options: {
+import type { ImageMd } from "@paroicms/server-database-media-storage";
+import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+export declare function loadDefaultImage(renderingContext: RenderingContext, options: {
     fieldTypes: ScFieldType[] | undefined;
     nodeId: string;
     language: string;
-}): Promise<Image | undefined>;
+}): Promise<ImageMd | undefined>;

package/dist/rendering-payload/load-default-image.js

@@ -1,13 +1,14 @@
 import { getHandleOfField } from "../common/media-handles.helpers.js";
 import { getFeaturedImageOf } from "../rendered-site/helpers/medias.helpers.js";
-export async function loadDefaultImage(siteContext, tracker, options) {
+export async function loadDefaultImage(renderingContext, options) {
     const { fieldTypes, nodeId, language } = options;
-    const featuredImage = await getFeaturedImageOf(siteContext, {
+    const featuredImage = await getFeaturedImageOf(renderingContext, {
         nodeId,
     });
-    return (featuredImage ?? (await getFirstImage(siteContext, tracker, { nodeId, fieldTypes, language })));
+    return featuredImage ?? (await getFirstImage(renderingContext, { nodeId, fieldTypes, language }));
 }
-async function getFirstImage(siteContext, _tracker, { nodeId, fieldTypes, language, }) {
+async function getFirstImage(renderingContext, { nodeId, fieldTypes, language, }) {
+    const { siteContext, withAttachedData } = renderingContext;
     const selectedFields = [];
     for (const f of fieldTypes ?? []) {
         const { storedAs, withGallery, useAsDefaultImage } = f;
@@ -17,11 +18,11 @@ async function getFirstImage(siteContext, _tracker, { nodeId, fieldTypes, langua
         selectedFields.push({ f, useAsDefaultImage });
     }
     const orderedFieldTypes = selectedFields.sort((a, b) => a.useAsDefaultImage - b.useAsDefaultImage);
-    let firstImage;
     for (const item of orderedFieldTypes) {
         const handle = getHandleOfField(siteContext, { nodeId, fieldType: item.f, language });
         const firstImage = await siteContext.mediaStorage.getFirstImage({
             handle,
+            withAttachedData,
         });
         if (firstImage)
             return firstImage;

package/dist/rendering-payload/load-default-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-default-image.js","sourceRoot":"","sources":["../../src/rendering-payload/load-default-image.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,OAAoF;IAEpF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE;QAC1D,MAAM;KACP,CAAC,CAAC;IACH,OAAO,CACL,aAAa,IAAI,CAAC,MAAM,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC/F,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,QAAiB,EACjB,EACE,MAAM,EACN,UAAU,EACV,QAAQ,GACyD;IAEnE,MAAM,cAAc,GAGd,EAAE,CAAC;IACT,KAAK,MAAM,CAAC,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACjC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,KAAK,aAAa,IAAI,CAAC,WAAW,CAAC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpF,SAAS;QACX,CAAC;QAED,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CACpD,CAAC;IAEF,IAAI,UAA6B,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;YAC9D,MAAM;SACP,CAAC,CAAC;QACH,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;AACH,CAAC"}
+{"version":3,"file":"load-default-image.js","sourceRoot":"","sources":["../../src/rendering-payload/load-default-image.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,gBAAkC,EAClC,OAAoF;IAEpF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IACH,OAAO,aAAa,IAAI,CAAC,MAAM,aAAa,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,gBAAkC,EAClC,EACE,MAAM,EACN,UAAU,EACV,QAAQ,GACyD;IAEnE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAAC;IAC3D,MAAM,cAAc,GAGd,EAAE,CAAC;IACT,KAAK,MAAM,CAAC,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACjC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,KAAK,aAAa,IAAI,CAAC,WAAW,CAAC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpF,SAAS;QACX,CAAC;QAED,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CACpD,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;YAC9D,MAAM;YACN,gBAAgB;SACjB,CAAC,CAAC;QACH,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;AACH,CAAC"}

package/dist/rendering-payload/make-image-available.d.ts

@@ -1,26 +1,17 @@
-import type { ImageSize } from "@paroicms/public-anywhere-lib";
+import type { MImageVariant, MSourceImage, ResizeRule } from "@paroicms/public-anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-export interface PublicImage {
-    url: string;
-    width: number;
-    height: number;
-    mediaType: string;
+export interface RequestedVariantOptions {
+    resizeRule: ResizeRule;
+    pixelRatio?: number;
+    mediaType?: string;
+    absoluteUrl?: boolean;
 }
-export interface MakeImageAvailableByHandleOptions {
-    imageSel: {
-        handle: string;
-    };
-    size: ImageSize;
-    autoCrop?: boolean;
-}
-export interface MakeImageAvailableByUidOptions {
-    imageSel: {
-        uid: string;
-    };
-    size: ImageSize;
-    autoCrop?: boolean;
-}
-export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByHandleOptions): Promise<PublicImage | undefined>;
-export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByUidOptions): Promise<PublicImage>;
-export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByHandleOptions | MakeImageAvailableByUidOptions): Promise<PublicImage | undefined>;
+export declare function makeImageAvailableByHandle(renderingContext: RenderingContext, imageSel: {
+    handle: string;
+}, requested: RequestedVariantOptions): Promise<MImageVariant | undefined>;
+export declare function makeImageAvailableById(renderingContext: RenderingContext, imageSel: {
+    mediaId: string;
+}, requested: RequestedVariantOptions): Promise<MImageVariant>;
+export declare function makeImageAvailable(renderingContext: RenderingContext, image: MSourceImage, requested: RequestedVariantOptions): Promise<MImageVariant>;
+export declare function handleSvgImageVariant(siteContext: SiteContext, image: Pick<MSourceImage, "mediaId" | "mediaType" | "rawWidth" | "rawHeight" | "originalName">, rawResizeR: ResizeRule, pixelRatio: number): MImageVariant;

package/dist/rendering-payload/make-image-available.js

@@ -1,66 +1,95 @@
-import { generateImageSlug, makeUrlOfImageVariant, makeUrlOfMediaFile, } from "@paroicms/public-server-lib";
-import { computeVariantSize } from "@paroicms/server-image-cache-engine";
-export async function makeImageAvailable(siteContext, renderingContext, { imageSel, size, autoCrop = false, }) {
+import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
+import { applyPixelRatioToResizeRule, generateImageSlug, rawToRenderedSize, } from "@paroicms/public-server-lib";
+import { computeImageVariantSize } from "@paroicms/server-image-cache-engine";
+import { toMSourceMedia } from "../common/medias/to-media-values.js";
+import { makeUrlOfImageVariant, makeUrlOfMediaFile } from "../helpers/url-helpers.js";
+export async function makeImageAvailableByHandle(renderingContext, imageSel, requested) {
+    const { siteContext } = renderingContext;
     const media = await siteContext.mediaStorage.getMedia(imageSel);
-    if (!media) {
-        if ("handle" in imageSel)
-            return;
-        throw new Error(`missing image '${imageSelToString(imageSel)}'`);
+    if (!media)
+        return;
+    if (media.kind !== "image") {
+        throw new Error(`media '${media.id}' (${imageSel.handle}) should be an image`);
     }
+    return await makeImageAvailable(renderingContext, toMSourceMedia(siteContext, media), requested);
+}
+export async function makeImageAvailableById(renderingContext, imageSel, requested) {
+    const { siteContext } = renderingContext;
+    const media = await siteContext.mediaStorage.getMedia(imageSel);
+    if (!media)
+        throw new Error(`missing image '${imageSel.mediaId}'`);
     if (media.kind !== "image")
-        throw new Error(`media '${media.uid}' should be an image`);
-    if (media.mediaType === "image/svg+xml") {
-        const sizeRegex = /^(\d+)x(\d+)$/;
-        const variantNameMatch = size.match(sizeRegex);
-        let newSize = "";
-        if (variantNameMatch) {
-            const [, w, h] = variantNameMatch.map(Number);
-            newSize = w > h ? `${w}x` : `x${h}`;
-        }
-        const { width, height } = computeVariantSize({
-            imageRef: {
-                width: media.width,
-                height: media.height,
-            },
-            imageSize: variantNameMatch ? newSize : size,
-        });
-        return {
-            url: makeUrlOfMediaFile(siteContext, {
-                mediaType: media.mediaType,
-                mediaUid: media.uid,
-                originalName: media.originalName,
-            }),
-            width,
-            height,
-            mediaType: "image/svg+xml",
-        };
+        throw new Error(`media '${media.id}' should be an image`);
+    return await makeImageAvailable(renderingContext, toMSourceMedia(siteContext, media), requested);
+}
+export async function makeImageAvailable(renderingContext, image, requested) {
+    const { siteContext } = renderingContext;
+    const pixelRatio = requested.pixelRatio ?? image.pixelRatio ?? siteContext.themeConf.pixelRatio;
+    const rawResizeR = applyPixelRatioToResizeRule(requested.resizeRule, pixelRatio);
+    if (image.mediaType === "image/svg+xml") {
+        return handleSvgImageVariant(siteContext, image, rawResizeR, pixelRatio);
     }
-    const { width, height, variantName, resourceVersion, mediaType, slug } = await siteContext.imageCache.makeImageAvailable({
-        imageRef: {
-            imageUid: media.uid,
-            width: media.width,
-            height: media.height,
-            mediaType: media.mediaType,
+    const [{ resourceVersion, mediaType, rawWidth, rawHeight, rawSizeName, slug }] = await renderingContext.imageCacheTransaction.makeImageAvailable([
+        {
+            sourceImage: {
+                mediaId: image.mediaId,
+                mediaType: image.mediaType,
+                rawWidth: image.rawWidth,
+                rawHeight: image.rawHeight,
+                slug: generateImageSlug(image.originalName),
+            },
+            rawResizeR,
+            mediaType: requested.mediaType,
         },
-        imageSize: size,
-        autoCrop,
-        dependsOnUsedKey: renderingContext.cacheKey,
-        slug: generateImageSlug(media.originalName),
+    ]);
+    const url = makeUrlOfImageVariant(siteContext, {
+        mediaId: image.mediaId,
+        mediaType,
+        rawSizeName,
+        resourceVersion,
+        slug,
     });
     return {
-        url: makeUrlOfImageVariant(siteContext, {
-            mediaUid: media.uid,
-            mediaType,
-            variantName,
-            resourceVersion,
-            slug,
-        }),
-        width,
-        height,
+        kind: "image",
+        isSource: false,
+        mediaId: image.mediaId,
         mediaType,
+        url: requested.absoluteUrl ? toAbsoluteUrl(siteContext, url) : url,
+        rawWidth,
+        rawHeight,
+        pixelRatio,
+        ...rawToRenderedSize({ rawWidth, rawHeight }, pixelRatio),
     };
 }
-function imageSelToString(imageSel) {
-    return "uid" in imageSel ? imageSel.uid : imageSel.handle;
+export function handleSvgImageVariant(siteContext, image, rawResizeR, pixelRatio) {
+    const sizeRegex = /^(\d+)x(\d+)$/;
+    const sizeNameMatch = rawResizeR.match(sizeRegex);
+    let nonCroppedRawResizeR;
+    if (sizeNameMatch) {
+        const [, w, h] = sizeNameMatch.map(Number);
+        nonCroppedRawResizeR = w > h ? `${w}x` : `x${h}`;
+    }
+    const { rawWidth, rawHeight } = computeImageVariantSize({
+        sourceImage: {
+            rawWidth: image.rawWidth,
+            rawHeight: image.rawHeight,
+        },
+        rawResizeR: nonCroppedRawResizeR ?? rawResizeR,
+    });
+    return {
+        kind: "image",
+        isSource: false,
+        mediaType: "image/svg+xml",
+        mediaId: image.mediaId,
+        url: makeUrlOfMediaFile(siteContext, {
+            mediaType: image.mediaType,
+            mediaId: image.mediaId,
+            originalName: image.originalName,
+        }),
+        rawWidth,
+        rawHeight,
+        pixelRatio,
+        ...rawToRenderedSize({ rawWidth, rawHeight }, pixelRatio),
+    };
 }
 //# sourceMappingURL=make-image-available.js.map

package/dist/rendering-payload/make-image-available.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/rendering-payload/make-image-available.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAsCzE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,IAAI,KAAK,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,eAAe,CAAC;QAClC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,OAAO,GAAG,EAAE,CAAC;QAEjB,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC;YAC3C,QAAQ,EAAE;gBACR,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB;YACD,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SAC7C,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,EAAE,kBAAkB,CAAC,WAAW,EAAE;gBACnC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,QAAQ,EAAE,KAAK,CAAC,GAAG;gBACnB,YAAY,EAAE,KAAK,CAAC,YAAY;aACjC,CAAC;YACF,KAAK;YACL,MAAM;YACN,SAAS,EAAE,eAAe;SAC3B,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GACpE,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,SAAS,EAAE,IAAI;QACf,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,qBAAqB,CAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,WAAW;YACX,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/rendering-payload/make-image-available.ts"],"names":[],"mappings":"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"}

package/dist/rendering-payload/make-public-payload.d.ts

@@ -1,12 +1,11 @@
 import type { PaUrlQuery } from "@paroicms/public-server-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import type { SiteContext } from "../site-context/site-context.types.js";
 import type * as publicPayload from "./rendering-payload.types.js";
-export declare function makeDetachedPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, options: {
+export declare function makeDetachedPublicPayload(renderingContext: RenderingContext, options: {
     language: string | undefined;
     urlQuery: PaUrlQuery | undefined;
 }): publicPayload.TpDetachedPublicPayload;
-export declare function makeRegularPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.TpDocValues, options: {
+export declare function makeRegularPublicPayload(renderingContext: RenderingContext, docValues: publicPayload.TpDocValues, options: {
     url: string;
     urlQuery: PaUrlQuery | undefined;
     frontendAppPath: string | undefined;

package/dist/rendering-payload/make-public-payload.js

@@ -1,10 +1,11 @@
 import { createDocPayloadDrop } from "./create-doc-drop.js";
 import { makeSitePayload } from "./site-payload.js";
 import { makeBasicTranslationsPayload } from "./translations.queries.js";
-export function makeDetachedPublicPayload(siteContext, renderingContext, options) {
+export function makeDetachedPublicPayload(renderingContext, options) {
+    const { siteContext } = renderingContext;
     const language = options.language ?? siteContext.siteSchema.defaultLanguage;
     return {
-        site: makeSitePayload(siteContext, renderingContext, language),
+        site: makeSitePayload(renderingContext, language),
         doc: {
             kind: "detached",
             language,
@@ -14,10 +15,11 @@ export function makeDetachedPublicPayload(siteContext, renderingContext, options
         },
     };
 }
-export function makeRegularPublicPayload(siteContext, renderingContext, docValues, options) {
+export function makeRegularPublicPayload(renderingContext, docValues, options) {
+    const { siteContext } = renderingContext;
     return {
-        site: makeSitePayload(siteContext, renderingContext, docValues.language),
-        doc: createDocPayloadDrop(siteContext, renderingContext, docValues, options),
+        site: makeSitePayload(renderingContext, docValues.language),
+        doc: createDocPayloadDrop(renderingContext, docValues, options),
     };
 }
 //# sourceMappingURL=make-public-payload.js.map

package/dist/rendering-payload/make-public-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/make-public-payload.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAEzE,MAAM,UAAU,yBAAyB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,OAA2E;IAE3E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC5E,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QAC9D,GAAG,EAAE;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,YAAY,EAAE,4BAA4B,CAAC,WAAW,CAAC;YACvD,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,SAAoC,EACpC,OAIC;IAED,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAC;QACxE,GAAG,EAAE,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC;KAC7E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/make-public-payload.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAEzE,MAAM,UAAU,yBAAyB,CACvC,gBAAkC,EAClC,OAA2E;IAE3E,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC5E,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,QAAQ,CAAC;QACjD,GAAG,EAAE;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,YAAY,EAAE,4BAA4B,CAAC,WAAW,CAAC;YACvD,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,gBAAkC,EAClC,SAAoC,EACpC,OAIC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC3D,GAAG,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC;KAChE,CAAC;AACJ,CAAC"}