npm - @paroicms/server - Versions diffs - 4.7.0 → 5.0.1 - Mend

@paroicms/server 4.7.0 → 5.0.1

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

Files changed (108) hide show

package/dist/rendered-site/serve-index-page.js CHANGED Viewed

@@ -4,10 +4,7 @@ import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/rende
 import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { makeDetachedTemplatePayload } from "../rendering-payload/make-public-payload.js";
 export async function serveMultilingualIndexPage(siteContext, httpContext, tracker) {
-    const cacheKey = makeCacheKey(siteContext.logger, {
-        kind: "html",
-        url: httpContext.req.relativeUrl,
-    });
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: httpContext.req.path });
     const serveOr = serveTextFromCacheOr(siteContext, httpContext, tracker, { cacheKey });
     if (await serveOr.serveFromCache())
         return;
@@ -20,7 +17,7 @@ export async function serveMultilingualIndexPage(siteContext, httpContext, track
         templateNames: ["index", "default"],
         payload: makeDetachedTemplatePayload(renderingContext, {
             language: undefined,
-            urlQuery: httpContext.req.query,
+            urlQuery: undefined,
         }),
     });
     await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());

package/dist/rendered-site/serve-index-page.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-index-page.js","sourceRoot":"","sources":["../../src/rendered-site/serve-index-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAG1F,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,WAAwB,EACxB,WAA0B,EAC1B,OAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE~~;QAChD~~,IAAI,EAAE,MAAM~~;QACZ~~,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,~~WAAW;KACjC~~,CAAC,CAAC;~~IACH~~,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACjE,QAAQ;QACR,QAAQ,EAAE,SAAS;QACnB,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,gBAAgB,EAAE;QACxD,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,2BAA2B,CAAC,gBAAgB,EAAE;YACrD,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,~~WAAW,CAAC,GAAG,CAAC,KAAK~~;~~SAChC~~,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC7E,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,WAA0B;IAE1B,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9F,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"serve-index-page.js","sourceRoot":"","sources":["../../src/rendered-site/serve-index-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAG1F,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,WAAwB,EACxB,WAA0B,EAC1B,OAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/F,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACjE,QAAQ;QACR,QAAQ,EAAE,SAAS;QACnB,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,gBAAgB,EAAE;QACxD,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,2BAA2B,CAAC,gBAAgB,EAAE;YACrD,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;SACpB,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC7E,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,WAA0B;IAE1B,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9F,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/rendered-site/site-router.req-handler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"site-router.req-handler.d.ts","sourceRoot":"","sources":["../../src/rendered-site/site-router.req-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;~~AAKjE~~,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;~~AAKzE~~,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,~~oBAmB9F~~"}
1	+ {"version":3,"file":"site-router.req-handler.d.ts","sourceRoot":"","sources":["../../src/rendered-site/site-router.req-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAWjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAczE,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,oBAqB9F"}

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

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"site-router.req-handler.js","sourceRoot":"","sources":["../../src/rendered-site/site-router.req-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;~~AAE9D~~,OAAO,~~EAAwB~~,cAAc,~~EAAE~~,MAAM,mCAAmC,CAAC;~~AACzF~~,OAAO,~~EAAE~~,oBAAoB,~~EAAE~~,MAAM,oCAAoC,CAAC;~~AAC1E~~,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAwB,EAAE,WAA0B;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAE5B,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,mBAAmB,KAAK,WAAW,EAAE,CAAC;QACnF,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAChC,MAAM,0BAA0B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACpE,WAAW,CAAC,MAAM,CAAC,KAAK,CACtB,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,WAAW,EAAE,CAAC,CACvE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAE/B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACjG,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,WAA0B,EAC1B,WAA4B,EAC5B,OAAgB;IAEhB,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;~~IAG5B~~,MAAM,~~iBAAiB~~,GAAG,~~YAAY~~,CAAC,WAAW,CAAC,MAAM,~~EAAE;QACzD~~,IAAI,EAAE,~~MAAM~~;~~QACZ~~,GAAG,EAAE,GAAG,CAAC,~~WAAW~~;~~KACrB~~,CAAC,CAAC;~~IACH~~,MAAM,~~gBAAgB~~,GAAG,~~YAAY~~,CAAC,WAAW,CAAC,MAAM,~~EAAE~~,~~EAAE~~,~~IAAI~~,~~EAAE~~,MAAM,EAAE,~~GAAG~~,EAAE,GAAG,CAAC,~~IAAI~~,EAAE,CAAC,CAAC;~~IAE3F~~,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE;QACtE,QAAQ,EAAE,~~CAAC~~,~~iBAAiB,EAAE,gBAAgB,CAAC~~;~~KAChD~~,CAAC,CAAC;IACH,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,WAAW,EAAE,CAAC;~~QAC7D~~,OAAO,gBAAgB,CAAC,WAAW,EAAE,~~aAAa~~,CAAC,KAAK,CAAC,CAAC;~~IAC5D~~,CAAC;~~IAED~~,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,WAAW,EACX,WAAW,~~EACX~~,EAAE,~~WAAW~~,~~EAAE~~,~~iBAAiB~~,~~EAAE~~,~~gBAAgB~~,EAAE,~~EACpD~~,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,WAAW,EAAE,~~SAAS~~,~~CAAC~~,GAAG,CAAC,CAAC;~~IACtD~~,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClF,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,~~QAAQ~~,CAAC,CAAC;~~AACjG~~,CAAC"}
1	+ {"version":3,"file":"site-router.req-handler.js","sourceRoot":"","sources":["../../src/rendered-site/site-router.req-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EACL,yBAAyB,EACzB,WAAW,EACX,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAwB,EAAE,WAA0B;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAE5B,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAExD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,mBAAmB,KAAK,WAAW,EAAE,CAAC;QACnF,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAChC,MAAM,0BAA0B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACpE,WAAW,CAAC,MAAM,CAAC,KAAK,CACtB,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,WAAW,EAAE,CAAC,CACvE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAE/B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACjG,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,WAA0B,EAC1B,WAA4B,EAC5B,OAAgB;IAEhB,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAC5B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACjF,IAAI,aAAa,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;QAC/B,OAAO,gBAAgB,CAAC,WAAW,EAAE,GAAG,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CACxE,CAAC;IACF,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAC/D,WAAW,EACX,WAAW,CAAC,YAAY,EACxB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAC9C,CAAC;IAEF,MAAM,SAAS,GACb,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAGrF,MAAM,SAAS,GAAG,iBAAiB,IAAI,gBAAgB,CAAC;IACxD,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE;QACtE,QAAQ,EAAE,SAAS;QACnB,SAAS;KACV,CAAC,CAAC;IACH,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,WAAW,CAAC,YAAY,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QACzE,OAAO,gBAAgB,CAAC,WAAW,EAAE,GAAG,UAAU,GAAG,WAAW,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,SAAS,GACb,iBAAiB,KAAK,SAAS;QAC/B,CAAC,MAAM,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,GAAG,EAAE,OAAO,CAAC,CAAC;YAC7E,iCAAiC,CAAC;IAEtC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,gBAAgB,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAExE,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,WAAW,EACX;QACE,WAAW;QACX,QAAQ;QACR,QAAQ,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC;KAC/D,EACD,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,IAAI;SACtB,EACD,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,gBAAgB,CAAC,WAAW,EAAE,GAAG,UAAU,GAAG,WAAW,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClF,OAAO;IACT,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,gBAAgB,CAAC,WAAW,EAAE;YAC5B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;SAC7D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7E,CAAC;AAKD,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,uBAAuB,CAAC,KAA6B;IAC5D,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC,YAAY,CAAC,WAAW,IAAI,EAAE,CAAC;IAK/E,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,aAAa,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QACjD,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,WAAW,IAAI,EAAE;YAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CACxB,WAAwB,EACxB,YAAoB,EACpB,aAAqB;IAErB,OAAO;QACL,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;QACvF,iBAAiB,EACf,aAAa,CAAC,MAAM,KAAK,CAAC;YACxB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE;gBAC/B,IAAI,EAAE,MAAM;gBACZ,GAAG,EAAE,GAAG,YAAY,IAAI,aAAa,EAAE;aACxC,CAAC;KACT,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,aAAqB;IAChD,MAAM,WAAW,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAE7D,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;AACnF,CAAC"}

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

@@ -11,6 +11,6 @@ export declare function createDocPayloadDrop(renderingContext: RenderingContext,
     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 CHANGED Viewed

	@@ -1 +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,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,~~eAAe~~,CAAC,EAAE,MAAM,CAAC;~~CAC1B~~,GACA,aAAa,CAAC,YAAY,CAAC,~~CAwG7B~~"}
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,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 CHANGED Viewed

@@ -43,6 +43,7 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
             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: {
@@ -51,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 ?? [],
@@ -87,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;
@@ -160,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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"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~~QAEpC~~,OAAO;YACL,iBAAiB,EAAE,OAAO,EAAE,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,EAAE;YACzE,MAAM,EAAE;gBACN,IAAI,EACF,OAAO,CAAC,IAAI;oBACZ,CAAC,YAAY,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;gBACnF,EAAE;gBACF,GAAG,SAAS;gBACZ,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACxE,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,~~CAAC~~,~~GAAG~~,EAAE,~~CAAC~~,~~iBAAiB,~~CAAC,~~gBAAgB~~,~~EAAE~~,~~SAAS~~,CAAC,~~CAAC~~;~~gBAC1E~~,OAAO,EAAE,GAAG,EAAE,CACZ,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;oBACjD,OAAO,EAAE,SAAS;oBAClB,UAAU,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;iBACtC,CAAC;gBACJ,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,CAAC;gBAChE,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,CAAC;gBACxE,YAAY,EAAE,KAAK,IAAI,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,EAAE;wBACrD,UAAU,EAAE,YAAY,CAAC,MAAM;wBAC/B,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;qBAC7B,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtE,CAAC;gBACD,aAAa,EAAE,KAAK,IAAI,EAAE;oBACxB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,EAAE;wBACvD,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,YAAY;qBACb,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtE,CAAC;gBACD,KAAK,EACH,OAAO,CAAC,oBAAoB;oBAC5B,CAAC,GAAG,EAAE,CACJ,qBAAqB,CAAC,gBAAgB,EAAE;wBACtC,QAAQ,EAAE,SAAS,CAAC,IAAI;wBACxB,OAAO,EAAE,SAAS;wBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;qBAC/B,CAAC,CAAC;gBACP,YAAY,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBACxE,EAAE,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;gBACjF,MAAM,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;gBACnF,UAAU,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAClE,MAAM,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAC5D,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAChE,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,~~eAAe,EAAE,~~OAAO,~~CAAC,eAAe;gBACxC,OAAO,~~EAAE,KAAK,IAAI,EAAE;oBAClB,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS;wBAAE,OAAO;oBACpD,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,EAAE;wBAC5D,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;qBACzB,CAAC,CAAC;oBACH,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;oBAChE,IAAI,CAAC,WAAW;wBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,SAAS,CAAC,MAAM,wBAAwB,CAAC,CAAC;oBAErF,OAAO,sBAAsB,CAAC,gBAAgB,EAAE,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACnF,CAAC;gBACD,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,WAAW,EAAE;wBAC1D,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;qBACzB,CAAC,CAAC;oBACH,OAAO,kBAAkB,CAAC,gBAAgB,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACzE,CAAC;aACF;SACF,CAAC;IACJ,CAAC,EACD;QACE,cAAc,EAAE;YACd,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,UAAU;YACpB,cAAc,EAAE,IAAI;YACpB,UAAU;SACX;KACF,CACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,gBAAkC,EAClC,UAAyB,EACzB,YAA4B;IAI5B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO,gBAAgB,CAEpB,gBAAgB,EAAE;QACnB,iBAAiB,EAAE,WAAW,aAAa,CAAC,UAAU,CAAC,EAAE;QACzD,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3C,QAAQ,CAAC,QAAQ;YACjB,KAAK,IAAkD,EAAE;gBACvD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV,QAAQ,CACT,CAAC;gBACF,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CACjC,mBAAmB,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CACtF,CAAC;gBACF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO;gBAC3D,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;gBAC/E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACtF,CAAC;SACF,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,gBAAkC,EAClC,UAAyB,EACzB,YAA4B;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO,gBAAgB,CAAC,gBAAgB,EAAE;QACxC,iBAAiB,EAAE,kBAAkB,aAAa,CAAC,UAAU,CAAC,EAAE;QAChE,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3C,QAAQ,CAAC,QAAQ;YACjB,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;SAChF,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,gBAAkC,EAAE,UAAyB;IAC5F,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,gBAAgB,CACpD,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV;QACE,uBAAuB,EAAE,IAAI;QAC7B,UAAU,EAAE,gBAAgB,CAAC,SAAS;KACvC,CACF,CAAC;IACF,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,CAAC;IACrD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,gBAAkC,EAClC,YAA4B,EAC5B,SAAsB,EACtB,~~OAEC~~;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAC5C,gBAAgB,EAChB,WAAW,aAAa,CAAC,SAAS,CAAC,OAAO,EAC1C,GAAG,EAAE,CACH,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;QACjD,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;KACtC,CAAC,CACL,CAAC;IAEF,MAAM,GAAG,GACP,OAAO,CAAC,GAAG;QACX,CAAC,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CACxF,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAC/C,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,MAAM,wBAAwB,CACpD,gBAAgB,EAChB,iBAAiB,aAAa,CAAC,SAAS,CAAC,EAAE,EAC3C,KAAK,IAAI,EAAE,CACT,CACE,MAAM,kBAAkB,CAAC,gBAAgB,EAAE;QACzC,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,YAAY;KACb,CAAC,CACH,EAAE,EAAE,CACR,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,gBAAgB,EAChB,cAAc,SAAS,CAAC,QAAQ,QAAQ,EACxC,KAAK,IAAI,EAAE;QACT,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;YACjD,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO;QACzB,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC;QAClC,CAAC,CAAC,SAAS,CAAC,eAAe;YACzB,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;YACpD,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,OAAO,GACX,eAAe,KAAK,SAAS;QAC3B,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QACvE,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;YACtC,MAAM,EAAE,oBAAoB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SACpE,CAAC,CAAC;IACT,MAAM,OAAO,GACX,OAAO,EAAE,IAAI,KAAK,OAAO;QACvB,CAAC,CAAC,MAAM,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE;YAC/E,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,UAAU;SACvB,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC;QACpC,IAAI,EAAE,YAAY,CAAC,MAAM;QACzB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,YAAY,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK;QACrE,QAAQ,EAAE,SAAS;QACnB,WAAW;QACX,MAAM,EAAE,SAAS,CAAC,QAAQ;KAC3B,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EACL,aAAa,GAGd,MAAM,+BAA+B,CAAC;AAWvC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sDAAsD,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAEhG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,YAAY,EACZ,sBAAsB,EACtB,mBAAmB,EACnB,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAErD,MAAM,UAAU,oBAAoB,CAClC,gBAAkC,EAClC,aAAyD,EACzD,OAaC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/B,OAAO,gBAAgB,CACrB,gBAAgB,EAChB,KAAK,IAAI,EAAE;QACT,MAAM,SAAS,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAEnF,IAAI,SAAS,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YACzF,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,UAAU,EAAE;YACzD,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,QAAQ,EAAE,SAAS,CAAC,IAAI;SACzB,CAAC,CAAC;QAEH,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9B,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,GAAG,EAAE,CACnB,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAC3D,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAC/C,CAAC;QAEJ,OAAO;YACL,iBAAiB,EAAE,OAAO,EAAE,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,EAAE;YACzE,MAAM,EAAE;gBACN,IAAI,EACF,OAAO,CAAC,IAAI;oBACZ,CAAC,YAAY,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;gBACnF,EAAE;gBACF,GAAG,SAAS;gBACZ,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACxE,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO;gBAC3B,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO;gBAC5D,OAAO,EAAE,GAAG,EAAE,CACZ,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;oBACjD,OAAO,EAAE,SAAS;oBAClB,UAAU,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;iBACtC,CAAC;gBACJ,IAAI,EAAE,eAAe,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,CAAC;gBAChE,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,CAAC;gBACxE,YAAY,EAAE,KAAK,IAAI,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,EAAE;wBACrD,UAAU,EAAE,YAAY,CAAC,MAAM;wBAC/B,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;qBAC7B,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtE,CAAC;gBACD,aAAa,EAAE,KAAK,IAAI,EAAE;oBACxB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,EAAE;wBACvD,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,YAAY;qBACb,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtE,CAAC;gBACD,KAAK,EACH,OAAO,CAAC,oBAAoB;oBAC5B,CAAC,GAAG,EAAE,CACJ,qBAAqB,CAAC,gBAAgB,EAAE;wBACtC,QAAQ,EAAE,SAAS,CAAC,IAAI;wBACxB,OAAO,EAAE,SAAS;wBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;qBAC/B,CAAC,CAAC;gBACP,YAAY,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBACxE,EAAE,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;gBACjF,MAAM,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;gBACnF,UAAU,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAClE,MAAM,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAC5D,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC;gBAChE,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS;wBAAE,OAAO;oBACpD,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,EAAE;wBAC5D,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;qBACzB,CAAC,CAAC;oBACH,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;oBAChE,IAAI,CAAC,WAAW;wBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,SAAS,CAAC,MAAM,wBAAwB,CAAC,CAAC;oBAErF,OAAO,sBAAsB,CAAC,gBAAgB,EAAE,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACnF,CAAC;gBACD,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,WAAW,EAAE;wBAC1D,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;qBACzB,CAAC,CAAC;oBACH,OAAO,kBAAkB,CAAC,gBAAgB,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACzE,CAAC;aACF;SACF,CAAC;IACJ,CAAC,EACD;QACE,cAAc,EAAE;YACd,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,UAAU;YACpB,cAAc,EAAE,IAAI;YACpB,UAAU;SACX;KACF,CACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,gBAAkC,EAClC,UAAyB,EACzB,YAA4B;IAI5B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO,gBAAgB,CAEpB,gBAAgB,EAAE;QACnB,iBAAiB,EAAE,WAAW,aAAa,CAAC,UAAU,CAAC,EAAE;QACzD,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3C,QAAQ,CAAC,QAAQ;YACjB,KAAK,IAAkD,EAAE;gBACvD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV,QAAQ,CACT,CAAC;gBACF,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CACjC,mBAAmB,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CACtF,CAAC;gBACF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO;gBAC3D,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;gBAC/E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACtF,CAAC;SACF,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,gBAAkC,EAClC,UAAyB,EACzB,YAA4B;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,OAAO,gBAAgB,CAAC,gBAAgB,EAAE;QACxC,iBAAiB,EAAE,kBAAkB,aAAa,CAAC,UAAU,CAAC,EAAE;QAChE,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3C,QAAQ,CAAC,QAAQ;YACjB,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;SAChF,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,gBAAkC,EAAE,UAAyB;IAC5F,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,gBAAgB,CACpD,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV;QACE,uBAAuB,EAAE,IAAI;QAC7B,UAAU,EAAE,gBAAgB,CAAC,SAAS;KACvC,CACF,CAAC;IACF,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,CAAC;IACrD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,gBAAkC,EAClC,YAA4B,EAC5B,SAAsB,EACtB,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAC5C,gBAAgB,EAChB,WAAW,aAAa,CAAC,SAAS,CAAC,OAAO,EAC1C,GAAG,EAAE,CACH,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;QACjD,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;KACtC,CAAC,CACL,CAAC;IAEF,MAAM,GAAG,GACP,OAAO,CAAC,YAAY;QACpB,OAAO,CAAC,GAAG;QACX,CAAC,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CACxF,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAC/C,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,MAAM,wBAAwB,CACpD,gBAAgB,EAChB,iBAAiB,aAAa,CAAC,SAAS,CAAC,EAAE,EAC3C,KAAK,IAAI,EAAE,CACT,CACE,MAAM,kBAAkB,CAAC,gBAAgB,EAAE;QACzC,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,YAAY;KACb,CAAC,CACH,EAAE,EAAE,CACR,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,gBAAgB,EAChB,cAAc,SAAS,CAAC,QAAQ,QAAQ,EACxC,KAAK,IAAI,EAAE;QACT,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;YACjD,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO;QACzB,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC;QAClC,CAAC,CAAC,SAAS,CAAC,eAAe;YACzB,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;YACpD,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,OAAO,GACX,eAAe,KAAK,SAAS;QAC3B,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QACvE,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;YACtC,MAAM,EAAE,oBAAoB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SACpE,CAAC,CAAC;IACT,MAAM,OAAO,GACX,OAAO,EAAE,IAAI,KAAK,OAAO;QACvB,CAAC,CAAC,MAAM,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE;YAC/E,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,UAAU;SACvB,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC;QACpC,IAAI,EAAE,YAAY,CAAC,MAAM;QACzB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,YAAY,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK;QACrE,QAAQ,EAAE,SAAS;QACnB,WAAW;QACX,MAAM,EAAE,SAAS,CAAC,QAAQ;KAC3B,CAAC;AACJ,CAAC"}

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

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,eAAe,CAAC,CA+K1B"}

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

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"json-ld-payload.js","sourceRoot":"","sources":["../../src/rendering-payload/json-ld-payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAiC,MAAM,+BAA+B,CAAC;AAO7F,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE3F,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAErD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,gBAAkC,EAClC,YAA4B,EAC5B,SAAsB,EACtB,~~OAAyB~~;~~IAEzB~~,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,KAAK,GAAU,EAAE,CAAC;IAExB,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAGhD,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAC5C,gBAAgB,EAChB,WAAW,aAAa,CAAC,SAAS,CAAC,OAAO,EAC1C,GAAG,EAAE,CACH,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;QACjD,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;KACtC,CAAC,CACL,CAAC;IAEF,MAAM,GAAG,GACP,OAAO,CAAC,GAAG;QACX,CAAC,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CACxF,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAC/C,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,gBAAgB,EAChB,cAAc,SAAS,CAAC,QAAQ,QAAQ,EACxC,KAAK,IAAI,EAAE;QACT,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;YACjD,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,OAAO;QACzB,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC;QAClC,CAAC,CAAC,SAAS,CAAC,eAAe;YACzB,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;YACpD,CAAC,CAAC,SAAS,CAAC;IAGhB,MAAM,UAAU,GAAQ;QACtB,OAAO,EAAE,YAAY,CAAC,UAAU,IAAI,SAAS;QAC7C,KAAK,EAAE,GAAG,WAAW,~~WAAW~~;~~QAChC~~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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;CAClC;IAGC,GAAG;EAKN"}

package/dist/site-context/load-site-context.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { type RegisteredSite } from "@paroicms/public-server-lib";
-import type { MigrationSiteContext, SiteContext } from "./site-context.types.js";
+import type { AnySiteContext } from "./site-context.types.js";
 export declare const alreadyLoaded: WeakSet<RegisteredSite>;
-export declare function loadSiteContext(regSite: RegisteredSite): Promise<SiteContext | MigrationSiteContext>;
+export declare function loadSiteContext(regSite: RegisteredSite): Promise<AnySiteContext>;
 //# sourceMappingURL=load-site-context.d.ts.map

package/dist/site-context/load-site-context.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"load-site-context.d.ts","sourceRoot":"","sources":["../../src/site-context/load-site-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,6BAA6B,CAAC;~~AA6CrC~~,OAAO,KAAK,~~EAAE~~,~~oBAAoB~~,~~EAAE~~,~~WAAW,EAAE,~~MAAM,yBAAyB,CAAC;~~AAGjF~~,eAAO,MAAM,aAAa,yBAAgC,CAAC;AAE3D,wBAAsB,eAAe,~~CACnC~~,OAAO,EAAE,cAAc,~~GACtB~~,OAAO,CAAC,~~WAAW~~,~~GAAG,oBAAoB,~~CAAC,~~CAiK7C~~"}
1	+ {"version":3,"file":"load-site-context.d.ts","sourceRoot":"","sources":["../../src/site-context/load-site-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,6BAA6B,CAAC;AAkDrC,OAAO,KAAK,EACV,cAAc,EAKf,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,aAAa,yBAAgC,CAAC;AAE3D,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BtF"}