@paroicms/server 1.85.0 → 1.85.1

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

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

package/dist/modules/public-site/public-route/make-url.d.ts

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

package/dist/modules/public-site/public-route/make-url.js

@@ -1,160 +0,0 @@
-import { dateVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { mainDbSchemaName } from "@paroicms/connector";
-import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
-import { makeCacheDependencyKey, makeCacheKey } from "../../../common/text-cache.js";
-import { getNodeDepth } from "../../core/node/node.queries.js";
-export async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
-    const cacheKey = makeCacheKey(siteContext.logger, { kind: "url", documentId });
-    const cacheValue = await siteContext.textCache.getCacheValue(cacheKey, tracker);
-    if (cacheValue) {
-        if (!options.returnUrlDependencyKeys)
-            return cacheValue.value;
-        return {
-            url: cacheValue.value,
-            dependencyKeys: await siteContext.textCache.getDependencyKeys(cacheKey, tracker),
-        };
-    }
-    let dependencyKeys;
-    let url;
-    const { nodeId, language } = documentId;
-    const depth = await getNodeDepth(siteContext, tracker, nodeId);
-    if (depth === 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);
-    }
-    await siteContext.textCache.setCacheValue({
-        cacheKey,
-        value: url,
-        dependencyKeys,
-    }, tracker);
-    return options.returnUrlDependencyKeys ? { url, dependencyKeys } : url;
-}
-function buildUrlQuery(siteContext, nodelId, depth) {
-    const { cn } = siteContext;
-    const { nodeId, language } = nodelId;
-    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(`PaNodel 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(`PaNodel 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: strVal(row[`id${cur}`]),
-            typeName: strVal(row[`typeName${cur}`]),
-            relativeId: strVal(row[`relativeId${cur}`]),
-            slug: strValOrUndef(row[`slug${cur}`]),
-            publishDate: dateVal(row[`publishDate${cur}`]),
-        });
-    }
-    return { depth, parts };
-}
-export function getHomeUrl(siteContext, language) {
-    return siteContext.siteSchema.isMultilingual ? `/${language}` : "/";
-}
-function makeDocumentUrl(siteContext, urlData, language) {
-    const { siteSchema } = siteContext;
-    const urlParts = siteSchema.isMultilingual ? [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}'`);
-        }
-        const docType = getDocumentTypeByName(siteSchema, part.typeName);
-        if (docType.documentKind === "routing") {
-            const part = docType.route?.[language];
-            if (!part) {
-                throw new Error(`missing urlPath['${language}'] in document type '${docType.typeName}'`);
-            }
-            urlParts.push(part);
-        }
-        else {
-            if (docType.route === ":relativeId-:slug") {
-                urlParts.push(makeRelativeIdSlugUrlPart(part));
-            }
-            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));
-            }
-            else {
-                throw new Error(`in '${docType.typeName}', unknown value for route: '${docType.route}'`);
-            }
-        }
-        parent = docType;
-    }
-    return `/${urlParts.join("/")}`;
-}
-function makeRelativeIdSlugUrlPart(part) {
-    return part.slug ? `${part.relativeId}-${part.slug}` : part.relativeId;
-}
-function makeUrlDependencyKeys(urlData, language) {
-    return Array.from(urlData.parts.values()).map((part) => makeCacheDependencyKey({
-        documentId: { language, nodeId: part.nodeId },
-        perimeter: "slug",
-    }));
-}
-//# sourceMappingURL=make-url.js.map

package/dist/modules/public-site/public-route/make-url.js.map

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

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

@@ -1,17 +0,0 @@
-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

@@ -1,176 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,4 +0,0 @@
-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

@@ -1,77 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,2 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,2 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

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

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

@@ -1,20 +0,0 @@
-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>;