npm - @paroicms/server - Versions diffs - 1.103.0 → 1.104.0 - Mend

@paroicms/server 1.103.0 → 1.104.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (129) hide show

package/dist/liquidjs-tools/liquidjs-drop.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Drop } from "liquidjs";
 import type { RenderingContext } from "./liquidjs-rendering/rendering-context.js";
-export declare const valuesSymbol: unique symbol;
+export declare const valuesFnSymbol: unique symbol;
 export declare const promiseSymbol: unique symbol;
 export type DropValues<T> = {
     [name in keyof T]: DropOrLiquidValue;
@@ -9,13 +9,13 @@ export type DropOrLiquidValue = DropInst<any> | LiquidValue | (() => Promise<Dro
 export type LiquidValue = PrimitiveLiquidValue | object | DropOrLiquidValue[];
 export type PrimitiveLiquidValue = string | number | boolean | undefined;
 export type DropInst<T> = Drop & {
-    [valuesSymbol]: DropValues<T>;
+    [valuesFnSymbol]: () => Promise<DropValues<T>>;
 };
-export declare function createLiquidDrop<T>({ renderingContext, renderingCacheKey, values, }: {
-    renderingContext: RenderingContext;
+export interface LiquidDropOptions<T> {
     renderingCacheKey: string;
     values: DropValues<T>;
-}): DropInst<T>;
+}
+export declare function createLiquidDrop<T>(renderingContext: RenderingContext, optionsOrFn: LiquidDropOptions<T> | (() => Promise<LiquidDropOptions<T>>)): DropInst<T>;
 export declare function loadOrFromRenderingCache<T>(renderingContext: RenderingContext, renderingCacheKey: string, load: () => Promise<T>): Promise<T>;
 export declare function createLiquidDropFromPromise<T>({ renderingContext, renderingCacheKey, value, }: {
     renderingContext: RenderingContext;

package/dist/liquidjs-tools/liquidjs-drop.js CHANGED Viewed

@@ -1,10 +1,23 @@
 import { Drop } from "liquidjs";
-export const valuesSymbol = Symbol("values");
+export const valuesFnSymbol = Symbol("values");
 export const promiseSymbol = Symbol("promise");
-export function createLiquidDrop({ renderingContext, renderingCacheKey, values, }) {
-    const { siteContext } = renderingContext;
+export function createLiquidDrop(renderingContext, optionsOrFn) {
     const drop = Object.create(Drop.prototype);
+    let options = typeof optionsOrFn === "function" ? undefined : optionsOrFn;
+    const initOptions = async () => {
+        if (typeof optionsOrFn !== "function")
+            return optionsOrFn;
+        if (!options) {
+            const resolvedOptions = await optionsOrFn();
+            options = resolvedOptions;
+        }
+        return options;
+    };
+    drop[valuesFnSymbol] = async () => (await initOptions()).values;
     drop.liquidMethodMissing = async (name) => {
+        const options = typeof optionsOrFn === "function" ? await initOptions() : optionsOrFn;
+        const { renderingCacheKey, values } = options;
+        const { siteContext } = renderingContext;
         const val = values[name];
         if (typeof val !== "function")
             return val;
@@ -16,7 +29,6 @@ export function createLiquidDrop({ renderingContext, renderingCacheKey, values,
             throw error;
         }
     };
-    drop[valuesSymbol] = values;
     return drop;
 }
 export async function loadOrFromRenderingCache(renderingContext, renderingCacheKey, load) {

package/dist/liquidjs-tools/liquidjs-drop.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"liquidjs-drop.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,MAAM,CAAC,MAAM,~~YAAY~~,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;~~AAC7C~~,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;~~AAmB~~/C,MAAM,UAAU,gBAAgB,~~CAAI~~,EAClC,~~gBAAgB~~,~~EAChB~~,~~iBAAiB~~,~~EACjB~~,MAAM,~~GAKP~~;~~IACC~~,MAAM,EAAE,WAAW,~~EAAE~~,~~GAAG~~,~~gBAAgB~~,CAAC;~~IACzC~~,MAAM,~~IAAI~~,GAAG,MAAM,CAAC,~~MAAM~~,CAAC,IAAI,CAAC,~~SAAS~~,CAAC,CAAC;~~IAC3C~~,IAAI,CAAC,mBAAmB,GAAG,KAAK,EAAE,IAAY,EAAgB,EAAE;QAC9D,MAAM,GAAG,GAAI,MAAc,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO,GAAG,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,iBAAiB,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,~~IAAI,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IAC5B,~~OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,gBAAkC,EAClC,iBAAyB,EACzB,IAAsB;IAEtB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,GAAQ,CAAC;IAE7C,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAI,EAC7C,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,GAKN;IACC,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,mBAAmB,GAAG,KAAK,EAAE,IAAY,EAAgB,EAAE;QAC9D,MAAM,GAAG,GAAI,CAAC,MAAM,KAAK,CAAS,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO,GAAG,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,iBAAiB,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"liquidjs-drop.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-drop.ts"],"names":[],"mappings":"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"}

package/dist/liquidjs-tools/liquidjs-utils.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import { type Obj } from "@paroicms/public-anywhere-lib";
 import type { Context } from "liquidjs";
 import type { RenderingContext } from "./liquidjs-rendering/rendering-context.js";
 export declare function extractRenderingContext(ctx: Context): RenderingContext;
-export declare function getLiquidDocValues(ctx: Context): Obj | undefined;

package/dist/liquidjs-tools/liquidjs-utils.js CHANGED Viewed

@@ -1,5 +1,3 @@
-import { isObj } from "@paroicms/public-anywhere-lib";
-import { valuesSymbol } from "./liquidjs-drop.js";
 import RenderTag from "./render-clone/render.js";
 export function extractRenderingContext(ctx) {
     const found = ctx.environments?.[RenderTag.passThroughSymbol];
@@ -7,9 +5,4 @@ export function extractRenderingContext(ctx) {
         throw new Error("missing rendering context");
     return found;
 }
-export function getLiquidDocValues(ctx) {
-    const doc = ctx.getSync(["doc"]);
-    const values = doc?.[valuesSymbol];
-    return isObj(values) ? values : undefined;
-}
 //# sourceMappingURL=liquidjs-utils.js.map

package/dist/liquidjs-tools/liquidjs-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"liquidjs-utils.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-utils.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,~~EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,~~SAAS,MAAM,0BAA0B,CAAC;AAEjD,MAAM,UAAU,uBAAuB,CAAC,GAAY;IAClD,MAAM,KAAK,GAAI,GAAG,CAAC,YAAoB,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IACvE,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAQ,CAAC;IACxC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC"}
1	+ {"version":3,"file":"liquidjs-utils.js","sourceRoot":"","sources":["../../src/liquidjs-tools/liquidjs-utils.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,MAAM,UAAU,uBAAuB,CAAC,GAAY;IAClD,MAAM,KAAK,GAAI,GAAG,CAAC,YAAoB,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IACvE,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/public-api/public-api-rendering.js CHANGED Viewed

@@ -2,7 +2,9 @@ import { type } from "arktype";
 import { serveTextFromCacheOr } from "../common/serve-text-or.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { trackerReportToMessage } from "../common/tracker-report.js";
+import { loadRoutingClusterFromNode } from "../connector/db-init/load-routing-cluster.queries.js";
 import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
+import { toTpClusterPayload } from "../rendering-payload/cluster-payloads.js";
 import { createDocPayloadDrop } from "../rendering-payload/create-doc-drop.js";
 import { getListOfDocValues } from "../rendering-payload/doc-values.queries.js";
 import { makeSitePayload } from "../rendering-payload/site-payload.js";
@@ -58,8 +60,10 @@ async function renderChildDocuments(renderingContext, options) {
     });
     const result = [];
     for (const row of docs) {
+        const cluster = await getClusterForDocument(renderingContext, row, parentDocumentId.language);
         const payload = {
             site: makeSitePayload(renderingContext, parentDocumentId.language),
+            cluster,
             doc: createDocPayloadDrop(renderingContext, row),
         };
         const html = await renderLiquidTemplate(renderingContext, {
@@ -79,8 +83,10 @@ async function searchAndRender(renderingContext, options) {
     const { rows, total } = await searchText(siteContext, { ...options, onlyPublished: true });
     const htmlList = [];
     for (const row of rows) {
+        const cluster = await getClusterForDocument(renderingContext, row, language);
         const payload = {
             site: makeSitePayload(renderingContext, language),
+            cluster,
             doc: createDocPayloadDrop(renderingContext, row),
         };
         const tName = templateName.endsWith(".public") ? templateName : `${templateName}.public`;
@@ -98,4 +104,11 @@ async function searchAndRender(renderingContext, options) {
         dependencyKeys: renderingContext.getDependencyKeys(),
     };
 }
+async function getClusterForDocument(renderingContext, document, language) {
+    const cluster = await loadRoutingClusterFromNode(renderingContext.siteContext, {
+        nodeId: document.nodeId,
+        typeName: document.type,
+    });
+    return toTpClusterPayload(renderingContext, language, cluster);
+}
 //# sourceMappingURL=public-api-rendering.js.map

package/dist/public-api/public-api-rendering.js.map CHANGED Viewed

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

package/dist/rendered-site/liquidjs-filters/head-tags-filter.d.ts CHANGED Viewed

@@ -2,5 +2,5 @@ import type { RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/r
 export declare const PLUGIN_HEAD_TAGS_PLACEHOLDER: string;
 export declare function injectHeadTagsLiquidFilter(rawDocValues: unknown, { renderingContext }: {
     renderingContext: RenderingContext;
-}): Promise<string> | "";
+}): Promise<string>;
 export declare function stylesheetLinkAsyncTagLiquidFilter(href: unknown): string;

package/dist/rendered-site/liquidjs-filters/head-tags-filter.js CHANGED Viewed

@@ -5,15 +5,19 @@ import { type } from "arktype";
 import { getHandleOfSiteField } from "../../common/media-handles.helpers.js";
 import { simpleI18n } from "../../context.js";
 import { makeFeedUrl } from "../../helpers/url-helpers.js";
-import { valuesSymbol } from "../../liquidjs-tools/liquidjs-drop.js";
+import { valuesFnSymbol } from "../../liquidjs-tools/liquidjs-drop.js";
 import { makeImageAvailableByHandle } from "../../rendering-payload/make-image-available.js";
 import { getSiteTitle } from "../feed/feed-generator.js";
 import { generateOpenGraphTags } from "./open-graph-filter.js";
 export const PLUGIN_HEAD_TAGS_PLACEHOLDER = `<!-- PAROICMS PLACEHOLDER ${makeSecret(12)} -->`;
-export function injectHeadTagsLiquidFilter(rawDocValues, { renderingContext }) {
+export async function injectHeadTagsLiquidFilter(rawDocValues, { renderingContext }) {
     if (!isObj(rawDocValues))
         return "";
-    const docValues = rawDocValues.kind === "detached" ? rawDocValues : rawDocValues[valuesSymbol];
+    const docValues = rawDocValues.kind === "detached"
+        ? rawDocValues
+        : valuesFnSymbol in rawDocValues && typeof rawDocValues[valuesFnSymbol] === "function"
+            ? await rawDocValues[valuesFnSymbol]()
+            : undefined;
     if (!isObj(docValues))
         return "";
     return generateHeadTags(renderingContext, docValues);

package/dist/rendered-site/liquidjs-filters/head-tags-filter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"head-tags-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/head-tags-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,~~YAAY~~,EAAE,MAAM,uCAAuC,CAAC;~~AAErE~~,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,CAAC,MAAM,4BAA4B,GAAG,6BAA6B,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC;AAE9F,MAAM,UAAU,0BAA0B,~~CACxC~~,YAAqB,EACrB,EAAE,gBAAgB,EAA0C;IAE5D,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,SAAS,GACb,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,~~CAAE~~,~~YAAoB~~,CAAC,YAAY,CAAC,CAAC;~~IACxF~~,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,OAAO,gBAAgB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,kBAAkB;IACtC,eAAe,EAAE,kBAAkB;IACnC,WAAW,EAAE,kBAAkB;IAC/B,WAAW,EAAE,kBAAkB;IAC/B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,KAAK,UAAU,gBAAgB,CAAC,gBAAkC,EAAE,SAAc;IAChF,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IAEzC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,GACzD,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAExC,MAAM,EAAE,GACN,OAAO,SAAS,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAE,SAAS,CAAC,EAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IAEzE,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAC9C,gBAAgB,EAChB,EAAE,MAAM,EAAE,oBAAoB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,EACvE,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,EAAE,CACzC,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAExC,IAAI,eAAe;QACjB,IAAI,CAAC,IAAI,CAAC,qCAAqC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,YAAY;QAAE,IAAI,CAAC,IAAI,CAAC,kCAAkC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC5F,IAAI,OAAO;QACT,IAAI,CAAC,IAAI,CAAC,0BAA0B,OAAO,CAAC,SAAS,WAAW,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/F,IAAI,EAAE,EAAE,CAAC;QACP,MAAM,QAAQ,GAAG,MAAM,EAAE,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC9E,IAAI,aAAa;YAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3F,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC;YAC3C,GAAG,EAAE,kBAAkB;YACvB,QAAQ;YACR,IAAI,EAAE,CAAC,SAAS,CAAC;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CACP,2DAA2D,UAAU,CACnE,eAAe,CAChB,WAAW,UAAU,CAAC,OAAO,CAAC,IAAI,CACpC,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACxC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,kCAAkC,CAAC,IAAa;IAC9D,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACjD,OAAO,0BAA0B,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC"}
1	+ {"version":3,"file":"head-tags-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/head-tags-filter.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-filters/info-filter.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { isObj } from "@paroicms/public-anywhere-lib";
 import { escapeHtml } from "@paroicms/public-server-lib";
-import { promiseSymbol, valuesSymbol } from "../../liquidjs-tools/liquidjs-drop.js";
+import { promiseSymbol, valuesFnSymbol } from "../../liquidjs-tools/liquidjs-drop.js";
 const ignoreDeprecatedKeys = new Set([
     "uid",
     "lang",
@@ -69,7 +69,9 @@ async function valueToInfo(rawVal, depth, options = {}) {
     if (val instanceof Date) {
         return `<i>${val.toISOString()}</i>`;
     }
-    const obj = valuesSymbol in val ? val[valuesSymbol] : val;
+    const obj = valuesFnSymbol in val && typeof val[valuesFnSymbol] === "function"
+        ? await val[valuesFnSymbol]()
+        : val;
     if (!isObj(obj)) {
         return `<i>invalid values "${typeof obj}"</i>`;
     }

package/dist/rendered-site/liquidjs-filters/info-filter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"info-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/info-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,~~YAAY~~,EAAE,MAAM,uCAAuC,CAAC;~~AAEpF~~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~~GAAG~~,~~YAAY~~,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,~~YAAY~~,CAAC,~~CAAC~~,CAAC,CAAC,GAAG,CAAC;~~IAC1D~~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"}
1	+ {"version":3,"file":"info-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/info-filter.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js CHANGED Viewed

@@ -8,8 +8,9 @@ export async function injectMenuItemsData(value, { renderingContext }) {
     const documentId = parseLNodeId(str);
     const breadcrumb = await getBreadcrumb(siteContext, renderingContext.tracker, documentId, {
         ensurePublished: false,
+        skipHome: true,
+        skipCurrent: true,
     });
-    breadcrumb.shift();
     const content = {
         id: encodeLNodeId(documentId),
         parents: breadcrumb.map((item) => encodeLNodeId(item.documentId)),

package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inject-menu-items-data.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/inject-menu-items-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAc,EACd,EAAE,gBAAgB,EAA0C;IAE5D,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACxF,eAAe,EAAE,KAAK;~~KACvB~~,~~CAAC~~,~~CAAC~~;~~IAEH~~,~~UAAU~~,~~CAAC~~,~~KAAK~~,~~EAAE~~,CAAC;~~IACnB~~,MAAM,OAAO,GAAG;QACd,EAAE,EAAE,aAAa,CAAC,UAAU,CAAC;QAC7B,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAClE,CAAC;IAIF,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC"}
1	+ {"version":3,"file":"inject-menu-items-data.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/inject-menu-items-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAc,EACd,EAAE,gBAAgB,EAA0C;IAE5D,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACxF,eAAe,EAAE,KAAK;QACtB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;QACd,EAAE,EAAE,aAAa,CAAC,UAAU,CAAC;QAC7B,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAClE,CAAC;IAIF,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC"}

package/dist/rendered-site/page-route/make-url.d.ts CHANGED Viewed

@@ -1,11 +1,14 @@
-import { type Tracker } from "@paroicms/internal-server-lib";
+import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
+export declare function getHomeUrl(siteContext: Pick<SiteContext, "siteSchema">, language: string): string;
 export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId): Promise<string>;
+export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId, options: {
+    returnUndef: true;
+}): Promise<string | undefined>;
 export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId, options: {
     returnUrlDependencyKeys: true;
 }): Promise<{
     url: string;
     dependencyKeys: string[];
 }>;
-export declare function getHomeUrl(siteContext: Pick<SiteContext, "siteSchema">, language: string): string;

package/dist/rendered-site/page-route/make-url.js CHANGED Viewed

@@ -1,14 +1,10 @@
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
-import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
-import { type } from "arktype";
-import { getNodeDepth } from "../../admin-backend/node/node.queries.js";
+import { getNodeAncestorsWithSlug, } from "../../admin-backend/node/node-cte.queries.js";
 import { makeCacheDependencyKey, makeCacheKey } from "../../common/text-cache.js";
-import { mainDbSchemaName } from "../../connector/db-init/db-constants.js";
 import { shouldPrefixWithLanguage } from "../../helpers/url-helpers.js";
-const NumberAT = type("number");
-const StringAT = type("string");
-const StringOrNullAT = type("string|null");
-const StringOrNumberOrDateAT = type("string|number|Date");
+export function getHomeUrl(siteContext, language) {
+    return shouldPrefixWithLanguage(siteContext.siteSchema, language) ? `/${language}` : "/";
+}
 export async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
     const cacheKey = makeCacheKey(siteContext.logger, { kind: "url", documentId });
     const cacheValue = await siteContext.textCache.getCacheValue(cacheKey, tracker);
@@ -20,24 +16,25 @@ export async function getUrlOfDocument(siteContext, tracker, documentId, options
             dependencyKeys: await siteContext.textCache.getDependencyKeys(cacheKey, tracker),
         };
     }
+    const ancestors = await getNodeAncestorsWithSlug(siteContext, tracker, documentId);
+    const publishedAncestors = ensureAncestorsArePublished(ancestors);
+    if (!publishedAncestors) {
+        if (options.returnUndef)
+            return;
+        throw new Error(`Document '${documentId.nodeId}:${documentId.language}' is not published yet`);
+    }
+    publishedAncestors.reverse();
+    publishedAncestors.shift();
+    const { language } = documentId;
     let dependencyKeys;
     let url;
-    const { nodeId, language } = documentId;
-    const depth = await getNodeDepth(siteContext, tracker, nodeId);
-    if (depth === 0) {
+    if (publishedAncestors.length === 0) {
         url = getHomeUrl(siteContext, language);
         dependencyKeys = [];
     }
     else {
-        const query = buildUrlQuery(siteContext, documentId, depth);
-        const rows = await query;
-        tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
-        if (!rows || rows.length === 0) {
-            throw new Error(`invalid url data for document "${language}:${nodeId}"`);
-        }
-        const urlData = formatUrlData(rows[0], depth);
-        url = makeDocumentUrl(siteContext, urlData, language);
-        dependencyKeys = makeUrlDependencyKeys(urlData, language);
+        url = makeDocumentUrl(siteContext, publishedAncestors, language);
+        dependencyKeys = makeUrlDependencyKeys(publishedAncestors, language);
     }
     await siteContext.textCache.setCacheValue({
         cacheKey,
@@ -46,105 +43,44 @@ export async function getUrlOfDocument(siteContext, tracker, documentId, options
     }, tracker);
     return options.returnUrlDependencyKeys ? { url, dependencyKeys } : url;
 }
-function buildUrlQuery(siteContext, lNodeId, depth) {
-    const { cn } = siteContext;
-    const { nodeId, language } = lNodeId;
-    let cur = depth;
-    let query = cn(`PaNode as l${cur}`)
-        .select([
-        `l${cur}.id as id${cur}`,
-        `l${cur}.typeName as typeName${cur}`,
-        `l${cur}.relativeId as relativeId${cur}`,
-        `l${cur}.publishDate as publishDate${cur}`,
-        `d${cur}.slug as slug${cur}`,
-    ])
-        .innerJoin(`PaLNode as s${cur}`, {
-        [`s${cur}.nodeId`]: `l${cur}.id`,
-        [`s${cur}.language`]: cn.raw("?", [language]),
-    })
-        .leftJoin(`PaDocument as d${cur}`, {
-        [`d${cur}.nodeId`]: `s${cur}.nodeId`,
-        [`d${cur}.language`]: `s${cur}.language`,
-    })
-        .where(`l${cur}.id`, nodeId)
-        .whereNotNull(`l${cur}.publishDate`);
-    let prev = cur;
-    while (prev > 1) {
-        cur = prev - 1;
-        query = query.select([
-            `l${prev}.id as id${prev}`,
-            `l${prev}.typeName as typeName${prev}`,
-            `l${prev}.relativeId as relativeId${prev}`,
-            `l${prev}.publishDate as publishDate${prev}`,
-            `d${prev}.slug as slug${prev}`,
-            `l${cur}.id as id${cur}`,
-            `l${cur}.typeName as typeName${cur}`,
-            `l${cur}.relativeId as relativeId${cur}`,
-            `l${cur}.publishDate as publishDate${cur}`,
-            `d${cur}.slug as slug${cur}`,
-        ]);
-        query = query
-            .innerJoin(`PaNode as l${cur}`, `l${cur}.id`, `l${prev}.parentId`)
-            .innerJoin(`PaLNode as s${cur}`, {
-            [`s${cur}.nodeId`]: `l${cur}.id`,
-            [`s${cur}.language`]: cn.raw("?", [language]),
-        })
-            .leftJoin(`PaDocument as d${cur}`, {
-            [`d${cur}.nodeId`]: `s${cur}.nodeId`,
-            [`d${cur}.language`]: `s${cur}.language`,
-        })
-            .whereNotNull(`l${cur}.publishDate`);
-        prev = cur;
-    }
-    query = query.where(`l${prev}.parentId`, siteContext.siteIds.homeIds.nodeId);
-    return query;
-}
-function formatUrlData(row, depth) {
-    const parts = new Map();
-    for (let cur = 1; cur <= depth; ++cur) {
-        parts.set(cur, {
-            nodeId: String(NumberAT.assert(row[`id${cur}`])),
-            typeName: StringAT.assert(row[`typeName${cur}`]),
-            relativeId: StringAT.assert(row[`relativeId${cur}`]),
-            slug: StringOrNullAT.assert(row[`slug${cur}`]) ?? undefined,
-            publishDate: parseSqliteDateTime(StringOrNumberOrDateAT.assert(row[`publishDate${cur}`])),
-        });
+function ensureAncestorsArePublished(ancestors) {
+    const now = Date.now();
+    for (const ancestor of ancestors) {
+        if (!ancestor.ready ||
+            ancestor.publishDate === undefined ||
+            ancestor.publishDate.getTime() > now) {
+            return;
+        }
     }
-    return { depth, parts };
+    return ancestors;
 }
-export function getHomeUrl(siteContext, language) {
-    return shouldPrefixWithLanguage(siteContext.siteSchema, language) ? `/${language}` : "/";
-}
-function makeDocumentUrl(siteContext, urlData, language) {
+function makeDocumentUrl(siteContext, ancestors, language) {
     const { siteSchema } = siteContext;
-    const urlParts = shouldPrefixWithLanguage(siteContext.siteSchema, language) ? [language] : [];
+    const urlSegments = shouldPrefixWithLanguage(siteContext.siteSchema, language) ? [language] : [];
     let parent = getDocumentTypeByName(siteSchema, "home");
-    for (let cur = 1; cur <= urlData.depth; ++cur) {
-        const part = urlData.parts.get(cur);
-        if (!part)
-            throw new Error(`missing url part for depth '${cur}'`);
-        if (!parent.regularChildren?.includes(part.typeName) &&
-            !parent.routingChildren?.includes(part.typeName)) {
-            throw new Error(`schema and database are not compatible, '${part.typeName}' should not be a child of '${parent.typeName}'`);
+    for (const ancestor of ancestors) {
+        if (!parent.regularChildren?.includes(ancestor.typeName) &&
+            !parent.routingChildren?.includes(ancestor.typeName)) {
+            throw new Error(`schema and database are not compatible, '${ancestor.typeName}' should not be a child of '${parent.typeName}'`);
         }
-        const docType = getDocumentTypeByName(siteSchema, part.typeName);
+        const docType = getDocumentTypeByName(siteSchema, ancestor.typeName);
         if (docType.documentKind === "routing") {
-            const part = docType.route?.[language];
-            if (!part) {
+            const routePart = docType.route?.[language];
+            if (!routePart) {
                 throw new Error(`missing urlPath['${language}'] in document type '${docType.typeName}'`);
             }
-            urlParts.push(part);
+            urlSegments.push(routePart);
         }
         else {
             if (docType.route === ":relativeId-:slug") {
-                urlParts.push(makeRelativeIdSlugUrlPart(part));
+                urlSegments.push(makeRelativeIdSlugUrlPart(ancestor));
             }
             else if (docType.route === ":yyyy/:mm/:dd/:relativeId-:slug") {
-                const { publishDate } = part;
-                urlParts.push(String(publishDate.getFullYear()).padStart(4, "0"));
-                urlParts.push(String(publishDate.getMonth() + 1).padStart(2, "0"));
-                urlParts.push(String(publishDate.getDate()).padStart(2, "0"));
-                urlParts.push(makeRelativeIdSlugUrlPart(part));
+                const { publishDate } = ancestor;
+                urlSegments.push(String(publishDate.getFullYear()).padStart(4, "0"));
+                urlSegments.push(String(publishDate.getMonth() + 1).padStart(2, "0"));
+                urlSegments.push(String(publishDate.getDate()).padStart(2, "0"));
+                urlSegments.push(makeRelativeIdSlugUrlPart(ancestor));
             }
             else {
                 throw new Error(`in '${docType.typeName}', unknown value for route: '${docType.route}'`);
@@ -152,15 +88,15 @@ function makeDocumentUrl(siteContext, urlData, language) {
         }
         parent = docType;
     }
-    return `/${urlParts.join("/")}`;
-}
-function makeRelativeIdSlugUrlPart(part) {
-    return part.slug ? `${part.relativeId}-${part.slug}` : part.relativeId;
+    return `/${urlSegments.join("/")}`;
 }
-function makeUrlDependencyKeys(urlData, language) {
-    return Array.from(urlData.parts.values()).map((part) => makeCacheDependencyKey({
+function makeUrlDependencyKeys(ancestors, language) {
+    return ancestors.map((part) => makeCacheDependencyKey({
         documentId: { language, nodeId: part.nodeId },
         perimeter: "slug",
     }));
 }
+function makeRelativeIdSlugUrlPart(part) {
+    return part.slug ? `${part.relativeId}-${part.slug}` : part.relativeId;
+}
 //# sourceMappingURL=make-url.js.map

package/dist/rendered-site/page-route/make-url.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;~~AACxE~~,OAAO,~~EAAE~~,~~mBAAmB~~,~~EAAgB~~,MAAM~~,+BAA+B~~,~~CAAC;AAElF~~,~~OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,~~CAAC;~~AAC/B~~,OAAO,EAAE,~~YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,~~sBAAsB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,~~gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,~~wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,MAAM,~~QAAQ~~,~~GAAG~~,~~IAAI,~~CAAC,~~QAAQ~~,~~CAAC~~,~~CAAC~~;~~AAChC~~,~~MAAM~~,~~QAAQ~~,~~GAAG~~,~~IAAI~~,CAAC,QAAQ,CAAC,CAAC~~;AAChC~~,~~MAAM~~,~~cAAc~~,~~GAAG,~~IAAI,~~CAAC~~,~~aAAa~~,CAAC,CAAC~~;AAC3C~~,~~MAAM~~,~~sBAAsB,~~GAAG,~~IAAI,~~CAAC,~~oBAAoB,~~CAAC~~,CAAC~~;~~AA0B1D~~,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,~~UAAiD~~,EAAE;~~IAEnD~~,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChF,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;YAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAC9D,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,KAAK;YACrB,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,~~IAAI~~,~~cAAwB~~,~~CAAC;IAC7B~~,~~IAAI~~,~~GAAW~~,CAAC~~;IAChB~~,~~MAAM~~,EAAE,~~MAAM~~,EAAE,~~QAAQ,EAAE,GAAG,~~UAAU,CAAC;~~IAExC~~,MAAM,~~KAAK~~,GAAG,~~MAAM~~,~~YAAY,~~CAAC,~~WAAW~~,~~EAAE,OAAO,EAAE,MAAM,~~CAAC,CAAC;~~IAC/D~~,IAAI,~~KAAK~~,~~KAAK~~,~~CAAC,~~EAAE,CAAC;~~QAChB~~,~~GAAG~~,~~GAAG~~,~~UAAU,~~CAAC,WAAW,~~EAAE,QAAQ,CAAC,CAAC~~;~~QACxC~~,~~cAAc~~,~~GAAG~~,~~EAAE~~,CAAC~~;IACtB~~,~~CAAC;SAAM~~,CAAC~~;QACN~~,MAAM,~~KAAK~~,~~GAAG~~,~~aAAa,~~CAAC,~~WAAW~~,~~EAAE~~,~~UAAU~~,~~EAAE,KAAK,~~CAAC,CAAC;~~QAC5D~~,~~MAAM~~,~~IAAI~~,~~GAAU~~,~~MAAM~~,~~KAAK,~~CAAC;~~QAChC~~,~~OAAO~~,CAAC,~~WAAW~~,CAAC,~~gBAAgB~~,EAAE,QAAQ,EAAE,~~MAAM~~,~~CAAC~~,CAAC;~~QACxD~~,IAAI,CAAC,IAAI,~~IAAI~~,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;~~YAC/B~~,~~MAAM~~,~~IAAI~~,~~KAAK~~,CAAC,~~kCAAkC~~,QAAQ,~~IAAI,MAAM,GAAG,~~CAAC,CAAC;~~QAC3E~~,~~CAAC;QAED~~,~~MAAM,OAAO,~~GAAG,~~aAAa~~,CAAC,~~IAAI,~~CAAC,CAAC~~,CAAC,EAAE,KAAK,CAAC,CAAC~~;~~QAC9C~~,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,~~OAAO~~,EAAE,QAAQ,CAAC,CAAC;~~QACtD~~,cAAc,GAAG,qBAAqB,CAAC,~~OAAO~~,EAAE,QAAQ,CAAC,CAAC;~~IAC5D~~,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;QACE,QAAQ;QACR,KAAK,EAAE,GAAG;QACV,cAAc;KACf,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;~~AAED~~,SAAS,~~aAAa~~,~~CAAC~~,~~WAAwB,EAAE,OAAsB,EAAE,KAAa~~;~~IACpF~~,MAAM,~~EAAE,EAAE,EAAE,~~GAAG,~~WAAW,CAAC;IAC3B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,~~GAAG,~~OAAO,CAAC;IAErC,~~IAAI,~~GAAG,GAAG,KAAK,~~CAAC~~;IAChB~~,~~IAAI,KAAK,~~GAAG,EAAE,CAAC~~,cAAc,GAAG,EAAE,CAAC~~;~~SAChC~~,MAAM,CAAC;QACN,IAAI,GAAG,YAAY,GAAG,EAAE;QACxB,IAAI,GAAG,wBAAwB,GAAG,EAAE;QACpC,IAAI,GAAG,4BAA4B,GAAG,EAAE;QACxC,IAAI,GAAG,8BAA8B,GAAG,EAAE;QAC1C,IAAI,GAAG,gBAAgB,GAAG,EAAE;KAC7B,CAAC;SACD,SAAS,CAAC,eAAe,GAAG,EAAE,EAAE;QAC/B,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK~~;QAChC~~,~~CAAC~~,~~IAAI,GAAG,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,~~QAAQ,~~CAAC,CAAC;KAC9C,CAAC;SACD,QAAQ,CAAC,kBAAkB,GAAG,EAAE,EAAE;QACjC,CAAC,~~IAAI,~~GAAG,~~SAAS,~~CAAC,~~EAAE,~~IAAI,GAAG,SAAS;QACpC,~~CAAC~~,IAAI,GAAG,WAAW,CAAC,EAAE,IAAI,GAAG,WAAW~~;~~KACzC~~,~~CAAC;SACD~~,~~KAAK,~~CAAC,~~IAAI~~,~~GAAG,KAAK,EAAE,MAAM,~~CAAC~~;SAC3B~~,~~YAAY,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC;IAEvC,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QAGf,~~KAAK~~,GAAG,KAAK,CAAC,MAAM,CAAC~~;~~YACnB~~,IAAI,IAAI,YAAY,IAAI,EAAE;YAC1B,IAAI,IAAI,wBAAwB,IAAI,EAAE;YACtC,IAAI,IAAI,4BAA4B,IAAI,EAAE;YAC1C,IAAI,IAAI,8BAA8B,IAAI,EAAE;YAC5C,IAAI,IAAI,gBAAgB,IAAI,EAAE;YAC9B,IAAI,GAAG,YAAY,GAAG,EAAE;YACxB,IAAI,GAAG,wBAAwB,GAAG,EAAE;YACpC,IAAI,GAAG,4BAA4B,GAAG,EAAE;YACxC,IAAI,GAAG,8BAA8B,GAAG,EAAE;YAC1C,IAAI,GAAG,gBAAgB,GAAG,EAAE;SAC7B,CAAC,CAAC;QAEH,KAAK,GAAG,KAAK;aACV,SAAS,CAAC,cAAc,GAAG,EAAE,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC;aACjE,SAAS,CAAC,eAAe,GAAG,EAAE,EAAE;YAC/B,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK;YAChC,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,~~CAAC;SAC9C,CAAC;aACD,QAAQ,CAAC,kBAAkB,GAAG,EAAE,EAAE;YACjC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS;YACpC,CAAC,IAAI,GAAG,~~WAAW,~~CAAC,EAAE,IAAI,GAAG,WAAW;SACzC,CAAC;aACD,YAAY,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC;QAEvC,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,~~KAAK,~~GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7E,OAAO,KAAK,CAAC;AACf,CAAC;AAED,~~SAAS~~,aAAa,CAAC,GAAQ,EAAE,KAAa~~;~~IAC5C~~,~~MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QACtC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,~~QAAQ,CAAC,~~MAAM,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC;YAChD,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,~~WAAW,~~GAAG,EAAE,~~CAAC,~~CAAC;YAChD~~,~~UAAU,~~EAAE,~~QAAQ,CAAC,MAAM,CAAC,~~GAAG,~~CAAC,aAAa,~~GAAG,~~EAAE~~,CAAC~~,CAAC~~;~~YACpD~~,~~IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,~~OAAO~~,GAAG,EAAE,CAAC,CAAC,IAAI,SAAS~~;~~YAC3D~~,~~WAAW,EAAE,mBAAmB,~~CAAC~~,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC~~;~~SAC1F~~,CAAC~~,CAAC~~;~~IACL,CAAC;~~IACD,OAAO,~~EAAE~~,~~KAAK,EAAE,KAAK,EAAE,~~CAAC;~~AAC1B~~,CAAC;AAED,~~MAAM,UAAU,UAAU,CAAC,WAA4C,EAAE,QAAgB;IACvF,OAAO,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AAC3F,CAAC;AAED,~~SAAS,eAAe,CACtB,WAA4C,EAC5C,~~OAAgB~~,~~EAChB~~,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,~~QAAQ~~,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~IAC9F~~,IAAI,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,~~IAAI~~,~~GAAG~~,~~GAAG,CAAC,EAAE,GAAG,~~IAAI,~~OAAO~~,~~CAAC,KAAK,~~EAAE,~~EAAE,GAAG,EAAE,~~CAAC;~~QAC9C~~,~~MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;QAClE,~~IACE,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,~~IAAI~~,CAAC,QAAQ,CAAC;~~YAChD~~,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,~~IAAI~~,CAAC,QAAQ,CAAC,~~EAChD~~,CAAC;YACD,MAAM,IAAI,KAAK,CACb,4CAA4C,~~IAAI~~,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,~~CAC3G~~,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,~~IAAI~~,CAAC,QAAQ,CAAC,CAAC;~~QAEjE~~,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,~~IAAI~~,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;~~YACvC~~,IAAI,CAAC,~~IAAI~~,EAAE,CAAC;~~gBACV~~,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,~~QAAQ~~,CAAC,IAAI,CAAC,~~IAAI~~,CAAC,CAAC;~~QACtB~~,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,~~QAAQ~~,CAAC,IAAI,CAAC,yBAAyB,CAAC,~~IAAI~~,CAAC,CAAC,CAAC;~~YACjD~~,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,~~IAAI~~,CAAC;~~gBAE7B~~,~~QAAQ~~,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;~~gBAClE~~,~~QAAQ~~,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;~~gBACnE~~,~~QAAQ~~,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;~~gBAC9D~~,~~QAAQ~~,CAAC,IAAI,CAAC,yBAAyB,CAAC,~~IAAI~~,CAAC,CAAC,CAAC;~~YACjD~~,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,CAAC,QAAQ,gCAAgC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QAED,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,~~QAAQ~~,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;~~AAClC~~,CAAC;AAED,SAAS,~~yBAAyB~~,CAAC,~~IAAiB~~;~~IAClD~~,OAAO,~~IAAI~~,CAAC,~~IAAI~~,CAAC,CAAC,~~CAAC~~,~~GAAG~~,~~IAAI~~,CAAC,UAAU,~~IAAI~~,IAAI,CAAC,~~IAAI~~,EAAE,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~IAAI,~~CAAC,~~UAAU~~,CAAC;~~AACzE~~,CAAC;AAED,SAAS,~~qBAAqB~~,CAAC,~~OAAgB,EAAE,QAAgB~~;~~IAC/D~~,OAAO,~~KAAK~~,CAAC,IAAI,CAAC,~~OAAO,~~CAAC,~~KAAK,~~CAAC,~~MAAM~~,~~EAAE~~,CAAC,~~CAAC~~,~~GAAG~~,~~CAAC~~,CAAC,IAAI,EAAE,~~EAAE~~,~~CACrD~~,~~sBAAsB,~~CAAC~~;QACrB~~,~~UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,~~IAAI,CAAC,~~MAAM~~,~~EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,~~CAAC~~,CACH,CAAC~~;~~AACJ~~,CAAC"}
1	+ {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EACL,wBAAwB,GAEzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,MAAM,UAAU,UAAU,CAAC,WAA4C,EAAE,QAAgB;IACvF,OAAO,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AAC3F,CAAC;AAmBD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,UAAwE,EAAE;IAE1E,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChF,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;YAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAC9D,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,KAAK;YACrB,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAEnF,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAClE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,IAAI,OAAO,CAAC,WAAW;YAAE,OAAO;QAChC,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,QAAQ,wBAAwB,CAAC,CAAC;IACjG,CAAC;IAED,kBAAkB,CAAC,OAAO,EAAE,CAAC;IAC7B,kBAAkB,CAAC,KAAK,EAAE,CAAC;IAE3B,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAChC,IAAI,cAAwB,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxC,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QACjE,cAAc,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;QACE,QAAQ;QACR,KAAK,EAAE,GAAG;QACV,cAAc;KACf,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAID,SAAS,2BAA2B,CAClC,SAAiC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,QAAQ,CAAC,KAAK;YACf,QAAQ,CAAC,WAAW,KAAK,SAAS;YAClC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,EACpC,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC;IACD,OAAO,SAAwC,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CACtB,WAA4C,EAC5C,SAAsC,EACtC,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,WAAW,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpD,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACpD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,4CAA4C,QAAQ,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC/G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAErE,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;gBAEjC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACrE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACtE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACjE,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,CAAC,QAAQ,gCAAgC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QAED,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiC,EAAE,QAAgB;IAChF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5B,sBAAsB,CAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAA0B;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC"}

package/dist/rendered-site/page-route/page-route-parser.d.ts CHANGED Viewed

@@ -2,16 +2,21 @@ import type { ScRegularDocumentType, ScRoutingDocumentType } from "@paroicms/pub
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface ParsedPageRoute {
     language: string;
-    routingDocuments: ScRoutingDocumentType[];
-    regularRelativeIds: RegularRelativeId[];
     redirectTo: "parent" | undefined;
-    depth: number;
-    urlCacheKey: string;
     frontendAppPath?: string;
+    urlCacheKey: string;
+    documentHierarchy: DocumentHierarchyEntry[];
+}
+export type DocumentHierarchyEntry = RoutingDocumentHierarchyEntry | RegularDocumentHierarchyEntry;
+export interface RoutingDocumentHierarchyEntry {
+    entryKind: "routing";
+    documentType: ScRoutingDocumentType;
 }
-export interface RegularRelativeId {
+export interface RegularDocumentHierarchyEntry {
+    entryKind: "regular";
     relativeId: string;
     candidateTypes: ScRegularDocumentType[];
+    isClusterRoot: boolean;
 }
 export declare function parsePageRoute(siteContext: Pick<SiteContext, "siteSchema">, urlPath: string): ParsedPageRoute | undefined;
 export declare function findParentParsedRouteWithDocument(parsedRoute: ParsedPageRoute): ParsedPageRoute | undefined;