@paroicms/server 1.104.4 → 1.105.0

package/dist/rendering-payload/doc-values.queries.js

@@ -1,25 +1,21 @@
-import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
 import { type } from "arktype";
-import { getTypeNameOf } from "../admin-backend/node/node.queries.js";
-import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
-import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { mainDbSchemaName } from "../connector/db-init/db-constants.js";
 export async function getDocItem(siteContext, tracker, documentId, options = {}) {
     const query = siteContext.cn("PaDocument as d");
     querySelectDocValues(query, { omitId: true });
     query
-        .innerJoin("PaLNode as s", {
-        "s.nodeId": "d.nodeId",
-        "s.language": "d.language",
+        .innerJoin("PaLNode as l", {
+        "l.nodeId": "d.nodeId",
+        "l.language": "d.language",
     })
-        .innerJoin("PaNode as l", "l.id", "d.nodeId")
+        .innerJoin("PaNode as n", "n.id", "d.nodeId")
         .where({
         "d.nodeId": documentId.nodeId,
         "d.language": documentId.language,
-        "s.ready": 1,
+        "l.ready": 1,
     })
-        .whereRaw("l.publishDate <= current_timestamp");
+        .whereRaw("n.publishDate <= current_timestamp");
     const row = await query.first();
     tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     if (!row) {
@@ -29,101 +25,11 @@ export async function getDocItem(siteContext, tracker, documentId, options = {})
     }
     return formatDocValues(row, documentId);
 }
-export async function getPaginatedListOfDocValues(renderingContext, options) {
-    const { siteContext } = renderingContext;
-    const { pageIndex, pageSize, ...otherOptions } = options;
-    const items = await getListOfDocValues(renderingContext, {
-        offset: options.pageIndex > 0 ? options.pageIndex * options.pageSize : undefined,
-        limit: options.pageSize,
-        ...otherOptions,
-    });
-    const total = options.pageSize === items.length
-        ? await countDocItems(siteContext, renderingContext.tracker, { parentId: options.parentId })
-        : items.length;
-    return {
-        items,
-        total,
-        pageIndex,
-        pageCount: Math.ceil(total / pageSize),
-        pageSize,
-    };
-}
-export async function getListOfDocValues(renderingContext, options) {
-    const { siteContext } = renderingContext;
-    const { parentId, documentKind } = options;
-    const parentTypeName = await getTypeNameOf(siteContext, parentId.nodeId);
-    const parentDocumentType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
-    const typeNames = documentKind === "regular"
-        ? parentDocumentType.regularChildren
-        : parentDocumentType.routingChildren;
-    if (!typeNames?.length)
-        return [];
-    renderingContext.addDependencyKey(makeCacheDependencyKey({
-        relation: "children",
-        documentId: parentId,
-    }));
-    const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
-    query.whereIn("l.typeName", typeNames);
-    querySelectDocValues(query);
-    applyRegularChildrenSortingOnQuery(siteContext, {
-        query,
-        parentDocumentType,
-        regularChildrenSorting: options.orderBy,
-    });
-    if (options.labeledBy) {
-        const { fieldName, termNodeId } = options.labeledBy;
-        query
-            .innerJoin("PaFieldLabeling as f", "f.nodeId", "l.id")
-            .where("f.termId", termNodeId)
-            .where("f.field", fieldName);
-        renderingContext.addDependencyKey(makeCacheDependencyKey({
-            relation: "labeled",
-            termNodeId: termNodeId,
-            fieldName,
-        }));
-    }
-    if (options.offset !== undefined) {
-        query.offset(options.offset);
-    }
-    if (options.limit !== undefined) {
-        query.limit(options.limit);
-    }
-    const rows = await query;
-    renderingContext.tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
-    return rows.map((row) => formatDocValues(row, { language: parentId.language }));
-}
-const CountDocItemsRowAT = type({
-    cnt: "number",
-    "+": "reject",
-});
-async function countDocItems(siteContext, tracker, { parentId }) {
-    const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
-    const row = await query.count("* as cnt").first();
-    tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
-    if (!row)
-        return 0;
-    return CountDocItemsRowAT.assert(row).cnt;
-}
 export function querySelectDocValues(query, { omitId } = {}) {
     if (!omitId) {
-        query.select("l.id as nodeId");
+        query.select("n.id as nodeId");
     }
-    query.select("l.typeName", "l.relativeId", "d.title", "d.slug", "l.publishDate", "d.metaDescription", "d.metaKeywords");
-}
-function createBaseDocItemsQueryBuilder(siteContext, { parentId }) {
-    const { cn } = siteContext;
-    return cn("PaNode as l")
-        .innerJoin("PaLNode as s", {
-        "s.nodeId": "l.id",
-        "s.language": cn.raw("?", [parentId.language]),
-    })
-        .innerJoin("PaDocument as d", {
-        "d.nodeId": "s.nodeId",
-        "d.language": "s.language",
-    })
-        .where("l.parentId", parentId.nodeId)
-        .where("s.ready", 1)
-        .whereRaw("l.publishDate <= current_timestamp");
+    query.select("n.typeName", "n.relativeId", "n.publishDate", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords");
 }
 const DocValuesRowAT = type({
     typeName: "string",

package/dist/rendering-payload/doc-values.queries.js.map

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

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

@@ -7,8 +7,6 @@ import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { createLiquidDrop } from "../liquidjs-tools/liquidjs-drop.js";
 import { executeRenderingHook } from "../plugin-services/rendering-hook.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 async function loadPublicFieldValues(renderingContext, options) {
     const { siteContext } = renderingContext;
     let fieldTypes = getNodeTypeByName(siteContext.siteSchema, options.typeName).fields ?? [];
@@ -93,7 +91,13 @@ function createTpTerm(renderingContext, term, rightLanguage) {
                     language,
                 })
                 : undefined,
-            doc: async () => createDocPayloadDrop(renderingContext, await getDocItem(siteContext, renderingContext.tracker, termId)),
+        },
+    }, {
+        loadDescriptor: {
+            load: "one",
+            nodeKind: "document",
+            descriptorName: "id",
+            documentId: termId,
         },
     });
 }

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":"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"}
+{"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.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));
 }