@paroicms/server 1.84.0 → 1.85.0

package/dist/modules/public-site/public-route/public-route-parser.d.ts

@@ -0,0 +1,17 @@
+import type { ScRegularDocumentType, ScRoutingDocumentType } from "@paroicms/public-anywhere-lib";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
+export interface ParsedPublicRoute {
+    language: string;
+    routingDocuments: ScRoutingDocumentType[];
+    regularRelativeIds: RegularRelativeId[];
+    redirectTo: "parent" | undefined;
+    depth: number;
+    urlCacheKey: string;
+    urlParameters?: string;
+}
+export interface RegularRelativeId {
+    relativeId: string;
+    candidateTypes: ScRegularDocumentType[];
+}
+export declare function parsePublicRoute(siteContext: Pick<SiteContext, "siteSchema">, path: string): ParsedPublicRoute | undefined;
+export declare function findParentParsedRouteWithDocument(parsedRoute: ParsedPublicRoute): ParsedPublicRoute | undefined;

package/dist/modules/public-site/public-route/public-route-parser.js

@@ -0,0 +1,176 @@
+import { getRegularDocumentTypeByName, getRoutingDocumentTypeByName, } from "@paroicms/internal-anywhere-lib";
+export function parsePublicRoute(siteContext, path) {
+    const { siteSchema } = siteContext;
+    const { cleanedPath, urlParameters } = parseUrlParameters(path);
+    const tokens = cleanedPath
+        .split("/")
+        .slice(1)
+        .filter((token) => token.length > 0);
+    const language = siteSchema.isMultilingual ? tokens[0] : siteSchema.defaultLanguage;
+    const parts = siteSchema.isMultilingual ? tokens.slice(1) : tokens;
+    if (!language || !siteSchema.languages.includes(language))
+        return;
+    const urlCacheKey = [];
+    if (siteSchema.isMultilingual)
+        urlCacheKey.push(language);
+    let prev = siteSchema.nodeTypes.home;
+    const routingDocuments = [prev];
+    let depth = 0;
+    let i = 0;
+    for (; i < parts.length; ++i) {
+        const urlPath = parts[i];
+        const routingDocument = findRoutingDocumentByUrlPath({
+            siteSchema,
+            parent: prev,
+            urlPath,
+            language,
+        });
+        if (!routingDocument)
+            break;
+        routingDocuments.push(routingDocument);
+        urlCacheKey.push(urlPath);
+        ++depth;
+        prev = routingDocument;
+    }
+    let lastRedirectTo = prev.redirectTo;
+    let parentCandidates = [prev];
+    const regularRelativeIds = [];
+    while (i < parts.length) {
+        const found = findRegularRelativeIdByUrlPath({
+            siteSchema,
+            parentCandidates,
+            parts,
+            partsIndex: i,
+        });
+        if (!found)
+            return;
+        regularRelativeIds.push(found.regularRelativeId);
+        urlCacheKey.push(`regular:${found.regularRelativeId.relativeId}`);
+        ++depth;
+        parentCandidates = found.regularRelativeId.candidateTypes;
+        i += found.skipUrlParts;
+        lastRedirectTo = undefined;
+    }
+    return {
+        language,
+        routingDocuments,
+        regularRelativeIds,
+        redirectTo: lastRedirectTo,
+        depth,
+        urlCacheKey: urlCacheKey.join("/"),
+        urlParameters,
+    };
+}
+function parseUrlParameters(path) {
+    const result = path.match(/(^.+)(\?.*)$/);
+    if (result) {
+        return {
+            cleanedPath: result[1],
+            urlParameters: result[2],
+        };
+    }
+    return {
+        cleanedPath: path,
+        urlParameters: undefined,
+    };
+}
+function findRoutingDocumentByUrlPath({ siteSchema, parent, urlPath, language, }) {
+    for (const typeName of parent.routingChildren ?? []) {
+        const documentType = getRoutingDocumentTypeByName(siteSchema, typeName);
+        if (!documentType.route)
+            continue;
+        if (urlPath === documentType.route[language])
+            return documentType;
+    }
+}
+function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, partsIndex, }) {
+    const candidateTypes = parentCandidates
+        .reduce((childTypeNames, parent) => {
+        if (parent.regularChildren)
+            childTypeNames.push(...parent.regularChildren);
+        return childTypeNames;
+    }, [])
+        ?.map((typeName) => getRegularDocumentTypeByName(siteSchema, typeName));
+    if (!candidateTypes || candidateTypes.length === 0)
+        return;
+    const route = candidateTypes[0].route;
+    if (route === ":relativeId-:slug") {
+        const urlPath = parts[partsIndex];
+        const relativeId = parseRegularRelativeIdSlug(urlPath);
+        return {
+            regularRelativeId: { relativeId, candidateTypes },
+            skipUrlParts: 1,
+        };
+    }
+    if (route === ":yyyy/:mm/:dd/:relativeId-:slug") {
+        if (parts.length < partsIndex + 3 ||
+            !isYear(parts[partsIndex]) ||
+            !isMonth(parts[partsIndex + 1]) ||
+            !isDay(parts[partsIndex + 2])) {
+            return;
+        }
+        const urlPath = parts[partsIndex + 3];
+        const relativeId = parseRegularRelativeIdSlug(urlPath);
+        return {
+            regularRelativeId: { relativeId, candidateTypes },
+            skipUrlParts: 4,
+        };
+    }
+}
+function parseRegularRelativeIdSlug(urlPath) {
+    const index = urlPath.indexOf("-");
+    return index === -1 ? urlPath : urlPath.substring(0, index);
+}
+function isYear(s) {
+    return /[0-9]{4}/.test(s);
+}
+function isMonth(s) {
+    if (!/[0-9]{2}/.test(s))
+        return false;
+    const val = Number(s);
+    return val >= 1 && val <= 12;
+}
+function isDay(s) {
+    if (!/[0-9]{2}/.test(s))
+        return false;
+    const val = Number(s);
+    return val >= 1 && val <= 31;
+}
+export function findParentParsedRouteWithDocument(parsedRoute) {
+    let curRoute = parsedRoute;
+    while (true) {
+        curRoute = findParentParsedRoute(curRoute);
+        if (!curRoute)
+            break;
+        if (!curRoute.redirectTo)
+            return curRoute;
+    }
+}
+function findParentParsedRoute(parsedRoute) {
+    const routingDocuments = [...parsedRoute.routingDocuments];
+    const regularRelativeIds = [...parsedRoute.regularRelativeIds];
+    const urlCacheKey = parsedRoute.urlCacheKey.split("/");
+    if (regularRelativeIds.length > 0) {
+        regularRelativeIds.pop();
+        urlCacheKey.pop();
+    }
+    else if (routingDocuments.length > 0) {
+        routingDocuments.pop();
+        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;
+    return {
+        language: parsedRoute.language,
+        routingDocuments,
+        regularRelativeIds,
+        redirectTo,
+        depth: parsedRoute.depth - 1,
+        urlCacheKey: urlCacheKey.join("/"),
+    };
+}
+//# sourceMappingURL=public-route-parser.js.map

package/dist/modules/public-site/public-route/public-route-parser.js.map

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

package/dist/modules/public-site/public-route/raw-document-payload.d.ts

@@ -0,0 +1,4 @@
+import type { DocValues } from "../../../public-payload/public-payload.types.js";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
+import type { ParsedPublicRoute } from "./public-route-parser.js";
+export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPublicRoute): Promise<DocValues | undefined>;

package/dist/modules/public-site/public-route/raw-document-payload.js

@@ -0,0 +1,77 @@
+import { formatDocValues } from "../../../public-payload/doc-values.queries.js";
+export async function fetchRawDocPayload(siteContext, parsedRoute) {
+    const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
+    const rows = await query;
+    if (!rows || rows.length === 0)
+        return;
+    return formatDocValues(rows[0], {
+        language: parsedRoute.language,
+    });
+}
+function buildRawDocPayloadQuery(siteContext, parsedRoute) {
+    const { cn } = siteContext;
+    let query = cn("PaNode as l0")
+        .innerJoin("PaNodel as s0", {
+        "l0.id": "s0.nodeId",
+        "s0.language": cn.raw("?", [parsedRoute.language]),
+    })
+        .where("l0.depth", 0)
+        .where("l0.typeName", "home")
+        .whereRaw("l0.publishDate <= current_timestamp")
+        .where("s0.ready", 1);
+    let prev = 0;
+    for (const routingDocument of parsedRoute.routingDocuments.slice(1)) {
+        const cur = prev + 1;
+        const typeNameParam = routingDocument.typeName;
+        query = query
+            .innerJoin(`PaNode as l${cur}`, {
+            [`l${prev}.id`]: `l${cur}.parentId`,
+            [`l${cur}.typeName`]: cn.raw("?", [typeNameParam]),
+        })
+            .innerJoin(`PaNodel 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(`PaNodel 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;
+    }
+    query = query.select([
+        `l${prev}.typeName as typeName`,
+        `l${prev}.id as nodeId`,
+        `l${prev}.relativeId as relativeId`,
+        `l${prev}.publishDate as publishDate`,
+    ]);
+    if (!parsedRoute.redirectTo) {
+        query = query
+            .select([
+            "d.title as title",
+            "d.slug as slug",
+            "d.metaDescription as metaDescription",
+            "d.metaKeywords as metaKeywords",
+        ])
+            .innerJoin("PaDocument as d", {
+            [`l${prev}.id`]: "d.nodeId",
+            [`s${prev}.language`]: "d.language",
+        });
+    }
+    return query;
+}
+//# sourceMappingURL=raw-document-payload.js.map

package/dist/modules/public-site/public-route/raw-document-payload.js.map

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

package/dist/modules/public-site/public-site.controller.d.ts

@@ -0,0 +1,2 @@
+import type { Request, Response } from "express";
+export declare function indexController(req: Request, res: Response): Promise<void>;

package/dist/modules/public-site/public-site.controller.js

@@ -0,0 +1,27 @@
+import { createTracker } from "@paroicms/internal-server-lib";
+import { serveTextFromCacheOr } from "../../common/serve-text-or.js";
+import { makeCacheKey } from "../../common/text-cache.js";
+import { trackerReportToMessage } from "../../common/tracker-report.js";
+import { getReqSiteContext } from "../../express/http-helpers.js";
+import { renderLiquidTemplate } from "../../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
+import { createRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { makeDetachedPublicPayload } from "../../public-payload/make-public-payload.js";
+export async function indexController(req, res) {
+    const siteContext = getReqSiteContext(req);
+    const tracker = createTracker();
+    await serveIndexPage(siteContext, req, res, tracker);
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
+}
+async function serveIndexPage(siteContext, req, res, tracker) {
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: req.url });
+    const serveOr = serveTextFromCacheOr(siteContext, tracker, { cacheKey, req, res });
+    if (await serveOr.serveFromCache())
+        return;
+    const renderingContext = await createRenderingContext(siteContext, { cacheKey, tracker });
+    const html = await renderLiquidTemplate(siteContext, renderingContext, {
+        templateNames: ["index", "default"],
+        payload: makeDetachedPublicPayload(siteContext, renderingContext),
+    });
+    await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());
+}
+//# sourceMappingURL=public-site.controller.js.map

package/dist/modules/public-site/public-site.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AACtG,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrD,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}

package/dist/modules/public-site/public-site.middleware.d.ts

@@ -0,0 +1,2 @@
+import type { NextFunction, Request, Response } from "express";
+export declare function publicSiteMiddleware(req: Request, res: Response, next: NextFunction): Promise<void>;

package/dist/modules/public-site/public-site.middleware.js

@@ -0,0 +1,47 @@
+import { createTracker } from "@paroicms/internal-server-lib";
+import { render404Html, serveTextFromCacheOr } from "../../common/serve-text-or.js";
+import { makeCacheKey } from "../../common/text-cache.js";
+import { trackerReportToMessage } from "../../common/tracker-report.js";
+import { getReqSiteContext, serve301Redirect } from "../../express/http-helpers.js";
+import { parsePublicRoute } from "./public-route/public-route-parser.js";
+import { generateDocumentHtml } from "./serve-document/serve-document.js";
+export async function publicSiteMiddleware(req, res, next) {
+    const siteContext = getReqSiteContext(req);
+    const parsedRoute = parsePublicRoute(siteContext, req.url);
+    if (!parsedRoute) {
+        next();
+        return;
+    }
+    const tracker = createTracker();
+    await serveDocument(siteContext, req, res, parsedRoute, tracker);
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
+}
+async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: req.url });
+    const serveOr = serveTextFromCacheOr(siteContext, tracker, { cacheKey, req, res });
+    if (await serveOr.serveFromCache())
+        return;
+    const redirectCacheKey = makeCacheKey(siteContext.logger, {
+        kind: "redirect",
+        urlKey: parsedRoute.urlCacheKey,
+    });
+    const cacheRedirect = await siteContext.textCache.getCacheValue(redirectCacheKey, tracker);
+    if (cacheRedirect && cacheRedirect.value !== req.url) {
+        return serve301Redirect(res, cacheRedirect.value);
+    }
+    const generated = await generateDocumentHtml(siteContext, { req, parsedRoute, cacheKey }, tracker);
+    if (generated.status === 301) {
+        await siteContext.textCache.setCacheValue({
+            cacheKey: redirectCacheKey,
+            dependencyKeys: generated.dependencyKeys,
+            value: generated.url,
+        }, tracker);
+        return serve301Redirect(res, generated.url);
+    }
+    if (generated.status === 404) {
+        await render404Html(siteContext, res, { language: parsedRoute.language });
+        return;
+    }
+    await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
+}
+//# sourceMappingURL=public-site.middleware.js.map

package/dist/modules/public-site/public-site.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAA0B,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACxF,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,WAA8B,EAC9B,OAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE;QACxD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,WAAW,CAAC,WAAW;KAChC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3F,IAAI,aAAa,IAAI,aAAa,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,WAAW,EACX,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,EAC9B,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;YACE,QAAQ,EAAE,gBAAgB;YAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,KAAK,EAAE,SAAS,CAAC,GAAG;SACrB,EACD,OAAO,CACR,CAAC;QACF,OAAO,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7E,CAAC"}

package/dist/modules/public-site/serve-document/serve-document.d.ts

@@ -0,0 +1,20 @@
+import type { Tracker } from "@paroicms/internal-server-lib";
+import type { Request } from "express";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
+import { type ParsedPublicRoute } from "../public-route/public-route-parser.js";
+export type GeneratedDocumentHtml = {
+    status: 200;
+    html: string;
+    dependencyKeys: string[];
+} | {
+    status: 404;
+} | {
+    status: 301;
+    url: string;
+    dependencyKeys: string[];
+};
+export declare function generateDocumentHtml(siteContext: SiteContext, options: {
+    req: Request;
+    parsedRoute: ParsedPublicRoute;
+    cacheKey: string;
+}, tracker: Tracker): Promise<GeneratedDocumentHtml>;

package/dist/modules/public-site/serve-document/serve-document.js

@@ -0,0 +1,50 @@
+import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
+import { makeCacheDependencyKey } from "../../../common/text-cache.js";
+import { renderLiquidTemplate } from "../../../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
+import { createRenderingContext } from "../../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { makeRegularPublicPayload } from "../../../public-payload/make-public-payload.js";
+import { getUrlOfDocument } from "../public-route/make-url.js";
+import { findParentParsedRouteWithDocument, } from "../public-route/public-route-parser.js";
+import { fetchRawDocPayload } from "../public-route/raw-document-payload.js";
+export async function generateDocumentHtml(siteContext, options, tracker) {
+    const { req, parsedRoute, cacheKey } = options;
+    if (parsedRoute.redirectTo === "parent") {
+        const parentRoute = findParentParsedRouteWithDocument(parsedRoute);
+        const docValues = parentRoute ? await fetchRawDocPayload(siteContext, parentRoute) : undefined;
+        if (docValues && parentRoute) {
+            const { url, dependencyKeys } = await getUrlOfDocument(siteContext, tracker, {
+                language: parentRoute.language,
+                nodeId: docValues.nodeId,
+            }, { returnUrlDependencyKeys: true });
+            return { status: 301, url, dependencyKeys };
+        }
+        return { status: 404 };
+    }
+    const docValues = await fetchRawDocPayload(siteContext, parsedRoute);
+    if (!docValues)
+        return { status: 404 };
+    const { url: docUrl, dependencyKeys: urlDependencyKeys } = await getUrlOfDocument(siteContext, tracker, {
+        language: parsedRoute.language,
+        nodeId: docValues.nodeId,
+    }, { returnUrlDependencyKeys: true });
+    const completeDocUrl = `${docUrl}${parsedRoute.urlParameters ?? ""}`;
+    if (completeDocUrl !== req.url) {
+        return { status: 301, url: completeDocUrl, dependencyKeys: urlDependencyKeys };
+    }
+    const documentType = getDocumentTypeByName(siteContext.siteSchema, docValues.type);
+    const renderingContext = await createRenderingContext(siteContext, {
+        cacheKey,
+        tracker,
+        dependencyKey: makeCacheDependencyKey({ documentId: docValues }),
+    });
+    const html = await renderLiquidTemplate(siteContext, renderingContext, {
+        templateNames: [...documentType.templateNames, "default"],
+        payload: makeRegularPublicPayload(siteContext, renderingContext, docValues, docUrl),
+    });
+    return {
+        status: 200,
+        html,
+        dependencyKeys: renderingContext.getDependencyKeys(),
+    };
+}
+//# sourceMappingURL=serve-document.js.map

package/dist/modules/public-site/serve-document/serve-document.js.map

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

package/dist/public-api/partials/partials-params.dto.d.ts

@@ -0,0 +1,6 @@
+export declare class PartialsParamsInput {
+    templateName: string;
+    documentId: string;
+    offset: string;
+    limit: string;
+}

package/dist/public-api/partials/partials-params.dto.js

@@ -0,0 +1,41 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { IsDefined, IsNotEmpty, IsNumberString, IsString } from "class-validator";
+export class PartialsParamsInput {
+    templateName;
+    documentId;
+    offset;
+    limit;
+}
+__decorate([
+    IsString(),
+    IsNotEmpty(),
+    IsDefined(),
+    __metadata("design:type", String)
+], PartialsParamsInput.prototype, "templateName", void 0);
+__decorate([
+    IsString(),
+    IsNotEmpty(),
+    IsDefined(),
+    __metadata("design:type", String)
+], PartialsParamsInput.prototype, "documentId", void 0);
+__decorate([
+    IsNumberString(),
+    IsNotEmpty(),
+    IsDefined(),
+    __metadata("design:type", String)
+], PartialsParamsInput.prototype, "offset", void 0);
+__decorate([
+    IsNumberString(),
+    IsNotEmpty(),
+    IsDefined(),
+    __metadata("design:type", String)
+], PartialsParamsInput.prototype, "limit", void 0);
+//# sourceMappingURL=partials-params.dto.js.map

package/dist/public-api/partials/partials-params.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partials-params.dto.js","sourceRoot":"","sources":["../../../src/public-api/partials/partials-params.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAElF,MAAM,OAAO,mBAAmB;IAI9B,YAAY,CAAU;IAKtB,UAAU,CAAU;IAKpB,MAAM,CAAU;IAKhB,KAAK,CAAU;CAChB;AAhBC;IAHC,QAAQ,EAAE;IACV,UAAU,EAAE;IACZ,SAAS,EAAE;;yDACU;AAKtB;IAHC,QAAQ,EAAE;IACV,UAAU,EAAE;IACZ,SAAS,EAAE;;uDACQ;AAKpB;IAHC,cAAc,EAAE;IAChB,UAAU,EAAE;IACZ,SAAS,EAAE;;mDACI;AAKhB;IAHC,cAAc,EAAE;IAChB,UAAU,EAAE;IACZ,SAAS,EAAE;;kDACG"}

package/dist/public-api/password-reset/password-reset.dto.d.ts

@@ -0,0 +1,3 @@
+import type { CheckPasswordResetPayload, SetAccountPasswordPayload } from "./password-reset.service.js";
+export declare function formatSetAccountPasswordDto(data: unknown): SetAccountPasswordPayload;
+export declare function formatCheckPasswordResetDto(data: unknown): CheckPasswordResetPayload;

package/dist/public-api/password-reset/password-reset.dto.js

@@ -0,0 +1,29 @@
+import { objVal, strValOrUndef } from "@paroi/data-formatters-lib";
+import { ApiError } from "../../common/api-error-handler.js";
+export function formatSetAccountPasswordDto(data) {
+    const val = objVal(data);
+    const accountId = strValOrUndef(val.accountId);
+    const password = strValOrUndef(val.password);
+    const resetToken = strValOrUndef(val.resetToken);
+    if (!accountId || !password || !resetToken) {
+        throw new ApiError("Missing required parameters", { status: 400 });
+    }
+    return {
+        accountId,
+        password,
+        resetToken,
+    };
+}
+export function formatCheckPasswordResetDto(data) {
+    const val = objVal(data);
+    const accountId = strValOrUndef(val.accountId);
+    const resetToken = strValOrUndef(val.resetToken);
+    if (!accountId || !resetToken) {
+        throw new ApiError("Missing required parameters", { status: 400 });
+    }
+    return {
+        accountId,
+        resetToken,
+    };
+}
+//# sourceMappingURL=password-reset.dto.js.map

package/dist/public-api/password-reset/password-reset.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"password-reset.dto.js","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAM7D,MAAM,UAAU,2BAA2B,CAAC,IAAa;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,QAAQ,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO;QACL,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAAa;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,QAAQ,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO;QACL,SAAS;QACT,UAAU;KACX,CAAC;AACJ,CAAC"}

package/dist/public-api/search-text/search-text.dto.d.ts

@@ -0,0 +1,7 @@
+export declare class SearchTextOptionsInput {
+    language: string;
+    q: string;
+    limit: number;
+    start: number;
+    tpl: string;
+}

package/dist/public-api/search-text/search-text.dto.js

@@ -0,0 +1,46 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { IsDefined, IsNotEmpty, IsNumberString, IsString } from "class-validator";
+export class SearchTextOptionsInput {
+    language;
+    q;
+    limit;
+    start;
+    tpl;
+}
+__decorate([
+    IsNotEmpty(),
+    IsString(),
+    IsDefined(),
+    __metadata("design:type", String)
+], SearchTextOptionsInput.prototype, "language", void 0);
+__decorate([
+    IsNotEmpty(),
+    IsString(),
+    IsDefined(),
+    __metadata("design:type", String)
+], SearchTextOptionsInput.prototype, "q", void 0);
+__decorate([
+    IsNumberString(),
+    IsDefined(),
+    __metadata("design:type", Number)
+], SearchTextOptionsInput.prototype, "limit", void 0);
+__decorate([
+    IsNumberString(),
+    IsDefined(),
+    __metadata("design:type", Number)
+], SearchTextOptionsInput.prototype, "start", void 0);
+__decorate([
+    IsNotEmpty(),
+    IsString(),
+    IsDefined(),
+    __metadata("design:type", String)
+], SearchTextOptionsInput.prototype, "tpl", void 0);
+//# sourceMappingURL=search-text.dto.js.map

package/dist/public-api/search-text/search-text.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search-text.dto.js","sourceRoot":"","sources":["../../../src/public-api/search-text/search-text.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAElF,MAAM,OAAO,sBAAsB;IAIjC,QAAQ,CAAU;IAKlB,CAAC,CAAU;IAIX,KAAK,CAAU;IAIf,KAAK,CAAU;IAKf,GAAG,CAAU;CACd;AAnBC;IAHC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,SAAS,EAAE;;wDACM;AAKlB;IAHC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,SAAS,EAAE;;iDACD;AAIX;IAFC,cAAc,EAAE;IAChB,SAAS,EAAE;;qDACG;AAIf;IAFC,cAAc,EAAE;IAChB,SAAS,EAAE;;qDACG;AAKf;IAHC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,SAAS,EAAE;;mDACC"}

package/dist/public-api/search-text/search-text.queries.js

@@ -1,3 +1,4 @@
+import { nbVal } from "@paroi/data-formatters-lib";
 import { dbAnyLanguage } from "../../context.js";
 import { formatDocValues, querySelectDocValues } from "../../public-payload/doc-values.queries.js";
 export async function searchText(siteContext, options) {
@@ -27,11 +28,9 @@ export async function searchText(siteContext, options) {
             language,
             words,
             onlyPublished,
-        })
-            .distinct()
-            .count("* as count");
+        }).countDistinct("l.id as cnt");
         const countResult = await countQuery.first();
-        total = countResult ? countResult.count : 0;
+        total = countResult ? nbVal(countResult.cnt) : 0;
     }
     return {
         rows: rows.map((row) => formatDocValues(row, { language })),