@paroicms/server 4.6.3 → 5.0.0

package/dist/rendered-site/site-router.req-handler.js

@@ -2,12 +2,16 @@ 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 { serve301Redirect } from "../express/http-helpers.js";
-import { parsePageRoute } from "./page-route/page-route-parser.js";
-import { generateDocumentHtml } from "./serve-document/serve-document.js";
+import { serve301Redirect, serveTextContent } from "../express/http-helpers.js";
+import { escapePathForSubstitution, joinUrlPath, pickDeclaredUrlQuery, pickDeclaredUrlQueryObject, } from "../helpers/url-helpers.js";
+import { parsePageRoute, } from "./page-route/page-route-parser.js";
+import { generateDocumentHtml, spaCanonicalPathPlaceholder, } from "./serve-document/serve-document.js";
 import { serveMultilingualIndexPage } from "./serve-index-page.js";
+const maxCachedQueryVariantsPerDocument = 50;
 export async function siteRouterReqHandler(siteContext, httpContext) {
     const { req } = httpContext;
+    if (!["GET", "HEAD"].includes(req.method))
+        return false;
     if (req.path === "/" && siteContext.siteSchema.languageRoutingMode === "prefixAll") {
         const tracker = createTracker();
         await serveMultilingualIndexPage(siteContext, httpContext, tracker);
@@ -24,13 +28,19 @@ export async function siteRouterReqHandler(siteContext, httpContext) {
 }
 async function serveDocument(siteContext, httpContext, parsedRoute, tracker) {
     const { req } = httpContext;
-    const cacheKeyWithQuery = makeCacheKey(siteContext.logger, {
-        kind: "html",
-        url: req.relativeUrl,
-    });
-    const cacheKeyWithPath = makeCacheKey(siteContext.logger, { kind: "html", url: req.path });
+    const rawQuery = extractRawUrlQuery(req.relativeUrl);
+    const querySuffix = rawQuery.length > 0 ? `?${rawQuery}` : "";
+    const canonicalPath = joinUrlPath(parsedRoute.documentPath, parsedRoute.spaPath);
+    if (canonicalPath !== req.path) {
+        return serve301Redirect(httpContext, `${canonicalPath}${querySuffix}`);
+    }
+    const declaredNames = declaredUrlQueryNamesOf(parsedRoute.documentHierarchy[parsedRoute.documentHierarchy.length - 1]);
+    const { cacheKeyWithPath, cacheKeyWithQuery } = makeHtmlCacheKeys(siteContext, parsedRoute.documentPath, pickDeclaredUrlQuery(rawQuery, declaredNames));
+    const transform = parsedRoute.spaPath === undefined ? undefined : makeSpaSubstitution(canonicalPath);
+    const lookupKey = cacheKeyWithQuery ?? cacheKeyWithPath;
     const serveOr = serveTextFromCacheOr(siteContext, httpContext, tracker, {
-        cacheKey: [cacheKeyWithQuery, cacheKeyWithPath],
+        cacheKey: lookupKey,
+        transform,
     });
     if (await serveOr.serveFromCache())
         return;
@@ -39,22 +49,67 @@ async function serveDocument(siteContext, httpContext, parsedRoute, tracker) {
         urlKey: parsedRoute.urlCacheKey,
     });
     const cacheRedirect = await siteContext.textCache.getCacheValue(redirectCacheKey, tracker);
-    if (cacheRedirect && cacheRedirect.value !== req.relativeUrl) {
-        return serve301Redirect(httpContext, cacheRedirect.value);
+    if (cacheRedirect && cacheRedirect.value !== parsedRoute.documentPath) {
+        const redirectTo = joinUrlPath(cacheRedirect.value, parsedRoute.spaPath);
+        return serve301Redirect(httpContext, `${redirectTo}${querySuffix}`);
     }
-    const generated = await generateDocumentHtml(siteContext, httpContext, { parsedRoute, cacheKeyWithQuery, cacheKeyWithPath }, tracker);
+    const skipCache = cacheKeyWithQuery !== undefined &&
+        (await siteContext.textCache.countCacheValues(`${cacheKeyWithPath}?`, tracker)) >=
+            maxCachedQueryVariantsPerDocument;
+    const cacheKey = skipCache ? `${cacheKeyWithPath}?overflow` : lookupKey;
+    const generated = await generateDocumentHtml(siteContext, {
+        parsedRoute,
+        cacheKey,
+        urlQuery: pickDeclaredUrlQueryObject(req.query, declaredNames),
+    }, tracker);
     if (generated.status === 301) {
         await siteContext.textCache.setCacheValue({
             cacheKey: redirectCacheKey,
             dependencyKeys: generated.dependencyKeys,
-            value: generated.url,
+            value: generated.path,
         }, tracker);
-        return serve301Redirect(httpContext, generated.url);
+        const redirectTo = joinUrlPath(generated.path, parsedRoute.spaPath);
+        return serve301Redirect(httpContext, `${redirectTo}${querySuffix}`);
     }
     if (generated.status === 404) {
         await render404Html(siteContext, httpContext, { language: parsedRoute.language });
         return;
     }
-    await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys, generated.cacheKey);
+    if (skipCache) {
+        serveTextContent(httpContext, {
+            text: transform ? transform(generated.html) : generated.html,
+        });
+        return;
+    }
+    await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
+}
+function extractRawUrlQuery(relativeUrl) {
+    const result = relativeUrl.match(/\?(.*)$/);
+    return result ? result[1] : "";
+}
+function declaredUrlQueryNamesOf(entry) {
+    if (entry.entryKind === "routing")
+        return entry.documentType.useUrlQuery ?? [];
+    const names = new Set();
+    for (const candidateType of entry.candidateTypes) {
+        for (const name of candidateType.useUrlQuery ?? [])
+            names.add(name);
+    }
+    return [...names];
+}
+function makeHtmlCacheKeys(siteContext, documentPath, declaredQuery) {
+    return {
+        cacheKeyWithPath: makeCacheKey(siteContext.logger, { kind: "html", url: documentPath }),
+        cacheKeyWithQuery: declaredQuery.length === 0
+            ? undefined
+            : makeCacheKey(siteContext.logger, {
+                kind: "html",
+                url: `${documentPath}?${declaredQuery}`,
+            }),
+    };
+}
+function makeSpaSubstitution(canonicalPath) {
+    const escapedPath = escapePathForSubstitution(canonicalPath);
+    return (html) => html.replaceAll(spaCanonicalPathPlaceholder, () => escapedPath);
 }
 //# sourceMappingURL=site-router.req-handler.js.map

package/dist/rendered-site/site-router.req-handler.js.map

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

package/dist/rendering-payload/create-doc-drop.d.ts

@@ -1,14 +1,16 @@
 import type { Obj } from "@paroicms/public-anywhere-lib";
 import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
-import type { LiquidPayload, PaUrlQuery, TpDocPayload, TpDocValues } from "@paroicms/public-server-lib";
+import type { LiquidPayload, PaUrlQuery, TpDocPayload, TpDocValues, TpFieldValues } from "@paroicms/public-server-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 export declare function createDocPayloadDrop(renderingContext: RenderingContext, docValuesOrFn: TpDocValues | (() => Promise<TpDocValues>), options: {
     documentId: ParsedLNodeId;
     url?: string;
+    urlDependencyKeys?: string[];
+    preloadedFieldValues?: LiquidPayload<TpFieldValues>;
     fieldNames?: string[];
     kind?: "routingDocument" | "regularDocument" | "term";
     extraValues?: Obj;
     urlQuery?: PaUrlQuery;
-    frontendAppPath?: string;
+    canonicalUrl?: string;
 }): LiquidPayload<TpDocPayload>;
 //# sourceMappingURL=create-doc-drop.d.ts.map

package/dist/rendering-payload/create-doc-drop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-doc-drop.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,aAAa,EAEb,UAAU,EACV,YAAY,EACZ,WAAW,EAGZ,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AA2BlG,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,EACzD,OAAO,EAAE;IACP,UAAU,EAAE,aAAa,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,MAAM,CAAC;IACtD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,aAAa,CAAC,YAAY,CAAC,CAmG7B"}
+{"version":3,"file":"create-doc-drop.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,aAAa,EAEb,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EAGd,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AA2BlG,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,EACzD,OAAO,EAAE;IACP,UAAU,EAAE,aAAa,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAIpD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,MAAM,CAAC;IACtD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACA,aAAa,CAAC,YAAY,CAAC,CA4G7B"}

package/dist/rendering-payload/create-doc-drop.js

@@ -39,7 +39,11 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
             typeName: docValues.type,
         });
         renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
+        if (options.urlDependencyKeys) {
+            renderingContext.addDependencyKey(...options.urlDependencyKeys);
+        }
         const id = encodeLNodeId(docValues);
+        const loadUrl = () => loadOrFromRenderingCache(renderingContext, `url:${id}`, () => loadUrlOfDocument(renderingContext, docValues));
         return {
             renderingCacheKey: `doc:${id}:${options.fieldNames?.join(",") ?? "full"}`,
             values: {
@@ -48,7 +52,8 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
                 id,
                 ...docValues,
                 languageLabel: siteContext.siteSchema.languageLabels[docValues.language],
-                url: options.url ?? (() => loadUrlOfDocument(renderingContext, docValues)),
+                url: options.url ?? loadUrl,
+                canonicalUrl: options.canonicalUrl ?? options.url ?? loadUrl,
                 excerpt: () => loadExcerpt(siteContext, renderingContext.tracker, {
                     lNodeId: docValues,
                     fieldTypes: documentType.fields ?? [],
@@ -70,11 +75,12 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
                     });
                     return image ? toTpSourceMedia(renderingContext, image) : undefined;
                 },
-                field: () => loadPublicFieldValues(renderingContext, {
-                    typeName: docValues.type,
-                    lNodeId: docValues,
-                    fieldNames: options.fieldNames,
-                }),
+                field: options.preloadedFieldValues ??
+                    (() => loadPublicFieldValues(renderingContext, {
+                        typeName: docValues.type,
+                        lNodeId: docValues,
+                        fieldNames: options.fieldNames,
+                    })),
                 translations: () => loadTranslationsAsDrops(renderingContext, docValues),
                 og: () => makeOgValuesPayload(renderingContext, documentType, docValues, options),
                 jsonLd: () => makeJsonLdPayload(renderingContext, documentType, docValues, options),
@@ -83,7 +89,6 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
                 siblings: () => getSiblingDocuments(renderingContext, docValues),
                 typeLabel: typeLabel,
                 urlQuery: options.urlQuery,
-                frontendAppPath: options.frontendAppPath,
                 routing: async () => {
                     if (documentType.documentKind !== "routing")
                         return;
@@ -156,7 +161,8 @@ async function makeOgValuesPayload(renderingContext, documentType, docValues, op
         lNodeId: docValues,
         fieldTypes: documentType.fields ?? [],
     }));
-    const url = options.url ??
+    const url = options.canonicalUrl ??
+        options.url ??
         (await loadOrFromRenderingCache(renderingContext, `url:${encodeLNodeId(docValues)}`, () => loadUrlOfDocument(renderingContext, docValues)));
     const featuredImageId = await loadOrFromRenderingCache(renderingContext, `featuredImage:${encodeLNodeId(docValues)}`, async () => (await getFeaturedImageOf(renderingContext, {
         nodeId: docValues.nodeId,

package/dist/rendering-payload/create-doc-drop.js.map

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

package/dist/rendering-payload/field-values.d.ts

@@ -6,4 +6,9 @@ export declare function loadPublicFieldValues(renderingContext: RenderingContext
     lNodeId: ParsedLNodeId;
     fieldNames?: string[];
 }): Promise<LiquidPayload<TpFieldValues>>;
+export declare function loadPublicFieldValuesForDocuments(renderingContext: RenderingContext, documents: {
+    type: string;
+    nodeId: string;
+    language: string;
+}[], fieldNames: string[]): Promise<Map<string, LiquidPayload<TpFieldValues>>>;
 //# sourceMappingURL=field-values.d.ts.map

package/dist/rendering-payload/field-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-values.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,aAAa,EAMnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,6BAA6B,CAAC;AAUhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAKlG,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,aAAa,CAAC;IAIvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,GACA,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CA+CvC"}
+{"version":3,"file":"field-values.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,aAAa,EAOnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,6BAA6B,CAAC;AAahG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAKlG,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,aAAa,CAAC;IAIvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,GACA,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAmBvC;AAED,wBAAsB,iCAAiC,CACrD,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,EAC/D,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAgCpD"}

package/dist/rendering-payload/field-values.js

@@ -1,7 +1,7 @@
 import { getNodeTypeByName, getPartTypeByName } from "@paroicms/internal-anywhere-lib";
 import { encodeLNodeId, isJsonFieldValue, isMediaHandleValue, isPartFieldValue, isReadLabelingValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
 import { getHandleOfFieldOnNode, } from "@paroicms/public-server-lib";
-import { loadFieldValues } from "../admin-backend/fields/load-fields.queries.js";
+import { loadFieldValues, loadFieldValuesForLNodes, } from "../admin-backend/fields/load-fields.queries.js";
 import { toTpSourceMedia } from "../common/medias/to-media-values.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { getNodeTypeLabel } from "../helpers/label-translator.helper.js";
@@ -22,6 +22,43 @@ export async function loadPublicFieldValues(renderingContext, options) {
         language: options.lNodeId.language,
         publishedOnly: true,
     });
+    return await makePublicFieldValuesPayload(renderingContext, {
+        lNodeId: options.lNodeId,
+        fieldNames: options.fieldNames,
+        fieldTypes,
+        rawValues,
+    });
+}
+export async function loadPublicFieldValuesForDocuments(renderingContext, documents, fieldNames) {
+    const { siteContext } = renderingContext;
+    const result = new Map();
+    const documentsByType = Map.groupBy(documents, (document) => document.type);
+    for (const [typeName, typedDocuments] of documentsByType) {
+        const allFieldTypes = getNodeTypeByName(siteContext.siteSchema, typeName).fields ?? [];
+        const fieldTypes = allFieldTypes.filter((field) => fieldNames.includes(field.name));
+        const lNodeIds = typedDocuments.map(({ nodeId, language }) => ({ nodeId, language }));
+        const rawValuesById = await loadFieldValuesForLNodes(siteContext, {
+            fieldTypes,
+            lNodeIds,
+            publishedOnly: true,
+        });
+        for (const lNodeId of lNodeIds) {
+            const encodedId = encodeLNodeId(lNodeId);
+            const rawValues = rawValuesById.get(encodedId);
+            if (!rawValues)
+                throw new Error(`Missing preloaded field values for '${encodedId}'`);
+            result.set(encodedId, await makePublicFieldValuesPayload(renderingContext, {
+                lNodeId,
+                fieldNames,
+                fieldTypes,
+                rawValues,
+            }));
+        }
+    }
+    return result;
+}
+async function makePublicFieldValuesPayload(renderingContext, options) {
+    const { fieldTypes, rawValues } = options;
     const values = await executeRenderingHook(renderingContext, "fieldPreprocessor", {
         fieldTypes,
         values: rawValues,

package/dist/rendering-payload/field-values.js.map

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

package/dist/rendering-payload/json-ld-payload.d.ts

@@ -3,5 +3,6 @@ import type { TpDocValues, TpJsonLdPayload } from "@paroicms/public-server-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 export declare function makeJsonLdPayload(renderingContext: RenderingContext, documentType: ScDocumentType, docValues: TpDocValues, options: {
     url?: string;
+    canonicalUrl?: string;
 }): Promise<TpJsonLdPayload>;
 //# sourceMappingURL=json-ld-payload.d.ts.map

package/dist/rendering-payload/json-ld-payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-ld-payload.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/json-ld-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC7F,OAAO,KAAK,EAEV,WAAW,EACX,eAAe,EAEhB,MAAM,6BAA6B,CAAC;AAOrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAYlG,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,cAAc,EAC5B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GACxB,OAAO,CAAC,eAAe,CAAC,CA8K1B"}
+{"version":3,"file":"json-ld-payload.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/json-ld-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC7F,OAAO,KAAK,EAEV,WAAW,EACX,eAAe,EAEhB,MAAM,6BAA6B,CAAC;AAOrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAYlG,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,cAAc,EAC5B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,eAAe,CAAC,CA+K1B"}

package/dist/rendering-payload/json-ld-payload.js

@@ -22,7 +22,8 @@ export async function makeJsonLdPayload(renderingContext, documentType, docValue
         lNodeId: docValues,
         fieldTypes: documentType.fields ?? [],
     }));
-    const url = options.url ??
+    const url = options.canonicalUrl ??
+        options.url ??
         (await loadOrFromRenderingCache(renderingContext, `url:${encodeLNodeId(docValues)}`, () => loadUrlOfDocument(renderingContext, docValues)));
     const siteTitle = await loadOrFromRenderingCache(renderingContext, `siteFields:${docValues.language}:title`, async () => {
         const title = await getSiteFieldValue(siteContext, {
@@ -41,7 +42,7 @@ export async function makeJsonLdPayload(renderingContext, documentType, docValue
             : undefined;
     const pageEntity = {
         "@type": documentType.jsonLdType ?? "WebPage",
-        "@id": `${absoluteUrl}/#webpage`,
+        "@id": `${absoluteUrl}#webpage`,
         url: absoluteUrl,
         inLanguage: docValues.language,
         isPartOf: { "@id": `${siteUrl}#website` },

package/dist/rendering-payload/json-ld-payload.js.map

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

package/dist/rendering-payload/make-public-payload.d.ts

@@ -15,8 +15,8 @@ export declare function makeDetachedTemplatePayload(renderingContext: RenderingC
 };
 export declare function makeRegularTemplatePayload(renderingContext: RenderingContext, docValues: TpDocValues, options: {
     url: string;
+    canonicalUrl: string | undefined;
     urlQuery: PaUrlQuery | undefined;
-    frontendAppPath: string | undefined;
 }): {
     doc: import("@paroicms/public-server-lib").LiquidPayload<import("@paroicms/public-server-lib").TpDocPayload>;
 };

package/dist/rendering-payload/make-public-payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-public-payload.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/make-public-payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAKlG,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAA;CAAE;;;;;;;iBAcnD,GAAG;;EAG5B;AAED,wBAAgB,0BAA0B,CACxC,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC;IAGC,GAAG;EAKN"}
+{"version":3,"file":"make-public-payload.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/make-public-payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAKlG,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAA;CAAE;;;;;;;iBAcnD,GAAG;;EAG5B;AAED,wBAAgB,0BAA0B,CACxC,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;CAClC;IAGC,GAAG;EAKN"}

package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.d.ts

@@ -0,0 +1,15 @@
+interface JtNodeTypeV10 {
+    kind: string;
+    typeName?: string;
+    hasFrontendApp?: boolean;
+    useUrlQuery?: boolean | string[];
+    [k: string]: any;
+}
+interface OldSiteSchemaV10 {
+    ParoiCMSSiteSchemaFormatVersion: string;
+    nodeTypes?: JtNodeTypeV10[];
+    [k: string]: any;
+}
+export declare function migrateFrom10To11(directory: string, oldSchema: OldSiteSchemaV10): Promise<OldSiteSchemaV10>;
+export {};
+//# sourceMappingURL=site-schema-migration-10-to-11.d.ts.map

package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"site-schema-migration-10-to-11.d.ts","sourceRoot":"","sources":["../../../src/site-schema-migration/migrations/site-schema-migration-10-to-11.ts"],"names":[],"mappings":"AAWA,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;IACjC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,UAAU,gBAAgB;IACxB,+BAA+B,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,6BAarF"}

package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.js

@@ -0,0 +1,33 @@
+import { rename, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+export async function migrateFrom10To11(directory, oldSchema) {
+    const schema = structuredClone(oldSchema);
+    schema.ParoiCMSSiteSchemaFormatVersion = "11";
+    for (const nodeType of schema.nodeTypes ?? []) {
+        renameHasFrontendApp(nodeType);
+        convertUseUrlQuery(nodeType);
+    }
+    await rename(join(directory, "site-schema.json"), join(directory, "site-schema-v10.json"));
+    await writeFile(join(directory, "site-schema.json"), JSON.stringify(schema, undefined, 2));
+    return schema;
+}
+function renameHasFrontendApp(nodeType) {
+    if (!("hasFrontendApp" in nodeType))
+        return;
+    if (nodeType.hasFrontendApp === true)
+        nodeType.isSpa = true;
+    delete nodeType.hasFrontendApp;
+}
+function convertUseUrlQuery(nodeType) {
+    if (!("useUrlQuery" in nodeType))
+        return;
+    if (nodeType.useUrlQuery === true) {
+        nodeType.useUrlQuery = [];
+        console.warn(`… please list in "useUrlQuery" of the document type "${nodeType.typeName}" the query ` +
+            "parameters its templates read: an empty list ignores the URL query");
+    }
+    else {
+        delete nodeType.useUrlQuery;
+    }
+}
+//# sourceMappingURL=site-schema-migration-10-to-11.js.map

package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"site-schema-migration-10-to-11.js","sourceRoot":"","sources":["../../../src/site-schema-migration/migrations/site-schema-migration-10-to-11.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAyBjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAAiB,EAAE,SAA2B;IACpF,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,CAAC,+BAA+B,GAAG,IAAI,CAAC;IAE9C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QAC9C,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC/B,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAC3F,MAAM,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAuB;IACnD,IAAI,CAAC,CAAC,gBAAgB,IAAI,QAAQ,CAAC;QAAE,OAAO;IAC5C,IAAI,QAAQ,CAAC,cAAc,KAAK,IAAI;QAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;IAC5D,OAAO,QAAQ,CAAC,cAAc,CAAC;AACjC,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAuB;IACjD,IAAI,CAAC,CAAC,aAAa,IAAI,QAAQ,CAAC;QAAE,OAAO;IACzC,IAAI,QAAQ,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAClC,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CACV,wDAAwD,QAAQ,CAAC,QAAQ,cAAc;YACrF,oEAAoE,CACvE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;AACH,CAAC"}

package/dist/site-schema-migration/site-schema-migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-schema-migration.d.ts","sourceRoot":"","sources":["../../src/site-schema-migration/site-schema-migration.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAMlF,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,iBAEzF;AAED,wBAAsB,kBAAkB,kBAWvC"}
+{"version":3,"file":"site-schema-migration.d.ts","sourceRoot":"","sources":["../../src/site-schema-migration/site-schema-migration.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAOlF,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,iBAEzF;AAED,wBAAsB,kBAAkB,kBAWvC"}

package/dist/site-schema-migration/site-schema-migration.js

@@ -4,6 +4,7 @@ import { appConf, registeredSites } from "../context.js";
 import { migrateFrom6To7 } from "./migrations/site-schema-migration-6-to-7.js";
 import { migrateFrom7To8 } from "./migrations/site-schema-migration-7-to-8.js";
 import { migrateFrom8To9 } from "./migrations/site-schema-migration-8-to-9.js";
+import { migrateFrom10To11 } from "./migrations/site-schema-migration-10-to-11.js";
 import { migrateFrom9To10 } from "./migrations/site-schema-migration-9-to-10.js";
 export async function migrateSiteSchema(siteContext) {
     await migrateDirectory(siteContext.siteDir);
@@ -21,7 +22,7 @@ export async function migrateSiteSchemas() {
     }
 }
 async function migrateDirectory(directory) {
-    const targetVersion = "10";
+    const targetVersion = "11";
     console.info(`Migrating site-schema in directory "${directory}"`);
     let siteSchema = JSON.parse(await readFile(join(directory, "site-schema.json"), "utf-8"));
     if (siteSchema.ParoiCMSSiteSchemaFormatVersion === targetVersion) {
@@ -44,5 +45,9 @@ async function migrateDirectory(directory) {
         siteSchema = await migrateFrom9To10(directory, siteSchema);
         console.info("… migrated from version 9 to 10");
     }
+    if (siteSchema.ParoiCMSSiteSchemaFormatVersion === "10") {
+        siteSchema = await migrateFrom10To11(directory, siteSchema);
+        console.info("… migrated from version 10 to 11");
+    }
 }
 //# sourceMappingURL=site-schema-migration.js.map

package/dist/site-schema-migration/site-schema-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-schema-migration.js","sourceRoot":"","sources":["../../src/site-schema-migration/site-schema-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,WAAkD;IACxF,MAAM,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,IAAI,WAAqB,CAAC;IAC1B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;QACpC,MAAM,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,SAAiB;IAC/C,MAAM,aAAa,GAAG,IAAI,CAAC;IAE3B,OAAO,CAAC,IAAI,CAAC,uCAAuC,SAAS,GAAG,CAAC,CAAC;IAClE,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1F,IAAI,UAAU,CAAC,+BAA+B,KAAK,aAAa,EAAE,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;QAC/B,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;QAC/B,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;QAC/B,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,UAAU,CAAC,+BAA+B,KAAK,GAAG,EAAE,CAAC;QACvD,UAAU,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,UAAiB,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"site-schema-migration.js","sourceRoot":"","sources":["../../src/site-schema-migration/site-schema-migration.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "4.6.3",
+  "version": "5.0.0",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -40,16 +40,16 @@
   "dependencies": {
     "@apollo/server": "~5.5.1",
     "@as-integrations/express5": "~1.1.2",
-    "@paroicms/admin-ui": "1.102.2",
-    "@paroicms/internal-anywhere-lib": "1.41.1",
-    "@paroicms/internal-server-lib": "1.25.0",
-    "@paroicms/playground_demo1": "0.68.20",
-    "@paroicms/public-anywhere-lib": "1.2.1",
-    "@paroicms/public-server-lib": "1.8.0",
-    "@paroicms/script-lib": "1.0.7",
-    "@paroicms/server-database-media-storage": "1.26.34",
-    "@paroicms/server-image-cache-engine": "1.29.49",
-    "@paroicms/server-text-cache-system": "1.21.49",
+    "@paroicms/admin-ui": "1.103.0",
+    "@paroicms/internal-anywhere-lib": "1.41.2",
+    "@paroicms/internal-server-lib": "1.25.1",
+    "@paroicms/playground_demo1": "1.0.0",
+    "@paroicms/public-anywhere-lib": "2.0.0",
+    "@paroicms/public-server-lib": "2.0.0",
+    "@paroicms/script-lib": "1.0.8",
+    "@paroicms/server-database-media-storage": "1.26.35",
+    "@paroicms/server-image-cache-engine": "1.29.50",
+    "@paroicms/server-text-cache-system": "2.0.0",
     "archiver": "~8.0.0",
     "arktype": "~2.2.3",
     "bcrypt": "~6.0.0",