@paroicms/server 1.102.3 → 1.104.0

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

@@ -1,14 +1,10 @@
-import { mainDbSchemaName } from "@paroicms/connector";
 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 { 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

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

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

@@ -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;