@paroicms/server 1.104.5 → 1.105.1

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

@@ -1,12 +1,11 @@
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { encodeLNodeId, } from "@paroicms/public-anywhere-lib";
+import { assignLoadDescriptor } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { mainDbSchemaName } from "../connector/db-init/db-constants.js";
 import { createLiquidDrop } from "../liquidjs-tools/liquidjs-drop.js";
-import { createDocPayloadDrop } from "./create-doc-drop.js";
-import { getDocItem } from "./doc-values.queries.js";
 export function getSiblingDocuments(renderingContext, documentId) {
     const { siteContext } = renderingContext;
     const renderingCacheKey = `doc:${encodeLNodeId(documentId)}:siblings`;
@@ -30,19 +29,30 @@ export function getSiblingDocuments(renderingContext, documentId) {
             parentNodeId: parentNode.parentNodeId,
             documentId,
         });
+        renderingContext.addDependencyKey(makeCacheDependencyKey({
+            documentId: {
+                nodeId: parentNode.parentNodeId,
+                language: documentId.language,
+            },
+            relation: "children",
+        }));
         return {
             renderingCacheKey,
             values: {
                 previous: previousDocumentId
-                    ? createDocPayloadDrop(renderingContext, () => {
-                        renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: previousDocumentId }));
-                        return getDocItem(siteContext, renderingContext.tracker, previousDocumentId);
+                    ? assignLoadDescriptor({}, {
+                        load: "one",
+                        nodeKind: "document",
+                        descriptorName: "id",
+                        documentId: previousDocumentId,
                     })
                     : undefined,
                 next: nextDocumentId
-                    ? createDocPayloadDrop(renderingContext, () => {
-                        renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: nextDocumentId }));
-                        return getDocItem(siteContext, renderingContext.tracker, nextDocumentId);
+                    ? assignLoadDescriptor({}, {
+                        load: "one",
+                        nodeKind: "document",
+                        descriptorName: "id",
+                        documentId: nextDocumentId,
                     })
                     : undefined,
             },
@@ -59,10 +69,10 @@ const ParentNodeRowAT = type({
 }));
 async function getParentNode(siteContext, tracker, nodeId) {
     const row = await siteContext
-        .cn("PaNode as l")
-        .select(["l2.typeName as parentTypeName", "l2.id as parentId"])
-        .where("l.id", nodeId)
-        .innerJoin("PaNode as l2", "l2.id", "l.parentId")
+        .cn("PaNode as n")
+        .select(["n2.typeName as parentTypeName", "n2.id as parentId"])
+        .where("n.id", nodeId)
+        .innerJoin("PaNode as n2", "n2.id", "n.parentId")
         .first();
     tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
     if (!row)
@@ -80,18 +90,18 @@ const SiblingIdsRowAT = type({
 async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentNodeId, parentDocumentType, }) {
     const { language } = documentId;
     const { cn } = siteContext;
-    const subQuery = cn("PaNode as l")
-        .innerJoin("PaLNode as s", {
-        "s.nodeId": "l.id",
-        "s.language": cn.raw("?", [language]),
+    const subQuery = cn("PaNode as n")
+        .innerJoin("PaLNode as l", {
+        "l.nodeId": "n.id",
+        "l.language": cn.raw("?", [language]),
     })
         .innerJoin("PaDocument as d", {
-        "d.nodeId": "s.nodeId",
-        "d.language": "s.language",
+        "d.nodeId": "l.nodeId",
+        "d.language": "l.language",
     })
-        .where("l.parentId", parentNodeId)
-        .andWhere("s.ready", 1)
-        .andWhere("l.publishDate", "<=", cn.fn.now());
+        .where("n.parentId", parentNodeId)
+        .andWhere("l.ready", 1)
+        .andWhere("n.publishDate", "<=", cn.fn.now());
     const { orderBy } = applyRegularChildrenSortingOnQuery(siteContext, {
         query: subQuery,
         parentDocumentType,
@@ -101,9 +111,9 @@ async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentN
     if (!orderBy)
         return {};
     subQuery.select([
-        "l.id as id",
-        cn.raw("lag(l.id) over (?) as prevId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
-        cn.raw("lead(l.id) over (?) as nextId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
+        "n.id as id",
+        cn.raw("lag(n.id) over (?) as prevId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
+        cn.raw("lead(n.id) over (?) as nextId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
     ]);
     const query = cn
         .with("ordered_nodes", subQuery)

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/make-public-payload.js

@@ -1,13 +1,11 @@
 import { toTpClusterPayload } from "./cluster-payloads.js";
 import { createDocPayloadDrop } from "./create-doc-drop.js";
-import { makeSitePayload } from "./site-payload.js";
 import { makeBasicTranslationsPayload } from "./translations.queries.js";
 export function makeDetachedPublicPayload(renderingContext, options) {
     const { siteContext } = renderingContext;
     const language = options.language ?? siteContext.siteSchema.defaultLanguage;
     const cluster = toTpClusterPayload(renderingContext, language, siteContext.homeRoutingCluster);
     return {
-        site: makeSitePayload(renderingContext, language),
         doc: {
             kind: "detached",
             language,
@@ -20,8 +18,10 @@ export function makeDetachedPublicPayload(renderingContext, options) {
 }
 export function makeRegularPublicPayload(renderingContext, docValues, options) {
     return {
-        site: makeSitePayload(renderingContext, docValues.language),
-        doc: createDocPayloadDrop(renderingContext, docValues, options),
+        doc: createDocPayloadDrop(renderingContext, docValues, {
+            ...options,
+            documentId: docValues,
+        }),
     };
 }
 //# 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":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,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;IAE5E,MAAM,OAAO,GAAG,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAE/F,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,QAAQ,CAAQ;QACxD,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;YAC1B,OAAO,EAAE,OAAc;SACxB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,gBAAkC,EAClC,SAAoC,EACpC,OAIC;IAED,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAQ;QAClE,GAAG,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAQ;KACvE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/make-public-payload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,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;IAE5E,MAAM,OAAO,GAAG,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAE/F,OAAO;QACL,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;YAC1B,OAAO,EAAE,OAAc;SACxB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,gBAAkC,EAClC,SAAoC,EACpC,OAIC;IAED,OAAO;QACL,GAAG,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE;YACrD,GAAG,OAAO;YACV,UAAU,EAAE,SAAS;SACtB,CAAQ;KACV,CAAC;AACJ,CAAC"}

package/dist/rendering-payload/parts.queries.js

@@ -26,27 +26,27 @@ const LoadPartsRowAT = type({
 export async function loadPartsOf(siteContext, tracker, documentId, listType) {
     const { siteSchema, cn } = siteContext;
     const listNames = [...getRecursiveListNames(siteSchema, listType)];
-    const rows = await cn("PaNode as l")
+    const rows = await cn("PaNode as n")
         .select([
-        "l.id as nodeId",
-        "l.relativeId",
-        "l.publishDate",
-        "l.typeName",
-        "l.parentId",
+        "n.id as nodeId",
+        "n.relativeId",
+        "n.publishDate",
+        "n.typeName",
+        "n.parentId",
         "p.listName",
         "o.orderNum",
-        "s.nodeId as tNodeId",
+        "l.nodeId as tNodeId",
     ])
-        .innerJoin("PaPartNode as p", "p.nodeId", "l.id")
-        .leftJoin("PaLNode as s", {
-        "s.nodeId": "l.id",
-        "s.language": cn.raw("?", [documentId.language]),
-        "s.ready": cn.raw("?", [1]),
+        .innerJoin("PaPartNode as p", "p.nodeId", "n.id")
+        .leftJoin("PaLNode as l", {
+        "l.nodeId": "n.id",
+        "l.language": cn.raw("?", [documentId.language]),
+        "l.ready": cn.raw("?", [1]),
     })
-        .leftJoin("PaOrderedNode as o", "o.nodeId", "l.id")
+        .leftJoin("PaOrderedNode as o", "o.nodeId", "n.id")
         .where("p.documentNodeId", documentId.nodeId)
         .whereIn("p.listName", listNames)
-        .whereRaw("l.publishDate <= current_timestamp");
+        .whereRaw("n.publishDate <= current_timestamp");
     tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
     const oneLanguageItems = rows.map((row) => {
         const validated = LoadPartsRowAT.assert(row);
@@ -126,10 +126,10 @@ async function completeMissingTranslations(siteContext, tracker, list) {
     let otherLanguageItems;
     if (missingNodeIds.length > 0) {
         const rows = await siteContext
-            .cn("PaLNode as s")
-            .select(["s.nodeId", "s.language", "l.typeName"])
-            .innerJoin("PaNode as l", "l.id", "s.nodeId")
-            .whereIn("s.nodeId", missingNodeIds);
+            .cn("PaLNode as l")
+            .select(["l.nodeId", "l.language", "n.typeName"])
+            .innerJoin("PaNode as n", "n.id", "l.nodeId")
+            .whereIn("l.nodeId", missingNodeIds);
         tracker.trackAccess(mainDbSchemaName, "PaLNode", "read");
         const formatted = rows.map((row) => MissingTranslationsRowAT.assert(row));
         otherLanguageItems = new Map(formatted.map((item) => [encodeLNodeId(item), item]));

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

@@ -1,12 +1,10 @@
 import type { MImage } from "@paroicms/public-anywhere-lib";
-import type { PaUrlQuery } from "@paroicms/public-server-lib";
+import type { PaUrlQuery, WithDocumentsLoadDescriptor, WithOneDocumentLoadDescriptor } from "@paroicms/public-server-lib";
 export type TpTemplatePayload = TpDetachedPublicPayload | TpRegularPublicPayload;
 export interface TpDetachedPublicPayload {
-    site: TpSitePayload;
     doc: TpDetachedDocPayload;
 }
 export interface TpRegularPublicPayload {
-    site: TpSitePayload;
     doc: TpDocPayload;
 }
 export interface TpSitePayload {
@@ -33,10 +31,10 @@ export interface TpClusterPayload {
     routing: TpRoutingClusterNode;
     parentCluster: TpClusterPayload | undefined;
 }
-export interface TpRoutingClusterNode {
+export interface TpRoutingClusterNode extends WithOneDocumentLoadDescriptor {
     id: string;
-    doc?: TpDocPayload;
-    [typeName: string]: TpRoutingClusterNode | TpDocPayload | string | undefined;
+    children: WithDocumentsLoadDescriptor | undefined;
+    [typeName: string]: TpRoutingClusterNode | WithDocumentsLoadDescriptor | string | undefined;
 }
 export interface TpChildRoutingClusterNode {
     [typeName: string]: TpRoutingClusterNode | string;
@@ -98,21 +96,19 @@ export interface TpDocPayload extends TpDocValues {
     routingIds?: TpChildRoutingClusterNode;
     cluster: TpClusterPayload;
 }
-export interface TpDocTranslation {
+export interface TpDocTranslation extends WithOneDocumentLoadDescriptor {
     language: string;
     languageLabel: string;
     active: boolean;
     url: string;
-    doc?: TpDocPayload;
 }
-export interface TpTerm {
+export interface TpTerm extends WithOneDocumentLoadDescriptor {
     inRightLanguage: boolean;
     language: string;
     languageLabel: string;
     nodeId: string;
     title?: string;
     url?: string;
-    doc: TpDocPayload;
 }
 export interface TpPartValues {
     type: string;
@@ -149,14 +145,14 @@ export interface TpOgValues {
     description?: string;
     locale?: string;
 }
-export interface TpBreadcrumbItem {
+export interface TpBreadcrumbItem extends WithOneDocumentLoadDescriptor {
     id: string;
     title?: string;
     url?: string;
 }
 export interface TpSiblingDocuments {
-    previous?: TpDocPayload;
-    next?: TpDocPayload;
+    previous?: WithOneDocumentLoadDescriptor;
+    next?: WithOneDocumentLoadDescriptor;
 }
 export interface TpFieldValues {
     [fieldName: string]: string | number | boolean | object | undefined;

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

@@ -1,4 +1,4 @@
 import { type DropInst } from "../liquidjs-tools/liquidjs-drop.js";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type * as publicPayload from "./rendering-payload.types.js";
-export declare function makeSitePayload(renderingContext: RenderingContext, language: string): DropInst<publicPayload.TpSitePayload>;
+export declare function makeSitePayload(renderingContext: RenderingContext): DropInst<publicPayload.TpSitePayload>;

package/dist/rendering-payload/site-payload.js

@@ -4,9 +4,12 @@ import { createLiquidDrop } from "../liquidjs-tools/liquidjs-drop.js";
 import { getHomeUrl } from "../rendered-site/page-route/make-url.js";
 import { toTpRoutingClusterNode } from "./cluster-payloads.js";
 import { loadPublicFieldValues } from "./field-values.js";
-export function makeSitePayload(renderingContext, language) {
-    const { siteContext } = renderingContext;
-    return createLiquidDrop(renderingContext, {
+export function makeSitePayload(renderingContext) {
+    const cached = renderingContext.getValueFromCache("site");
+    if (cached.found)
+        return cached.val;
+    const { siteContext, language } = renderingContext;
+    const siteDrop = createLiquidDrop(renderingContext, {
         renderingCacheKey: "site",
         values: {
             kind: "site",
@@ -50,5 +53,7 @@ export function makeSitePayload(renderingContext, language) {
             },
         },
     });
+    renderingContext.setValueIntoCache("site", siteDrop);
+    return siteDrop;
 }
 //# sourceMappingURL=site-payload.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/site-payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAiB,MAAM,oCAAoC,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,MAAM,UAAU,eAAe,CAC7B,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO,gBAAgB,CAA8B,gBAAgB,EAAE;QACrE,iBAAiB,EAAE,MAAM;QACzB,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,GAAG,EAAE,WAAW,CAAC,OAAO;YACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;YACxC,KAAK,EAAE,GAAG,EAAE,CACV,qBAAqB,CAAC,gBAAgB,EAAE;gBACtC,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE;oBACP,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,UAAU;oBACjD,QAAQ;iBACT;aACF,CAAC;YACJ,MAAM,EAAE,GAAG,EAAE;gBACX,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACjF,OAAO,qBAAqB,CAAC,gBAAgB,EAAE;oBAC7C,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE;wBACP,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,UAAU;wBACjD,QAAQ;qBACT;iBACF,CAAC,CAAC;YACL,CAAC;YACD,IAAI,EAAE;gBACJ,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,kBAAkB,EAAE,QAAQ,CAAC;gBACrF,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;aACvC;YACD,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,IAAI,YAAY;gBACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,uFAAuF,CACxF,CAAC;gBACF,OAAO,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,aAAa;qBACnE,sBAA4C,CAAC;YAClD,CAAC;YACD,aAAa,EAAE;gBACb,IAAI,sBAAsB;oBACxB,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,+GAA+G,CAChH,CAAC;oBACF,OAAO,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,aAAa;yBACnE,sBAAsB,CAAC;gBAC5B,CAAC;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/site-payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAiB,MAAM,oCAAoC,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,MAAM,UAAU,eAAe,CAC7B,gBAAkC;IAElC,MAAM,MAAM,GAAG,gBAAgB,CAAC,iBAAiB,CAAwC,MAAM,CAAC,CAAC;IACjG,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC;IAEpC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC;IACnD,MAAM,QAAQ,GAAG,gBAAgB,CAA8B,gBAAgB,EAAE;QAC/E,iBAAiB,EAAE,MAAM;QACzB,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,GAAG,EAAE,WAAW,CAAC,OAAO;YACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;YACxC,KAAK,EAAE,GAAG,EAAE,CACV,qBAAqB,CAAC,gBAAgB,EAAE;gBACtC,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE;oBACP,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,UAAU;oBACjD,QAAQ;iBACT;aACF,CAAC;YACJ,MAAM,EAAE,GAAG,EAAE;gBACX,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACjF,OAAO,qBAAqB,CAAC,gBAAgB,EAAE;oBAC7C,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE;wBACP,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,UAAU;wBACjD,QAAQ;qBACT;iBACF,CAAC,CAAC;YACL,CAAC;YACD,IAAI,EAAE;gBACJ,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,kBAAkB,EAAE,QAAQ,CAAC;gBACrF,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;aACvC;YACD,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,IAAI,YAAY;gBACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,uFAAuF,CACxF,CAAC;gBACF,OAAO,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,aAAa;qBACnE,sBAA4C,CAAC;YAClD,CAAC;YACD,aAAa,EAAE;gBACb,IAAI,sBAAsB;oBACxB,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,+GAA+G,CAChH,CAAC;oBACF,OAAO,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,aAAa;yBACnE,sBAAsB,CAAC;gBAC5B,CAAC;aACF;SACF;KACF,CAAC,CAAC;IAEH,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

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

@@ -3,5 +3,5 @@ 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 { TpDocTranslation } from "./rendering-payload.types.js";
-export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema">): TpDocTranslation[];
+export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema" | "homeRoutingCluster">): TpDocTranslation[];
 export declare function loadTranslationsAsDrops(renderingContext: RenderingContext, documentId: ParsedLNodeId): Promise<DropInst<TpDocTranslation>[]>;

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

@@ -1,18 +1,24 @@
-import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId, parseLNodeId } from "@paroicms/public-anywhere-lib";
+import { assignLoadDescriptor } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { mainDbSchemaName } from "../connector/db-init/db-constants.js";
 import { createLiquidDrop } from "../liquidjs-tools/liquidjs-drop.js";
 import { getHomeUrl, 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 makeBasicTranslationsPayload(siteContext) {
-    return siteContext.siteSchema.languages.map((language) => ({
-        language,
-        languageLabel: siteContext.siteSchema.languageLabels[language],
-        active: false,
-        url: getHomeUrl(siteContext, language),
-    }));
+    return siteContext.siteSchema.languages.map((language) => {
+        return assignLoadDescriptor({
+            language,
+            languageLabel: siteContext.siteSchema.languageLabels[language],
+            active: false,
+            url: getHomeUrl(siteContext, language),
+        }, {
+            load: "one",
+            nodeKind: "document",
+            descriptorName: "id",
+            documentId: parseLNodeId(siteContext.homeRoutingCluster.lNodeIds[language]),
+        });
+    });
 }
 export async function loadTranslationsAsDrops(renderingContext, documentId) {
     const { siteContext } = renderingContext;
@@ -34,9 +40,13 @@ export async function loadTranslationsAsDrops(renderingContext, documentId) {
                         language,
                     })
                     : getHomeUrl(siteContext, language),
-                doc: exists
-                    ? async () => createDocPayloadDrop(renderingContext, await getDocItem(siteContext, renderingContext.tracker, itemId))
-                    : undefined,
+            },
+        }, {
+            loadDescriptor: {
+                load: "one",
+                nodeKind: "document",
+                descriptorName: "id",
+                documentId,
             },
         }));
         if (language !== documentId.language) {
@@ -52,10 +62,10 @@ const TranslationLanguageRowAT = type({
 });
 async function getExistingLanguagesOf(siteContext, tracker, nodeId) {
     const documents = await siteContext
-        .cn("PaLNode as s")
-        .select("s.language")
-        .where("s.nodeId", nodeId)
-        .where("s.ready", 1);
+        .cn("PaLNode as l")
+        .select("l.language")
+        .where("l.nodeId", nodeId)
+        .where("l.ready", 1);
     tracker.trackAccess(mainDbSchemaName, "PaLNode", "read");
     return new Set(documents.map((item) => TranslationLanguageRowAT.assert(item).language));
 }

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

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

package/dist/site-context/core-plugin/create-core-plugin.js

@@ -24,7 +24,8 @@ export function createCorePlugin() {
         },
         initData: {
             liquidFilters: createCoreLiquidFilters(),
-            liquidTags: [],
+            setLiquidTagHandlers: [],
+            outLiquidTagHandlers: [],
             headTagsHandlers: [],
             liquidRootDirectories: [],
             siteSchemaLibraryDirectories: [],

package/dist/site-context/core-plugin/create-core-plugin.js.map

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

package/dist/site-context/liquid-init.d.ts

@@ -1,2 +1,7 @@
 import type { Liquid } from "liquidjs";
-export declare function initializeLiquidEngine(liquidEngine: Liquid): void;
+import { type OutLiquidTag } from "../rendered-site/helpers/out-liquid-tag.js";
+import { type SetLiquidTag } from "../rendered-site/helpers/set-liquid-tag.js";
+export declare function initializeLiquidEngine(liquidEngine: Liquid): {
+    setLiquidTag: SetLiquidTag;
+    outLiquidTag: OutLiquidTag;
+};

package/dist/site-context/liquid-init.js

@@ -1,17 +1,35 @@
 import RenderTag from "../liquidjs-tools/render-clone/render.js";
+import { createOutLiquidTag } from "../rendered-site/helpers/out-liquid-tag.js";
+import { createSetLiquidTag } from "../rendered-site/helpers/set-liquid-tag.js";
 import { createDeprecatedGetDocLiquidTag } from "../rendered-site/liquidjs-tags/deprecated-get-doc-tag.js";
 import { createDeprecatedGetDocsLiquidTag } from "../rendered-site/liquidjs-tags/deprecated-get-docs-tag.js";
 import { createDeprecatedGetPaginatedDocsLiquidTag } from "../rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.js";
 import { createDeprecatedUseImageLiquidTag } from "../rendered-site/liquidjs-tags/deprecated-use-image-tag.js";
+import { createDocLiquidSetHandler } from "../rendered-site/liquidjs-tags/doc-liquid-set-handler.js";
+import { createDocsLiquidSetHandler } from "../rendered-site/liquidjs-tags/docs-liquid-set-handler.js";
+import { createImageLiquidSetHandler } from "../rendered-site/liquidjs-tags/image-liquid-set-handler.js";
+import { createPaginatedDocsLiquidSetHandler } from "../rendered-site/liquidjs-tags/paginated-docs-liquid-set-handler.js";
 export function initializeLiquidEngine(liquidEngine) {
     liquidEngine.registerTag("include", createDisabledLiquidJSTag("include"));
     liquidEngine.registerTag("render", RenderTag);
+    const setLiquidTag = createSetLiquidTag();
+    liquidEngine.registerTag("set", setLiquidTag.tagClass);
+    setLiquidTag.registerHandler("image", createImageLiquidSetHandler());
+    setLiquidTag.registerHandler("doc", createDocLiquidSetHandler());
+    setLiquidTag.registerHandler("docs", createDocsLiquidSetHandler());
+    setLiquidTag.registerHandler("paginatedDocs", createPaginatedDocsLiquidSetHandler());
+    const outLiquidTag = createOutLiquidTag();
+    liquidEngine.registerTag("out", outLiquidTag.tagClass);
     liquidEngine.registerTag("getDocs", createDeprecatedGetDocsLiquidTag());
     liquidEngine.registerTag("getPaginatedDocs", createDeprecatedGetPaginatedDocsLiquidTag());
     liquidEngine.registerTag("getPages", createDeprecatedGetDocsLiquidTag());
     liquidEngine.registerTag("getDoc", createDeprecatedGetDocLiquidTag());
     liquidEngine.registerTag("getPage", createDeprecatedGetDocLiquidTag());
     liquidEngine.registerTag("useImage", createDeprecatedUseImageLiquidTag());
+    return {
+        setLiquidTag,
+        outLiquidTag,
+    };
 }
 function createDisabledLiquidJSTag(name) {
     return {

package/dist/site-context/liquid-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"liquid-init.js","sourceRoot":"","sources":["../../src/site-context/liquid-init.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,0CAA0C,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,EAAE,gCAAgC,EAAE,MAAM,2DAA2D,CAAC;AAC7G,OAAO,EAAE,yCAAyC,EAAE,MAAM,qEAAqE,CAAC;AAChI,OAAO,EAAE,iCAAiC,EAAE,MAAM,4DAA4D,CAAC;AAE/G,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IACzD,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC9C,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACxE,YAAY,CAAC,WAAW,CAAC,kBAAkB,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAC1F,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACzE,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,+BAA+B,EAAE,CAAC,CAAC;IACtE,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,+BAA+B,EAAE,CAAC,CAAC;IACvE,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,iCAAiC,EAAE,CAAC,CAAC;AAC5E,CAAC;AAKD,SAAS,yBAAyB,CAAC,IAAY;IAC7C,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"liquid-init.js","sourceRoot":"","sources":["../../src/site-context/liquid-init.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,0CAA0C,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAqB,MAAM,4CAA4C,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAqB,MAAM,4CAA4C,CAAC;AACnG,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,EAAE,gCAAgC,EAAE,MAAM,2DAA2D,CAAC;AAC7G,OAAO,EAAE,yCAAyC,EAAE,MAAM,qEAAqE,CAAC;AAChI,OAAO,EAAE,iCAAiC,EAAE,MAAM,4DAA4D,CAAC;AAC/G,OAAO,EAAE,yBAAyB,EAAE,MAAM,0DAA0D,CAAC;AACrG,OAAO,EAAE,0BAA0B,EAAE,MAAM,2DAA2D,CAAC;AACvG,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AACzG,OAAO,EAAE,mCAAmC,EAAE,MAAM,qEAAqE,CAAC;AAE1H,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IAIzD,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAC1C,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACvD,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;IACrE,YAAY,CAAC,eAAe,CAAC,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACjE,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAAC;IACnE,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE,mCAAmC,EAAE,CAAC,CAAC;IAErF,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAC1C,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IAGvD,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACxE,YAAY,CAAC,WAAW,CAAC,kBAAkB,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAC1F,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACzE,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,+BAA+B,EAAE,CAAC,CAAC;IACtE,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,+BAA+B,EAAE,CAAC,CAAC;IACvE,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,iCAAiC,EAAE,CAAC,CAAC;IAE1E,OAAO;QACL,YAAY;QACZ,YAAY;KACb,CAAC;AACJ,CAAC;AAKD,SAAS,yBAAyB,CAAC,IAAY;IAC7C,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/site-context/load-site-context.js

@@ -18,7 +18,6 @@ import { toLiquidFilterHandler } from "../liquidjs-tools/liquidjs-filter.js";
 import { extractRenderingContext } from "../liquidjs-tools/liquidjs-utils.js";
 import { siteMaintenanceTask } from "../maintenance/maintenance-task.js";
 import { createBackendPluginService, createPluginRenderingService, executeHook, } from "../plugin-services/make-backend-plugin-service.js";
-import { createAssignLiquidTag, createInjectHtmlLiquidTag, } from "../rendered-site/helpers/liquid-tag-helpers.js";
 import { createCorePlugin } from "./core-plugin/create-core-plugin.js";
 import { initializeLiquidEngine } from "./liquid-init.js";
 import { loadSiteAccess } from "./site-values-for-site-context.js";
@@ -87,6 +86,7 @@ export async function loadSiteContext(regSite) {
         strictFilters: true,
         outputEscape: "escape",
     });
+    const { setLiquidTag, outLiquidTag } = initializeLiquidEngine(liquidEngine);
     const themeTranslator = await loadSimpleTranslatorFromDirectory({
         l10nDir: join(themeDir, "locales"),
         languages: siteSchema.languages,
@@ -112,6 +112,8 @@ export async function loadSiteContext(regSite) {
         siteNodeId,
         homeRoutingCluster,
         liquidEngine,
+        setLiquidTag,
+        outLiquidTag,
         mediaStorage,
         imageCache,
         textCache,
@@ -131,7 +133,6 @@ export async function loadSiteContext(regSite) {
             state: "normal",
         },
     };
-    initializeLiquidEngine(liquidEngine);
     const corePlugin = createCorePlugin();
     for (const initPlugin of [corePlugin, ...initPlugins]) {
         postInitPlugin(siteContext, initPlugin);
@@ -187,19 +188,17 @@ function postInitPlugin(siteContext, plugin) {
             raw: options?.raw ?? false,
         });
     }
-    for (const registered of initData.liquidTags) {
-        if (registered.tagKind === "injectHtml") {
-            siteContext.liquidEngine.registerTag(registered.tagName, createInjectHtmlLiquidTag((renderingContext, parameters) => {
-                const service = createPluginRenderingService(renderingContext, createBackendPluginService(siteContext, plugin));
-                return registered.handler(service, parameters);
-            }));
-        }
-        else if (registered.tagKind === "assignToVar") {
-            siteContext.liquidEngine.registerTag(registered.tagName, createAssignLiquidTag(function* (renderingContext, options) {
-                const service = createPluginRenderingService(renderingContext, createBackendPluginService(siteContext, plugin));
-                return yield registered.handler(service, options);
-            }));
-        }
+    for (const registered of initData.setLiquidTagHandlers) {
+        siteContext.setLiquidTag.registerHandler(registered.fnName, function* (renderingContext, options) {
+            const service = createPluginRenderingService(renderingContext, createBackendPluginService(siteContext, plugin));
+            return yield registered.handler(service, options);
+        });
+    }
+    for (const registered of initData.outLiquidTagHandlers) {
+        siteContext.outLiquidTag.registerHandler(registered.fnName, (renderingContext, parameters) => {
+            const service = createPluginRenderingService(renderingContext, createBackendPluginService(siteContext, plugin));
+            return registered.handler(service, parameters);
+        });
     }
     const uniqueHookNames = new Set();
     for (const { hookName, handler, options } of initData.hooks) {