@paroicms/server 1.81.1 → 1.83.0

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

@@ -1,11 +1,15 @@
-import { strVal } from "@paroi/data-formatters-lib";
 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 { makeCacheDependencyKey } from "../common/text-cache.js";
 import { createLiquidJsDrop } from "../liquidjs-tools/liquidjs-drop.js";
+import { getUrlOfDocument } from "../public-site/public-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 } = {}) {
     const { siteNodeId } = siteContext.siteIds;
     const values = {};
@@ -15,12 +19,13 @@ export function getPublicSiteFieldValues(siteContext, renderingContext, language
                 siteContext.logger.warn(`deprecated use of 'site.field' instead of 'site.fields`);
             }
             const fieldTypes = [fType];
-            const fValues = await loadFieldValues(siteContext, {
+            const rawFValues = await loadFieldValues(siteContext, {
                 fieldTypes,
                 nodeId: siteNodeId,
                 language: languageIfNodel(language, fType),
+                publishedOnly: true,
             });
-            await preprocessFields(siteContext, renderingContext, fValues, fieldTypes, {
+            const fValues = await preprocessFields(siteContext, renderingContext, rawFValues, fieldTypes, {
                 absoluteUrls: false,
             });
             const val = fValues[fType.name];
@@ -32,10 +37,7 @@ export function getPublicSiteFieldValues(siteContext, renderingContext, language
     }
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: {
-            language,
-            keyPrefix: "siteField",
-        },
+        renderingCacheKey: `siteFields:${language}`,
         values,
     }, siteContext);
 }
@@ -45,11 +47,13 @@ export async function loadPublicFieldValues(siteContext, renderingContext, optio
     if (fieldNames) {
         fieldTypes = fieldTypes.filter((f) => fieldNames.includes(f.name));
     }
-    const values = await loadFieldValues(siteContext, {
+    const rawValues = await loadFieldValues(siteContext, {
         fieldTypes,
-        ...options.nodelId,
+        nodeId: options.nodelId.nodeId,
+        language: options.nodelId.language,
+        publishedOnly: true,
     });
-    await preprocessFields(siteContext, renderingContext, values, fieldTypes, {
+    const values = await preprocessFields(siteContext, renderingContext, rawValues, fieldTypes, {
         absoluteUrls: false,
     });
     const map = new Map(fieldTypes.map((f) => [f.name, f]));
@@ -58,17 +62,14 @@ 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, fType, value);
+        result[fieldName] = makeFieldValueOrLoader(siteContext, renderingContext, fType, value, options.nodelId.language);
         if (fType.withGallery) {
             result[`${fieldName}_gallery`] = createWithGalleryFieldLoader(siteContext, fType, options.nodelId.nodeId);
         }
     }
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: {
-            documentId: options.nodelId,
-            keyPrefix: "field",
-        },
+        renderingCacheKey: `fields:${encodeNodelId(options.nodelId)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: result,
     }, siteContext);
 }
@@ -81,15 +82,48 @@ function createWithGalleryFieldLoader(siteContext, fieldType, nodeId) {
         dataType: "gallery",
     }, handle);
 }
-function makeFieldValueOrLoader(siteContext, fType, val) {
+function makeFieldValueOrLoader(siteContext, renderingContext, fType, val, language) {
     if (fType.storedAs === "mediaHandle") {
-        const handle = strVal(val.handle, {
-            varName: `${fType.name}.handle`,
-        });
-        return makeMediaFieldLoader(siteContext, fType, handle);
+        if (!isMediaHandleValue(val))
+            throw new Error(`invalid media handle value for "${fType.name}"`);
+        return makeMediaFieldLoader(siteContext, fType, val.h);
     }
+    if (val === undefined)
+        return;
+    if (fType.storedAs === "labeling") {
+        if (!isReadLabelingFieldValue(val)) {
+            throw new Error(`invalid labeling field value for "${fType.name}"`);
+        }
+        return val.t.map((t) => createTpTerm(siteContext, renderingContext, t, language));
+    }
+    if (isJsonFieldValue(val))
+        return val.j;
     return val;
 }
+function createTpTerm(siteContext, renderingContext, term, rightLanguage) {
+    const { language, title } = pickATermTitle(term, rightLanguage);
+    const termId = { language, nodeId: term.nodeId };
+    const inRightLanguage = rightLanguage === language;
+    renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: termId }));
+    return createLiquidJsDrop({
+        renderingContext,
+        renderingCacheKey: `term:${encodeNodelId(termId)}`,
+        values: {
+            nodeId: term.nodeId,
+            title,
+            inRightLanguage,
+            language,
+            languageLabel: siteContext.siteSchema.languageLabels[language],
+            url: inRightLanguage
+                ? async () => await getUrlOfDocument(siteContext, renderingContext.tracker, {
+                    nodeId: term.nodeId,
+                    language,
+                })
+                : undefined,
+            doc: async () => createDocPayloadDrop(siteContext, renderingContext, await getDocItem(siteContext, renderingContext.tracker, termId)),
+        },
+    }, siteContext);
+}
 function makeMediaFieldLoader(siteContext, fType, handle) {
     return async () => {
         if (fType.dataType === "media") {
@@ -102,7 +136,7 @@ function makeMediaFieldLoader(siteContext, fType, handle) {
 }
 async function makePublicFieldValue(siteContext, fType, val) {
     if (fType.storedAs === "mediaHandle") {
-        const handle = val.handle;
+        const handle = val.h;
         if (fType.dataType === "media") {
             const media = await siteContext.mediaStorage.getMedia({ handle });
             return media ? toPublicMedia(siteContext, media) : undefined;

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

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

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

@@ -1,5 +1,5 @@
 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 { SiblingDocuments } from "./public-payload.types.js";
-export declare function getSiblingDocuments(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<SiblingDocuments>;
+import type { TpSiblingDocuments } from "./public-payload.types.js";
+export declare function getSiblingDocuments(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpSiblingDocuments>;

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

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

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

@@ -1,4 +1,3 @@
-import { isFTextFieldType } from "@paroicms/internal-anywhere-lib";
 import { getHandleOfField } from "../common/media-handles.helpers.js";
 import { getFeaturedImageOf } from "../public-site/helpers/medias.helpers.js";
 export async function loadDefaultImage(siteContext, tracker, options) {
@@ -11,13 +10,11 @@ export async function loadDefaultImage(siteContext, tracker, options) {
 async function getFirstImage(siteContext, _tracker, { nodeId, fieldTypes, language, }) {
     const selectedFields = [];
     for (const f of fieldTypes ?? []) {
-        if (f.storedAs !== "mediaHandle" && (!isFTextFieldType(f) || !f.withGallery)) {
+        const { storedAs, withGallery, useAsDefaultImage } = f;
+        if ((storedAs !== "mediaHandle" && !withGallery) || useAsDefaultImage === undefined) {
             continue;
         }
-        if (f.useAsDefaultImage !== undefined) {
-            const useAsDefaultImage = f.useAsDefaultImage;
-            selectedFields.push({ f, useAsDefaultImage });
-        }
+        selectedFields.push({ f, useAsDefaultImage });
     }
     const orderedFieldTypes = selectedFields.sort((a, b) => a.useAsDefaultImage - b.useAsDefaultImage);
     let firstImage;

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

@@ -1 +1 @@
-{"version":3,"file":"load-default-image.js","sourceRoot":"","sources":["../../src/public-payload/load-default-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAInE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,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,IAAI,CAAC,CAAC,QAAQ,KAAK,aAAa,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7E,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CAAC;YAC9C,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,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/public-payload/load-default-image.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,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"}

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

@@ -3,8 +3,8 @@ import type { SiteContext } from "../site-context/site-context.types.js";
 import type * as publicPayload from "./public-payload.types.js";
 export declare function makeDetachedPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, options?: {
     language?: string;
-}): publicPayload.DetachedPublicPayload;
-export declare function makeRegularPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.DocValues, url: string): {
-    site: publicPayload.SitePayload;
-    doc: import("../liquidjs-tools/liquidjs-drop.js").DropInst<publicPayload.DocPayload>;
+}): publicPayload.TpDetachedPublicPayload;
+export declare function makeRegularPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.TpDocValues, url: string): {
+    site: publicPayload.TpSitePayload;
+    doc: import("../liquidjs-tools/liquidjs-drop.js").DropInst<publicPayload.TpDocPayload>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-public-payload.ts"],"names":[],"mappings":"AAEA,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,UAAiC,EAAE;IAEnC,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;SACxD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,SAAkC,EAClC,GAAW;IAEX,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,EAAE,GAAG,EAAE,CAAC;KAC7E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-public-payload.ts"],"names":[],"mappings":"AAEA,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,UAAiC,EAAE;IAEnC,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;SACxD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,SAAoC,EACpC,GAAW;IAEX,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,EAAE,GAAG,EAAE,CAAC;KAC7E,CAAC;AACJ,CAAC"}

package/dist/public-payload/parts.queries.d.ts

@@ -20,6 +20,6 @@ export declare function keyOfParentPartData(item: {
     listName: string;
     parentNodeId: string;
 }): string;
-export declare function formatListOfPartValues(siteContext: SiteContext, list: CompletedPartData[], listType: ScListType): publicPayload.PartValues[];
+export declare function formatListOfPartValues(siteContext: SiteContext, list: CompletedPartData[], listType: ScListType): publicPayload.TpPartValues[];
 export declare function countPartsOf(siteContext: SiteContext, tracker: Tracker, parentId: ParsedNodelId, listType: Pick<ScListType, "listName">): Promise<number>;
 export {};

package/dist/public-payload/parts.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAIL,aAAa,GACd,MAAM,+BAA+B,CAAC;AA+BvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,QAAoB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAU,MAAM,WAAW;SAClC,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC;QACN,gBAAgB;QAChB,4BAA4B;QAC5B,8BAA8B;QAC9B,wBAAwB;QACxB,4BAA4B;QAC5B,wBAAwB;QACxB,wBAAwB;QACxB,qBAAqB;KACtB,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAEhD,QAAQ,CAAC,cAAc,EAAE;QACxB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KAC7D,CAAC;SACD,QAAQ,CAAC,oBAAoB,EAAE,UAAU,EAAE,MAAM,CAAC;SAClD,KAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,MAAM,CAAC;SAC5C,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;SAChC,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEvB,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,MAAM,gBAAgB,GAAe,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACpD,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC;QACjE,MAAM,YAAY,GAAG;YACnB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;YAClC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;YACtC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;YAC/B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE;SACpD,CAAC;QACF,OAAO,eAAe;YACpB,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B;YACH,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,SAAS;aACpB,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC,WAAW,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE5F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IACxD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,CAAC;YACV,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAgD;IAClF,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAAwB,EACxB,IAAyB,EACzB,QAAoB;IAEpB,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC1B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/C,OAAO,gBAAgB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,WAA4C,EAC5C,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAoE;IAE/F,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM,EAAE,KAAK,GAAG,CAAC;QACjB,YAAY;QACZ,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;KACpE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,WAAwB,EACxB,OAAgB,EAChB,IAAgB;IAEhB,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/F,IAAI,kBAUS,CAAC;IAEd,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAU,MAAM,WAAW;aAClC,EAAE,CAAC,cAAc,CAAC;aAClB,MAAM,CAAC,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;aAClF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC;aAC5C,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACvC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,OAAO;gBACL,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC9B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC1B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;aAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,kBAAkB,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,kBAAkB,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACxF,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,QAAQ;oBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,eAAe,EAAE,KAAK;oBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAAgB,EAChB,QAAuB,EACvB,QAAsC;IAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,WAAW;SAC7B,EAAE,CAAC,aAAa,CAAC;SACjB,KAAK,CAAC,UAAU,CAAC;SACjB,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;SACpC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC7B,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAwB,EAAE,IAAgB;IACvE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACjD,IAAI,CAAC,aAAa;YAAE,MAAM;QAC1B,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/public-payload/public-payload.types.d.ts

@@ -1,14 +1,13 @@
-import type { FieldValues } from "@paroicms/public-anywhere-lib";
-export type PublicPayload = DetachedPublicPayload | RegularPublicPayload;
-export interface DetachedPublicPayload {
-    site: SitePayload;
-    doc: DetachedDocPayload;
+export type TpTemplatePayload = TpDetachedPublicPayload | TpRegularPublicPayload;
+export interface TpDetachedPublicPayload {
+    site: TpSitePayload;
+    doc: TpDetachedDocPayload;
 }
-export interface RegularPublicPayload {
-    site: SitePayload;
-    doc: DocPayload;
+export interface TpRegularPublicPayload {
+    site: TpSitePayload;
+    doc: TpDocPayload;
 }
-export interface BaseSitePayload {
+export interface TpBaseSitePayload {
     fqdn: string;
     url: string;
     assetsUrl: string;
@@ -18,38 +17,38 @@ export interface BaseSitePayload {
     fields: {
         [fieldName: string]: unknown;
     };
-    configuration: ConfigurationPublicPayload;
+    configuration: TpConfigurationPublicPayload;
     recaptchaKey?: string;
 }
-export interface ConfigurationPublicPayload {
+export interface TpConfigurationPublicPayload {
     googleRecaptchaKey?: string;
 }
-export interface SitePayload extends BaseSitePayload {
+export interface TpSitePayload extends TpBaseSitePayload {
     kind: "site";
     language: string;
     languageLabel: string;
-    home: HomeRoutingDocumentNodelIds;
+    home: TpHomeRoutingDocumentNodelIds;
 }
-export interface HomeRoutingDocumentNodelIds extends RoutingDocumentNodelIds {
+export interface TpHomeRoutingDocumentNodelIds extends TpRoutingDocumentNodelIds {
     url: string;
 }
-export interface RoutingDocumentNodelIds {
+export interface TpRoutingDocumentNodelIds {
     id: string;
-    [typeName: string]: RoutingDocumentNodelIds | string;
+    [typeName: string]: TpRoutingDocumentNodelIds | string;
 }
-export interface ChildRoutingIds {
-    [typeName: string]: RoutingDocumentNodelIds | string;
+export interface TpChildRoutingIds {
+    [typeName: string]: TpRoutingDocumentNodelIds | string;
 }
-export interface DetachedDocPayload {
+export interface TpDetachedDocPayload {
     kind: "detached";
     typeName?: string;
     language?: string;
     languageLabel?: string;
-    translations: DocTranslation[];
+    translations: TpDocTranslation[];
     id?: string;
     title?: string;
 }
-export interface DocValues {
+export interface TpDocValues {
     type: string;
     nodeId: string;
     language: string;
@@ -60,60 +59,54 @@ export interface DocValues {
     metaDescription?: string;
     metaKeywords?: string;
 }
-export interface DocPayload extends DocValues {
+export interface TpDocPayload extends TpDocValues {
     kind: "routingDocument" | "regularDocument";
     leafType: string;
     leafId: string;
     id: string;
-    routingIds?: ChildRoutingIds;
+    routingIds?: TpChildRoutingIds;
     languageLabel: string;
     url: string;
     excerpt?: string;
     list: {
-        [listName: string]: Part[];
+        [listName: string]: TpPart[];
     };
     listSize: {
         [listName: string]: number;
     };
     defaultImageUid?: string;
-    defaultImage?: PublicMedia;
+    defaultImage?: TpPublicMedia;
     featuredImageUid?: string;
-    featuredImage?: PublicMedia;
-    field: FieldValues;
-    fields: FieldValues;
-    translations: DocTranslation[];
-    labeling: {
-        [typeName: string]: Term[];
-    };
-    singleLabeling: {
-        [typeName: string]: Term | undefined;
-    };
-    flaggedWith: {
-        [typeName: string]: Term[];
-    };
-    flaggedWithOne: {
-        [typeName: string]: Term | undefined;
-    };
-    og: OgValues;
-    breadcrumb: BreadcrumbItem[];
-    siblings: SiblingDocuments;
+    featuredImage?: TpPublicMedia;
+    field: TpFieldValues;
+    fields: TpFieldValues;
+    translations: TpDocTranslation[];
+    labeling: undefined;
+    singleLabeling: undefined;
+    flaggedWith: undefined;
+    flaggedWithOne: undefined;
+    og: TpOgValues;
+    breadcrumb: TpBreadcrumbItem[];
+    siblings: TpSiblingDocuments;
     typeLabel: string;
 }
-export interface DocTranslation {
+export interface TpDocTranslation {
     language: string;
     languageLabel: string;
     active: boolean;
     url: string;
-    doc?: DocPayload;
+    doc?: TpDocPayload;
 }
-export interface TermValues extends DocValues {
+export interface TpTerm {
     inRightLanguage: boolean;
-    isLead: boolean;
-}
-export interface Term extends TermValues, Omit<DocPayload, "kind"> {
-    kind: "term";
+    language: string;
+    languageLabel: string;
+    nodeId: string;
+    title?: string;
+    url?: string;
+    doc: TpDocPayload;
 }
-export interface PartValues {
+export interface TpPartValues {
     type: string;
     relativeId: string;
     number: number;
@@ -124,22 +117,22 @@ export interface PartValues {
     nodeId: string;
     publishDate: string;
 }
-export interface Part extends PartValues {
+export interface TpPart extends TpPartValues {
     kind: "part";
     leafId: string;
     leafType: string;
     id: string;
     num: number;
     defaultImageUid?: string;
-    defaultImage?: PublicMedia;
+    defaultImage?: TpPublicMedia;
     featuredImageUid?: string;
-    featuredImage?: PublicMedia;
-    field: FieldValues;
-    fields: FieldValues;
+    featuredImage?: TpPublicMedia;
+    field: TpFieldValues;
+    fields: TpFieldValues;
     typeLabel: string;
-    parts?: Part[];
+    parts?: TpPart[];
 }
-export interface OgValues {
+export interface TpOgValues {
     url: string;
     type?: string;
     imageUid?: string;
@@ -148,18 +141,21 @@ export interface OgValues {
     description?: string;
     locale?: string;
 }
-export interface BreadcrumbItem {
+export interface TpBreadcrumbItem {
     id: string;
     title?: string;
     url: string;
 }
-export interface SiblingDocuments {
-    previous?: DocPayload;
-    next?: DocPayload;
+export interface TpSiblingDocuments {
+    previous?: TpDocPayload;
+    next?: TpDocPayload;
 }
-export interface PublicMedia {
+export interface TpPublicMedia {
     uid: string;
     kind: "image" | "file";
     mediaType: string;
     permanentUrl: string;
 }
+export interface TpFieldValues {
+    [fieldName: string]: string | number | boolean | object | undefined;
+}

package/dist/public-payload/site-payload.d.ts

@@ -2,5 +2,5 @@ import type { RoutingIds } 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 * as publicPayload from "./public-payload.types.js";
-export declare function makeSitePayload(siteContext: SiteContext, renderingContext: RenderingContext, language: string): publicPayload.SitePayload;
-export declare function toPublicRoutingDocumentNodelIds(ids: RoutingIds, language: string): publicPayload.RoutingDocumentNodelIds;
+export declare function makeSitePayload(siteContext: SiteContext, renderingContext: RenderingContext, language: string): publicPayload.TpSitePayload;
+export declare function toPublicRoutingDocumentNodelIds(ids: RoutingIds, language: string): publicPayload.TpRoutingDocumentNodelIds;

package/dist/public-payload/site-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,UAAU,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACxC,KAAK,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,IAAI,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ;QACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,IAAI,YAAY;YACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,iGAAiG,CAClG,CAAC;YACF,OAAO,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC;QAC1C,CAAC;QACD,aAAa,EAAE;YACb,kBAAkB,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO;SACrD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,GAAe,EACf,QAAgB;IAEhB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,SAAS,GAA0C;QACvD,EAAE,EAAE,OAAO;KACZ,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,UAAU,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACxC,KAAK,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,IAAI,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ;QACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,IAAI,YAAY;YACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,iGAAiG,CAClG,CAAC;YACF,OAAO,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC;QAC1C,CAAC;QACD,aAAa,EAAE;YACb,kBAAkB,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO;SACrD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,GAAe,EACf,QAAgB;IAEhB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,SAAS,GAA4C;QACzD,EAAE,EAAE,OAAO;KACZ,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/public-payload/translations.queries.d.ts

@@ -1,7 +1,7 @@
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import { type DropInst } from "../liquidjs-tools/liquidjs-drop.js";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-import type { DocTranslation } from "./public-payload.types.js";
-export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema">): DocTranslation[];
-export declare function loadTranslationsAsDrops(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<DropInst<DocTranslation>[]>;
+import type { TpDocTranslation } from "./public-payload.types.js";
+export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema">): TpDocTranslation[];
+export declare function loadTranslationsAsDrops(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<DropInst<TpDocTranslation>[]>;

package/dist/public-payload/translations.queries.js

@@ -1,5 +1,6 @@
 import { strVal } from "@paroi/data-formatters-lib";
 import { mainDbSchemaName } from "@paroicms/connector";
+import { encodeNodelId } from "@paroicms/public-anywhere-lib";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { createLiquidJsDrop } from "../liquidjs-tools/liquidjs-drop.js";
 import { getHomeUrl, getUrlOfDocument } from "../public-site/public-route/make-url.js";
@@ -19,18 +20,20 @@ export async function loadTranslationsAsDrops(siteContext, renderingContext, doc
     const translations = [];
     for (const language of siteContext.siteSchema.languages) {
         const exists = existingLanguages.has(language);
-        const url = exists
-            ? await getUrlOfDocument(siteContext, renderingContext.tracker, { nodeId, language })
-            : getHomeUrl(siteContext, language);
         const itemId = { nodeId, language };
         translations.push(createLiquidJsDrop({
             renderingContext,
-            cacheKeyOptions: { documentId: itemId },
+            renderingCacheKey: `translation:${encodeNodelId(itemId)}`,
             values: {
                 language,
                 languageLabel: siteContext.siteSchema.languageLabels[language],
                 active: language === documentId.language,
-                url,
+                url: exists
+                    ? async () => await getUrlOfDocument(siteContext, renderingContext.tracker, {
+                        nodeId,
+                        language,
+                    })
+                    : getHomeUrl(siteContext, language),
                 doc: exists
                     ? async () => createDocPayloadDrop(siteContext, renderingContext, await getDocItem(siteContext, renderingContext.tracker, itemId))
                     : undefined,

package/dist/public-payload/translations.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"translations.queries.js","sourceRoot":"","sources":["../../src/public-payload/translations.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAiB,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAEvF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,MAAM,UAAU,4BAA4B,CAC1C,WAA4C;IAE5C,OAAO,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzD,QAAQ;QACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,MAAM,EAAE,KAAK;QACb,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;KACvC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAwB,EACxB,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAC9B,MAAM,iBAAiB,GAAG,MAAM,sBAAsB,CACpD,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,MAAM,CACP,CAAC;IACF,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,MAAM;YAChB,CAAC,CAAC,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YACrF,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAEnD,YAAY,CAAC,IAAI,CACf,kBAAkB,CAChB;YACE,gBAAgB;YAChB,eAAe,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;YACvC,MAAM,EAAE;gBACN,QAAQ;gBACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;gBAC9D,MAAM,EAAE,QAAQ,KAAK,UAAU,CAAC,QAAQ;gBACxC,GAAG;gBACH,GAAG,EAAE,MAAM;oBACT,CAAC,CAAC,KAAK,IAAI,EAAE,CACT,oBAAoB,CAClB,WAAW,EACX,gBAAgB,EAChB,MAAM,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAChE;oBACL,CAAC,CAAC,SAAS;aACd;SACF,EACD,WAAW,CACZ,CACF,CAAC;QAEF,IAAI,QAAQ,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YACrC,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAEtE,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,WAAwB,EACxB,OAAgB,EAChB,MAAc;IAEd,MAAM,SAAS,GAAG,MAAM,WAAW;SAChC,EAAE,CAAC,cAAc,CAAC;SAClB,MAAM,CAAC,wBAAwB,CAAC;SAChC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;SACzB,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEzD,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"translations.queries.js","sourceRoot":"","sources":["../../src/public-payload/translations.queries.ts"],"names":[],"mappings":"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"}