@paroicms/server 1.103.0 → 1.104.1

package/dist/rendered-site/page-route/page-route-parser.js

@@ -7,101 +7,310 @@ export function parsePageRoute(siteContext, urlPath) {
         .split("/")
         .slice(1)
         .filter((token) => token.length > 0);
+    const languageResult = parseLanguageFromUrl(siteSchema, tokens);
+    if (!languageResult)
+        return;
+    const { language, urlSegments } = languageResult;
+    const urlCacheKey = [];
+    if (shouldPrefixWithLanguage(siteSchema, language))
+        urlCacheKey.push(language);
+    const hierarchyResult = parseDocumentHierarchy(siteSchema, urlSegments, language, urlCacheKey);
+    if (!hierarchyResult)
+        return;
+    return {
+        language,
+        redirectTo: hierarchyResult.redirectTo,
+        frontendAppPath: hierarchyResult.frontendAppPath,
+        urlCacheKey: urlCacheKey.join("/"),
+        documentHierarchy: hierarchyResult.documentHierarchy,
+    };
+}
+function parseUrlParameters(urlPath) {
+    return {
+        path: urlPath,
+    };
+}
+function parseLanguageFromUrl(siteSchema, tokens) {
     let language;
-    let urlParts;
+    let urlSegments;
     if (siteSchema.languageRoutingMode === "prefixAll") {
         language = tokens[0];
-        urlParts = tokens.slice(1);
+        urlSegments = tokens.slice(1);
     }
     else if (siteSchema.languageRoutingMode === "prefixSecondary") {
         if (tokens.length > 0 &&
             siteSchema.languages.includes(tokens[0]) &&
             tokens[0] !== siteSchema.defaultLanguage) {
             language = tokens[0];
-            urlParts = tokens.slice(1);
+            urlSegments = tokens.slice(1);
         }
         else {
             language = siteSchema.defaultLanguage;
-            urlParts = tokens;
+            urlSegments = tokens;
         }
     }
     else
         throw new Error(`invalid routing mode "${siteSchema.languageRoutingMode}"`);
     if (!language || !siteSchema.languages.includes(language))
         return;
-    const urlCacheKey = [];
-    if (shouldPrefixWithLanguage(siteSchema, language))
-        urlCacheKey.push(language);
-    let prev = siteSchema.nodeTypes.home;
-    const routingDocuments = [prev];
-    let depth = 0;
-    let index = 0;
-    let frontendApp = prev.hasFrontendApp ? { remainingParts: urlParts } : undefined;
-    for (; !frontendApp && index < urlParts.length; ++index) {
-        const urlPart = urlParts[index];
+    return { language, urlSegments };
+}
+function parseDocumentHierarchy(siteSchema, urlSegments, language, urlCacheKey) {
+    const documentHierarchy = [];
+    const homeDocument = siteSchema.nodeTypes.home;
+    documentHierarchy.push({
+        entryKind: "routing",
+        documentType: homeDocument,
+    });
+    const homeFrontendAppResult = checkFrontendAppWithRoutingPrecedence(homeDocument, urlSegments, 0, siteSchema, language);
+    if (homeFrontendAppResult.shouldUseFrontendApp) {
+        return {
+            documentHierarchy,
+            redirectTo: homeDocument.redirectTo,
+            frontendAppPath: `/${urlSegments.join("/")}`,
+        };
+    }
+    return parseDocumentHierarchyRecursive({
+        siteSchema,
+        urlSegments,
+        language,
+        urlCacheKey,
+        documentHierarchy,
+        currentParent: homeDocument,
+        index: 0,
+    });
+}
+function parseDocumentHierarchyRecursive({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, currentParent, index, }) {
+    const routingResult = parseRoutingDocuments({
+        siteSchema,
+        urlSegments,
+        language,
+        urlCacheKey,
+        documentHierarchy,
+        currentParent,
+        index,
+    });
+    if (routingResult.frontendAppPath || routingResult.index >= urlSegments.length) {
+        return {
+            documentHierarchy,
+            redirectTo: routingResult.redirectTo,
+            frontendAppPath: routingResult.frontendAppPath,
+        };
+    }
+    return parseRegularDocuments({
+        siteSchema,
+        urlSegments,
+        language,
+        urlCacheKey,
+        documentHierarchy,
+        parentCandidates: [routingResult.currentParent],
+        index: routingResult.index,
+        redirectTo: routingResult.redirectTo,
+    });
+}
+function parseRoutingDocuments({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, currentParent, index, }) {
+    let currentIndex = index;
+    let parent = currentParent;
+    while (currentIndex < urlSegments.length) {
+        const urlSegment = urlSegments[currentIndex];
         const routingDocument = findRoutingDocumentByUrlPath({
             siteSchema,
-            parent: prev,
-            urlPart,
+            parent,
+            urlSegment,
             language,
         });
         if (!routingDocument)
             break;
-        routingDocuments.push(routingDocument);
-        urlCacheKey.push(urlPart);
-        ++depth;
-        prev = routingDocument;
-        if (routingDocument.hasFrontendApp) {
-            frontendApp = { remainingParts: urlParts.slice(index + 1) };
+        documentHierarchy.push({
+            entryKind: "routing",
+            documentType: routingDocument,
+        });
+        urlCacheKey.push(urlSegment);
+        parent = routingDocument;
+        currentIndex++;
+        const frontendAppResult = checkFrontendAppWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
+        if (frontendAppResult.shouldUseFrontendApp) {
+            return {
+                currentParent: parent,
+                index: currentIndex,
+                redirectTo: routingDocument.redirectTo,
+                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+            };
         }
     }
-    let lastRedirectTo = prev.redirectTo;
-    let parentCandidates = [prev];
-    const regularRelativeIds = [];
-    while (!frontendApp && index < urlParts.length) {
-        const found = findRegularRelativeIdByUrlPath({
+    return {
+        currentParent: parent,
+        index: currentIndex,
+        redirectTo: parent.redirectTo,
+        frontendAppPath: undefined,
+    };
+}
+function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, parentCandidates, index, redirectTo, }) {
+    let currentIndex = index;
+    let candidates = parentCandidates;
+    let lastRedirectTo = redirectTo;
+    if (currentIndex >= urlSegments.length) {
+        return {
+            documentHierarchy,
+            redirectTo: lastRedirectTo,
+            frontendAppPath: undefined,
+        };
+    }
+    while (currentIndex < urlSegments.length) {
+        const found = findRegularDocumentByUrlPath({
             siteSchema,
-            parentCandidates,
-            urlParts,
-            index,
+            parentCandidates: candidates,
+            urlSegments,
+            index: currentIndex,
         });
         if (!found)
-            return;
-        regularRelativeIds.push(found.regularRelativeId);
-        urlCacheKey.push(`regular:${found.regularRelativeId.relativeId}`);
-        ++depth;
+            return undefined;
+        const isClusterRoot = found.candidateTypes.some((type) => (type.routingChildren?.length ?? 0) > 0);
+        documentHierarchy.push({
+            entryKind: "regular",
+            relativeId: found.relativeId,
+            candidateTypes: found.candidateTypes,
+            isClusterRoot,
+        });
+        urlCacheKey.push(`regular:${found.relativeId}`);
         lastRedirectTo = undefined;
-        index += found.skipUrlParts;
-        parentCandidates = found.regularRelativeId.candidateTypes;
-        if (found.regularRelativeId.candidateTypes.some((type) => type.hasFrontendApp)) {
-            frontendApp = { remainingParts: urlParts.slice(index) };
+        currentIndex += found.skipUrlSegments;
+        candidates = found.candidateTypes;
+        const frontendAppResult = checkRegularDocumentFrontendApp({
+            candidateTypes: found.candidateTypes,
+            urlSegments,
+            index: currentIndex,
+            siteSchema,
+            language,
+        });
+        if (frontendAppResult.shouldUseFrontendApp) {
+            return {
+                documentHierarchy,
+                redirectTo: lastRedirectTo,
+                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+            };
+        }
+        if (isClusterRoot && currentIndex < urlSegments.length) {
+            const clusterResult = parseClusterDocuments({
+                siteSchema,
+                urlSegments,
+                language,
+                urlCacheKey,
+                documentHierarchy,
+                regularCandidates: found.candidateTypes,
+                index: currentIndex,
+            });
+            return clusterResult;
         }
     }
     return {
-        language,
-        routingDocuments,
-        regularRelativeIds,
+        documentHierarchy,
         redirectTo: lastRedirectTo,
-        depth,
-        urlCacheKey: urlCacheKey.join("/"),
-        frontendAppPath: frontendApp ? `/${frontendApp.remainingParts.join("/")}` : undefined,
+        frontendAppPath: undefined,
     };
 }
-function parseUrlParameters(urlPath) {
+function parseClusterDocuments({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, regularCandidates, index, }) {
+    let currentIndex = index;
+    let lastRedirectTo;
+    while (currentIndex < urlSegments.length) {
+        const urlSegment = urlSegments[currentIndex];
+        let routingDocument;
+        for (const candidateType of regularCandidates) {
+            if (!candidateType.routingChildren)
+                continue;
+            routingDocument = findRoutingDocumentByUrlPath({
+                siteSchema,
+                parent: candidateType,
+                urlSegment,
+                language,
+            });
+            if (routingDocument)
+                break;
+        }
+        if (!routingDocument) {
+            return {
+                documentHierarchy,
+                redirectTo: lastRedirectTo,
+                frontendAppPath: undefined,
+            };
+        }
+        documentHierarchy.push({
+            entryKind: "routing",
+            documentType: routingDocument,
+        });
+        urlCacheKey.push(urlSegment);
+        currentIndex++;
+        lastRedirectTo = routingDocument.redirectTo;
+        const frontendAppResult = checkFrontendAppWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
+        if (frontendAppResult.shouldUseFrontendApp) {
+            return {
+                documentHierarchy,
+                redirectTo: routingDocument.redirectTo,
+                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+            };
+        }
+        if (routingDocument.regularChildren && currentIndex < urlSegments.length) {
+            return parseDocumentHierarchyRecursive({
+                siteSchema,
+                urlSegments,
+                language,
+                urlCacheKey,
+                documentHierarchy,
+                currentParent: routingDocument,
+                index: currentIndex,
+            });
+        }
+    }
     return {
-        path: urlPath,
+        documentHierarchy,
+        redirectTo: lastRedirectTo,
+        frontendAppPath: undefined,
     };
 }
-function findRoutingDocumentByUrlPath({ siteSchema, parent, urlPart, language, }) {
+function checkRegularDocumentFrontendApp({ candidateTypes, urlSegments, index, siteSchema, language, }) {
+    const hasFrontendApp = candidateTypes.some((type) => type.hasFrontendApp);
+    if (!hasFrontendApp) {
+        return { shouldUseFrontendApp: false };
+    }
+    const hasRoutingPrecedence = index < urlSegments.length &&
+        candidateTypes.some((type) => {
+            if (!type.routingChildren?.length)
+                return false;
+            const nextUrlSegment = urlSegments[index];
+            return type.routingChildren.some((childTypeName) => {
+                const childType = getRoutingDocumentTypeByName(siteSchema, childTypeName);
+                return childType.route && nextUrlSegment === childType.route[language];
+            });
+        });
+    return { shouldUseFrontendApp: !hasRoutingPrecedence };
+}
+function checkFrontendAppWithRoutingPrecedence(document, urlSegments, currentIndex, siteSchema, language) {
+    if (!document.hasFrontendApp) {
+        return { shouldUseFrontendApp: false };
+    }
+    if (currentIndex >= urlSegments.length) {
+        return { shouldUseFrontendApp: true };
+    }
+    const nextUrlSegment = urlSegments[currentIndex];
+    const hasRoutingMatch = (document.routingChildren ?? []).some((childTypeName) => {
+        const childType = getRoutingDocumentTypeByName(siteSchema, childTypeName);
+        return childType.route && nextUrlSegment === childType.route[language];
+    });
+    if (hasRoutingMatch) {
+        return { shouldUseFrontendApp: false };
+    }
+    return { shouldUseFrontendApp: true };
+}
+function findRoutingDocumentByUrlPath({ siteSchema, parent, urlSegment, language, }) {
     for (const typeName of parent.routingChildren ?? []) {
         const documentType = getRoutingDocumentTypeByName(siteSchema, typeName);
         if (!documentType.route)
             continue;
-        if (urlPart === documentType.route[language])
+        if (urlSegment === documentType.route[language])
             return documentType;
     }
 }
-function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, urlParts, index: partsIndex, }) {
+function findRegularDocumentByUrlPath({ siteSchema, parentCandidates, urlSegments, index: partsIndex, }) {
     const candidateTypes = parentCandidates
         .reduce((childTypeNames, parent) => {
         if (parent.regularChildren)
@@ -113,25 +322,27 @@ function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, urlParts
         return;
     const route = candidateTypes[0].route;
     if (route === ":relativeId-:slug") {
-        const urlPath = urlParts[partsIndex];
+        const urlPath = urlSegments[partsIndex];
         const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
-            regularRelativeId: { relativeId, candidateTypes },
-            skipUrlParts: 1,
+            relativeId,
+            candidateTypes,
+            skipUrlSegments: 1,
         };
     }
     if (route === ":yyyy/:mm/:dd/:relativeId-:slug") {
-        if (urlParts.length < partsIndex + 3 ||
-            !isYear(urlParts[partsIndex]) ||
-            !isMonth(urlParts[partsIndex + 1]) ||
-            !isDay(urlParts[partsIndex + 2])) {
+        if (urlSegments.length < partsIndex + 3 ||
+            !isYear(urlSegments[partsIndex]) ||
+            !isMonth(urlSegments[partsIndex + 1]) ||
+            !isDay(urlSegments[partsIndex + 2])) {
             return;
         }
-        const urlPath = urlParts[partsIndex + 3];
+        const urlPath = urlSegments[partsIndex + 3];
         const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
-            regularRelativeId: { relativeId, candidateTypes },
-            skipUrlParts: 4,
+            relativeId,
+            candidateTypes,
+            skipUrlSegments: 4,
         };
     }
 }
@@ -165,30 +376,32 @@ export function findParentParsedRouteWithDocument(parsedRoute) {
     }
 }
 function findParentParsedRoute(parsedRoute) {
-    const routingDocuments = [...parsedRoute.routingDocuments];
-    const regularRelativeIds = [...parsedRoute.regularRelativeIds];
+    const documentHierarchy = [...parsedRoute.documentHierarchy];
     const urlCacheKey = parsedRoute.urlCacheKey.split("/");
-    if (regularRelativeIds.length > 0) {
-        regularRelativeIds.pop();
-        urlCacheKey.pop();
+    if (documentHierarchy.length <= 1)
+        return;
+    const lastEntry = documentHierarchy.pop();
+    if (!lastEntry)
+        return;
+    if (lastEntry.entryKind === "regular") {
+        const expectedKey = `regular:${lastEntry.relativeId}`;
+        if (urlCacheKey[urlCacheKey.length - 1] === expectedKey) {
+            urlCacheKey.pop();
+        }
     }
-    else if (routingDocuments.length > 0) {
-        routingDocuments.pop();
+    else {
         urlCacheKey.pop();
     }
-    if (regularRelativeIds.length === 0 && routingDocuments.length === 0)
-        return;
-    const lastRegular = regularRelativeIds.length > 0 ? regularRelativeIds[regularRelativeIds.length - 1] : undefined;
-    const redirectTo = lastRegular
-        ? undefined
-        : routingDocuments[routingDocuments.length - 1]?.redirectTo;
+    const lastRemainingEntry = documentHierarchy[documentHierarchy.length - 1];
+    const redirectTo = lastRemainingEntry?.entryKind === "routing"
+        ? lastRemainingEntry.documentType.redirectTo
+        : undefined;
     return {
         language: parsedRoute.language,
-        routingDocuments,
-        regularRelativeIds,
+        documentHierarchy,
         redirectTo,
-        depth: parsedRoute.depth - 1,
         urlCacheKey: urlCacheKey.join("/"),
+        frontendAppPath: undefined,
     };
 }
 //# sourceMappingURL=page-route-parser.js.map

package/dist/rendered-site/page-route/page-route-parser.js.map

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

package/dist/rendered-site/page-route/raw-document-payload.js

@@ -15,40 +15,31 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
         "l0.id": "s0.nodeId",
         "s0.language": cn.raw("?", [parsedRoute.language]),
     })
-        .where("l0.depth", 0)
-        .where("l0.typeName", "home")
+        .where("l0.id", siteContext.homeRoutingCluster.nodeId)
         .whereRaw("l0.publishDate <= current_timestamp")
         .where("s0.ready", 1);
     let prev = 0;
-    for (const routingDocument of parsedRoute.routingDocuments.slice(1)) {
+    for (const document of parsedRoute.documentHierarchy.slice(1)) {
         const cur = prev + 1;
-        const typeNameParam = routingDocument.typeName;
+        if (document.entryKind === "routing") {
+            query = query.innerJoin(`PaNode as l${cur}`, {
+                [`l${prev}.id`]: `l${cur}.parentId`,
+                [`l${cur}.typeName`]: cn.raw("?", [document.documentType.typeName]),
+            });
+        }
+        else {
+            query = query
+                .innerJoin(`PaNode as l${cur}`, {
+                [`l${prev}.id`]: `l${cur}.parentId`,
+                [`l${cur}.relativeId`]: cn.raw("?", [document.relativeId]),
+            })
+                .whereIn(`l${cur}.typeName`, document.candidateTypes.map((t) => t.typeName));
+        }
         query = query
-            .innerJoin(`PaNode as l${cur}`, {
-            [`l${prev}.id`]: `l${cur}.parentId`,
-            [`l${cur}.typeName`]: cn.raw("?", [typeNameParam]),
-        })
-            .innerJoin(`PaLNode as s${cur}`, {
-            [`l${cur}.id`]: `s${cur}.nodeId`,
-            [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
-        })
-            .whereRaw(`l${cur}.publishDate <= current_timestamp`)
-            .where(`s${cur}.ready`, 1);
-        prev = cur;
-    }
-    for (const { candidateTypes, relativeId } of parsedRoute.regularRelativeIds) {
-        const cur = prev + 1;
-        const typeNames = candidateTypes.map((t) => t.typeName);
-        query = query
-            .innerJoin(`PaNode as l${cur}`, {
-            [`l${prev}.id`]: `l${cur}.parentId`,
-            [`l${cur}.relativeId`]: cn.raw("?", [relativeId]),
-        })
             .innerJoin(`PaLNode as s${cur}`, {
             [`l${cur}.id`]: `s${cur}.nodeId`,
             [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
         })
-            .whereIn(`l${cur}.typeName`, typeNames)
             .whereRaw(`l${cur}.publishDate <= current_timestamp`)
             .where(`s${cur}.ready`, 1);
         prev = cur;

package/dist/rendered-site/page-route/raw-document-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/raw-document-payload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/raw-document-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAKhF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,WAA4B;IAE5B,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAChE,MAAM,IAAI,GAAU,MAAM,KAAK,CAAC;IAChC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEvC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,WAAwB,EAAE,WAA4B;IACrF,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAG3B,IAAI,KAAK,GAAG,EAAE,CAAC,cAAc,CAAC;SAC3B,SAAS,CAAC,eAAe,EAAE;QAC1B,OAAO,EAAE,WAAW;QACpB,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KACnD,CAAC;SACD,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,kBAAkB,CAAC,MAAM,CAAC;SACrD,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAGxB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QAErB,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAErC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,cAAc,GAAG,EAAE,EAAE;gBAC3C,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,GAAG,WAAW;gBACnC,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aACpE,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YAEN,KAAK,GAAG,KAAK;iBACV,SAAS,CAAC,cAAc,GAAG,EAAE,EAAE;gBAC9B,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,GAAG,WAAW;gBACnC,CAAC,IAAI,GAAG,aAAa,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;aAC3D,CAAC;iBACD,OAAO,CACN,IAAI,GAAG,WAAW,EAClB,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC/C,CAAC;QACN,CAAC;QAGD,KAAK,GAAG,KAAK;aACV,SAAS,CAAC,eAAe,GAAG,EAAE,EAAE;YAC/B,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,IAAI,GAAG,SAAS;YAChC,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC1D,CAAC;aACD,QAAQ,CAAC,IAAI,GAAG,mCAAmC,CAAC;aACpD,KAAK,CAAC,IAAI,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;QAE7B,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAGD,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QACnB,IAAI,IAAI,uBAAuB;QAC/B,IAAI,IAAI,eAAe;QACvB,IAAI,IAAI,2BAA2B;QACnC,IAAI,IAAI,6BAA6B;KACtC,CAAC,CAAC;IAGH,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC5B,KAAK,GAAG,KAAK;aACV,MAAM,CAAC;YACN,kBAAkB;YAClB,gBAAgB;YAChB,sCAAsC;YACtC,gCAAgC;SACjC,CAAC;aACD,SAAS,CAAC,iBAAiB,EAAE;YAC5B,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,UAAU;YAC3B,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,YAAY;SACpC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/rendered-site/serve-document/serve-document.js.map

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

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

@@ -1,3 +1,4 @@
+import { documentTypeHasData, getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
 import { getBreadcrumb } from "../admin-backend/lnode/lnode.queries.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
@@ -5,12 +6,15 @@ import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
 export async function getPublicBreadcrumb(renderingContext, documentId) {
     const { siteContext } = renderingContext;
     const items = await getBreadcrumb(siteContext, renderingContext.tracker, documentId, {
-        ensurePublished: true,
+        ensurePublished: false,
         skipHome: false,
     });
     const result = [];
     for (const item of items) {
-        const url = await getUrlOfDocument(siteContext, renderingContext.tracker, item.documentId);
+        const documentType = getDocumentTypeByName(siteContext.siteSchema, item.typeName);
+        const url = documentTypeHasData(documentType) && item.documentId.nodeId !== documentId.nodeId
+            ? await getUrlOfDocument(siteContext, renderingContext.tracker, item.documentId)
+            : undefined;
         result.push({
             id: encodeLNodeId(item.documentId),
             url,

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

@@ -1 +1 @@
-{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAsB,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAsB,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,KAAK;QACtB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElF,MAAM,GAAG,GACP,mBAAmB,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YAC/E,CAAC,CAAC,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC;YAChF,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/rendering-payload/cluster-payloads.d.ts

@@ -0,0 +1,7 @@
+import { type RoutingCluster, type RoutingClusterNode } 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 * as publicPayload from "./rendering-payload.types.js";
+export declare function toTpClusterPayload(renderingContext: RenderingContext, language: string, cluster: RoutingCluster): DropInst<publicPayload.TpClusterPayload>;
+export declare function toTpRoutingClusterNode(renderingContext: RenderingContext, clusterNode: RoutingClusterNode, language: string): publicPayload.TpRoutingClusterNode;
+export declare function getClusterNodeOf(cluster: RoutingClusterNode, routingDocumentNodeId: string): RoutingClusterNode | undefined;