npm - @paroicms/server - Versions diffs - 1.43.2 → 1.45.0 - Mend

@paroicms/server 1.43.2 → 1.45.0

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 (230) hide show

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHomeUrl = exports.getUrlOfDocument = void 0;
+exports.getUrlOfDocument = getUrlOfDocument;
+exports.getHomeUrl = getHomeUrl;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const connector_1 = require("@paroicms/connector");
 const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
@@ -43,14 +44,13 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
     }, tracker);
     return options.returnUrlDependencyKeys ? { url, dependencyKeys } : url;
 }
-exports.getUrlOfDocument = getUrlOfDocument;
 function buildUrlQuery(siteContext, sectionId, depth) {
     const { leafId, language } = sectionId;
     let cur = depth;
     const query = siteContext.cn
         .createQueryBuilder()
         .addSelect(`l${cur}.id`, `id${cur}`)
-        .addSelect(`l${cur}.leafType`, `leafType${cur}`)
+        .addSelect(`l${cur}.typeName`, `typeName${cur}`)
         .addSelect(`l${cur}.relativeId`, `relativeId${cur}`)
         .addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
         .addSelect(`d${cur}.slug`, `slug${cur}`)
@@ -66,7 +66,7 @@ function buildUrlQuery(siteContext, sectionId, depth) {
         cur = prev - 1;
         query
             .addSelect(`l${cur}.id`, `id${cur}`)
-            .addSelect(`l${cur}.leafType`, `leafType${cur}`)
+            .addSelect(`l${cur}.typeName`, `typeName${cur}`)
             .addSelect(`l${cur}.relativeId`, `relativeId${cur}`)
             .addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
             .addSelect(`d${cur}.slug`, `slug${cur}`)
@@ -88,7 +88,7 @@ function formatUrlData(row, depth) {
     for (let cur = 1; cur <= depth; ++cur) {
         parts.set(cur, {
             leafId: (0, data_formatters_lib_1.strVal)(row[`id${cur}`]),
-            leafType: (0, data_formatters_lib_1.strVal)(row[`leafType${cur}`]),
+            typeName: (0, data_formatters_lib_1.strVal)(row[`typeName${cur}`]),
             relativeId: (0, data_formatters_lib_1.strVal)(row[`relativeId${cur}`]),
             slug: (0, data_formatters_lib_1.strValOrUndef)(row[`slug${cur}`]),
             publishDate: (0, data_formatters_lib_1.dateVal)(row[`publishDate${cur}`]),
@@ -97,25 +97,24 @@ function formatUrlData(row, depth) {
     return { depth, parts };
 }
 function getHomeUrl(siteContext, language) {
-    return siteContext.multilingual ? `/${language}` : "/";
+    return siteContext.siteSchema.isMultilingual ? `/${language}` : "/";
 }
-exports.getHomeUrl = getHomeUrl;
 function makeUrl(siteContext, urlData, language) {
-    const { siteSchema, multilingual } = siteContext;
-    const urlParts = multilingual ? [language] : [];
-    let parent = (0, internal_anywhere_lib_1.getDocumentTypeByLeafType)(siteSchema, "home");
+    const { siteSchema } = siteContext;
+    const urlParts = siteSchema.isMultilingual ? [language] : [];
+    let parent = (0, internal_anywhere_lib_1.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.children?.includes(part.leafType)) {
-            throw new Error(`schema and database are not compatible, '${part.leafType}' should not be a child of '${parent.leafType}'`);
+        if (!parent.children?.includes(part.typeName)) {
+            throw new Error(`schema and database are not compatible, '${part.typeName}' should not be a child of '${parent.typeName}'`);
         }
-        const docType = (0, internal_anywhere_lib_1.getDocumentTypeByLeafType)(siteSchema, part.leafType);
-        if (docType.kind === "routingPoint") {
+        const docType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, part.typeName);
+        if (docType.isRoutingPoint) {
             const part = docType.urlPaths?.[language];
             if (!part) {
-                throw new Error(`missing urlPath['${language}'] in document type '${docType.leafType}'`);
+                throw new Error(`missing urlPath['${language}'] in document type '${docType.typeName}'`);
             }
             urlParts.push(part);
         }
@@ -131,7 +130,7 @@ function makeUrl(siteContext, urlData, language) {
                 urlParts.push(makeRelativeIdSlugUrlPart(part));
             }
             else {
-                throw new Error(`in '${docType.leafType}', unknown value for route: '${docType.route}'`);
+                throw new Error(`in '${docType.typeName}', unknown value for route: '${docType.route}'`);
             }
         }
         parent = docType;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":"~~;;;AAAA~~,oEAAsF;AACtF,mDAAuD;AACvD,~~2EAA4E~~;~~AAG5E~~,2DAAkF;AAElF,+DAA4D;AA0BrD,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAA2B,EAC3B,UAAiD,EAAE;IAEnD,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChF,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;YAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAC9D,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,KAAK;YACrB,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,IAAI,cAAwB,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAExC,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAY,EAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxC,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;QAC5C,OAAO,CAAC,WAAW,CAAC,4BAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,IAAI,MAAM,GAAG,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,cAAc,GAAG,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;QACE,QAAQ;QACR,KAAK,EAAE,GAAG;QACV,cAAc;KACf,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;~~AA/CD,4CA+CC;~~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~~WAA8C~~,EAAE,QAAgB;~~IACzF~~,OAAO,WAAW,CAAC,~~YAAY~~,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;~~AACzD~~,CAAC;~~AAFD,gCAEC;~~AAED,SAAS,OAAO,CACd,~~WAA6D~~,~~EAC7D~~,OAAgB,EAChB,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,~~YAAY,EAAE,~~GAAG,WAAW,CAAC;~~IACjD~~,MAAM,QAAQ,GAAG,~~YAAY~~,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~IAChD~~,IAAI,MAAM,GAAG,IAAA,~~iDAAyB~~,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;~~IAE3D~~,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC3G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAA,~~iDAAyB~~,EAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;~~QAErE~~,IAAI,OAAO,CAAC,~~IAAI,KAAK,~~cAAc,EAAE,CAAC;~~YACpC~~,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;gBAE7B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAClE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9D,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,CAAC,QAAQ,gCAAgC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QAED,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAiB;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgB,EAAE,QAAgB;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,IAAA,mCAAsB,EAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC"}
1	+ {"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 CHANGED Viewed

@@ -1,17 +1,17 @@
-import type { ClassicDocumentSchema, RoutingPointDocumentSchema } from "@paroicms/public-anywhere-lib";
+import type { ScRegularDocumentType, ScRoutingPointDocumentType } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../../site-context/site-context.types";
 export interface ParsedPublicRoute {
     language: string;
-    routingPoints: RoutingPointDocumentSchema[];
-    classicRelativeIds: ClassicRelativeId[];
+    routingPoints: ScRoutingPointDocumentType[];
+    regularRelativeIds: RegularRelativeId[];
     redirectTo: "parent" | undefined;
     depth: number;
     urlCacheKey: string;
     urlParameters?: string;
 }
-export interface ClassicRelativeId {
+export interface RegularRelativeId {
     relativeId: string;
-    candidateTypes: ClassicDocumentSchema[];
+    candidateTypes: ScRegularDocumentType[];
 }
-export declare function parsePublicRoute(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">, path: string): ParsedPublicRoute | undefined;
+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 CHANGED Viewed

@@ -1,21 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findParentParsedRouteWithDocument = exports.parsePublicRoute = void 0;
+exports.parsePublicRoute = parsePublicRoute;
+exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
+const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
 function parsePublicRoute(siteContext, path) {
-    const { siteSchema, multilingual } = siteContext;
+    const { siteSchema } = siteContext;
     const { cleanedPath, urlParameters } = parseUrlParameters(path);
     const tokens = cleanedPath
         .split("/")
         .slice(1)
         .filter((token) => token.length > 0);
-    const language = multilingual ? tokens[0] : siteSchema.defaultLanguage;
-    const parts = multilingual ? tokens.slice(1) : tokens;
+    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 (multilingual)
+    if (siteSchema.isMultilingual)
         urlCacheKey.push(language);
-    let prev = siteSchema.documentTypes.home;
+    let prev = siteSchema.leafTypes.home;
     const routingPoints = [prev];
     let depth = 0;
     let i = 0;
@@ -31,9 +33,9 @@ function parsePublicRoute(siteContext, path) {
     }
     let lastRedirectTo = prev.redirectTo;
     let parentCandidates = [prev];
-    const classicRelativeIds = [];
+    const regularRelativeIds = [];
     while (i < parts.length) {
-        const found = findClassicRelativeIdByUrlPath({
+        const found = findRegularRelativeIdByUrlPath({
             siteSchema,
             parentCandidates,
             parts,
@@ -41,24 +43,23 @@ function parsePublicRoute(siteContext, path) {
         });
         if (!found)
             return;
-        classicRelativeIds.push(found.classicRelativeId);
-        urlCacheKey.push(`regular:${found.classicRelativeId.relativeId}`);
+        regularRelativeIds.push(found.regularRelativeId);
+        urlCacheKey.push(`regular:${found.regularRelativeId.relativeId}`);
         ++depth;
-        parentCandidates = found.classicRelativeId.candidateTypes;
+        parentCandidates = found.regularRelativeId.candidateTypes;
         i += found.skipUrlParts;
         lastRedirectTo = undefined;
     }
     return {
         language,
         routingPoints,
-        classicRelativeIds,
+        regularRelativeIds,
         redirectTo: lastRedirectTo,
         depth,
         urlCacheKey: urlCacheKey.join("/"),
         urlParameters,
     };
 }
-exports.parsePublicRoute = parsePublicRoute;
 function parseUrlParameters(path) {
     const result = path.match(/(^.+)(\?.*)$/);
     if (result) {
@@ -73,38 +74,31 @@ function parseUrlParameters(path) {
     };
 }
 function findRoutingPointByUrlPath({ siteSchema, parent, urlPath, language, }) {
-    for (const leafType of parent.children ?? []) {
-        const documentType = siteSchema.documentTypes[leafType];
-        if (!documentType)
-            throw new Error(`document-type '${leafType}' should be in the schema`);
-        if (documentType.kind !== "routingPoint" || !documentType.urlPaths)
+    for (const typeName of parent.children ?? []) {
+        const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName);
+        if (!documentType.isRoutingPoint || !documentType.urlPaths)
             continue;
         if (urlPath === documentType.urlPaths[language])
             return documentType;
     }
 }
-function findClassicRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, partsIndex, }) {
+function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, partsIndex, }) {
     const candidateTypes = parentCandidates
-        .reduce((childLeafTypes, parent) => {
+        .reduce((childTypeNames, parent) => {
         if (parent.children)
-            childLeafTypes.push(...parent.children);
-        return childLeafTypes;
+            childTypeNames.push(...parent.children);
+        return childTypeNames;
     }, [])
-        ?.map((leafType) => {
-        const documentType = siteSchema.documentTypes[leafType];
-        if (!documentType)
-            throw new Error(`document-type '${leafType}' should be in the schema`);
-        return documentType;
-    })
-        .filter((docType) => docType.kind === "classic");
+        ?.map((typeName) => (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName))
+        .filter((docType) => !docType.isRoutingPoint);
     if (!candidateTypes || candidateTypes.length === 0)
         return;
     const route = candidateTypes[0].route;
     if (route === ":relativeId-:slug") {
         const urlPath = parts[partsIndex];
-        const relativeId = parseClassicRelativeIdSlug(urlPath);
+        const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
-            classicRelativeId: { relativeId, candidateTypes },
+            regularRelativeId: { relativeId, candidateTypes },
             skipUrlParts: 1,
         };
     }
@@ -116,14 +110,14 @@ function findClassicRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, p
             return;
         }
         const urlPath = parts[partsIndex + 3];
-        const relativeId = parseClassicRelativeIdSlug(urlPath);
+        const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
-            classicRelativeId: { relativeId, candidateTypes },
+            regularRelativeId: { relativeId, candidateTypes },
             skipUrlParts: 4,
         };
     }
 }
-function parseClassicRelativeIdSlug(urlPath) {
+function parseRegularRelativeIdSlug(urlPath) {
     const index = urlPath.indexOf("-");
     return index === -1 ? urlPath : urlPath.substring(0, index);
 }
@@ -152,27 +146,26 @@ function findParentParsedRouteWithDocument(parsedRoute) {
             return curRoute;
     }
 }
-exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
 function findParentParsedRoute(parsedRoute) {
     const routingPoints = [...parsedRoute.routingPoints];
-    const classicRelativeIds = [...parsedRoute.classicRelativeIds];
+    const regularRelativeIds = [...parsedRoute.regularRelativeIds];
     const urlCacheKey = parsedRoute.urlCacheKey.split("/");
-    if (classicRelativeIds.length > 0) {
-        classicRelativeIds.pop();
+    if (regularRelativeIds.length > 0) {
+        regularRelativeIds.pop();
         urlCacheKey.pop();
     }
     else if (routingPoints.length > 0) {
         routingPoints.pop();
         urlCacheKey.pop();
     }
-    if (classicRelativeIds.length === 0 && routingPoints.length === 0)
+    if (regularRelativeIds.length === 0 && routingPoints.length === 0)
         return;
-    const lastClassic = classicRelativeIds.length > 0 ? classicRelativeIds[classicRelativeIds.length - 1] : undefined;
-    const redirectTo = lastClassic ? undefined : routingPoints[routingPoints.length - 1]?.redirectTo;
+    const lastRegular = regularRelativeIds.length > 0 ? regularRelativeIds[regularRelativeIds.length - 1] : undefined;
+    const redirectTo = lastRegular ? undefined : routingPoints[routingPoints.length - 1]?.redirectTo;
     return {
         language: parsedRoute.language,
         routingPoints,
-        classicRelativeIds,
+        regularRelativeIds,
         redirectTo,
         depth: parsedRoute.depth - 1,
         urlCacheKey: urlCacheKey.join("/"),

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

	@@ -1 +1 @@
1	- {"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":"~~;;;AAuBA~~,SAAgB,gBAAgB,CAC9B,~~WAA6D~~,~~EAC7D~~,IAAY;IAEZ,MAAM,EAAE,UAAU,EAAE,~~YAAY,EAAE,~~GAAG,WAAW,CAAC;~~IACjD~~,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,WAAW;SACvB,KAAK,CAAC,GAAG,CAAC;SACV,KAAK,CAAC,CAAC,CAAC;SACR,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,~~YAAY~~,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC;~~IACvE~~,MAAM,KAAK,GAAG,~~YAAY~~,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;~~IAEtD~~,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO;IAElE,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,~~YAAY~~;QAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;~~IAE7C~~,IAAI,IAAI,GAA+B,UAAU,CAAC,~~aAAa~~,CAAC,IAAI,CAAC;~~IACrE~~,MAAM,aAAa,GAAiC,CAAC,IAAI,CAAC,CAAC;IAE3D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,YAAY,GAAG,yBAAyB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChG,IAAI,CAAC,YAAY;YAAE,MAAM;QACzB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,EAAE,KAAK,CAAC;QACR,IAAI,GAAG,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;IACrC,IAAI,gBAAgB,GAAqB,CAAC,IAAI,CAAC,CAAC;IAEhD,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,8BAA8B,CAAC;YAC3C,UAAU;YACV,gBAAgB;YAChB,KAAK;YACL,UAAU,EAAE,CAAC;SACd,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjD,WAAW,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,CAAC;QAClE,EAAE,KAAK,CAAC;QACR,gBAAgB,GAAG,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC;QAC1D,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC;QACxB,cAAc,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,QAAQ;QACR,aAAa;QACb,kBAAkB;QAClB,UAAU,EAAE,cAAc;QAC1B,KAAK;QAEL,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,aAAa;KACd,CAAC;AACJ,CAAC;~~AA/DD,4CA+DC;~~AAED,SAAS,kBAAkB,CAAC,IAAY;IAItC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;YACtB,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;SACzB,CAAC;IACJ,CAAC;IACD,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,aAAa,EAAE,SAAS;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,EACjC,UAAU,EACV,MAAM,EACN,OAAO,EACP,QAAQ,~~GAC8E~~;~~IAGtF~~,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,~~UAAU~~,~~CAAC~~,~~aAAa~~,~~CAAC~~,QAAQ,CAAC,CAAC;~~QACxD~~,IAAI,CAAC,YAAY~~;YAAE~~,~~MAAM,IAAI,KAAK,~~CAAC,~~kBAAkB,QAAQ,2BAA2B,CAAC,CAAC;QAC1F,IAAI,YAAY,CAAC,IAAI,KAAK,~~cAAc,IAAI,CAAC,YAAY,CAAC,QAAQ;YAAE,SAAS;~~QAC7E~~,IAAI,OAAO,KAAK,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,YAAY,CAAC;IACvE,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,UAAU,GAMX;IACC,MAAM,cAAc,GAAG,gBAAgB;SACpC,MAAM,CAAW,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,QAAQ;YAAE,cAAc,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7D,OAAO,cAAc,CAAC;IACxB,CAAC,EAAE,EAAE,CAAC;QACN,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE~~;QACjB~~,~~MAAM,YAAY,GAAG,UAAU,~~CAAC,~~aAAa~~,~~CAAC~~,~~QAAQ~~,~~CAAC~~,~~CAAC;QACxD~~,~~IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,~~QAAQ,~~2BAA2B,~~CAAC,CAAC;~~QAC1F~~,~~OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;SACD,~~MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,~~IAAI~~,~~KAAK,SAAS,~~CAA4B,CAAC;~~IAC9E~~,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE3D,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAEtC,IAAI,KAAK,KAAK,mBAAmB,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO;YACL,iBAAiB,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE;YACjD,YAAY,EAAE,CAAC;SAChB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,KAAK,iCAAiC,EAAE,CAAC;QAChD,IACE,KAAK,CAAC,MAAM,GAAG,UAAU,GAAG,CAAC;YAC7B,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC/B,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,EAC7B,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO;YACL,iBAAiB,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE;YACjD,YAAY,EAAE,CAAC;SAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAe;IACjD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,MAAM,CAAC,CAAS;IACvB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,OAAO,CAAC,CAAS;IACxB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,SAAS,KAAK,CAAC,CAAS;IACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,SAAgB,iCAAiC,CAC/C,WAA8B;IAE9B,IAAI,QAAQ,GAAkC,WAAW,CAAC;IAC1D,OAAO,IAAI,EAAE,CAAC;QACZ,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ;YAAE,MAAM;QACrB,IAAI,CAAC,QAAQ,CAAC,UAAU;YAAE,OAAO,QAAQ,CAAC;IAC5C,CAAC;AACH,CAAC;~~AATD,8EASC;~~AAED,SAAS,qBAAqB,CAAC,WAA8B;IAC3D,MAAM,aAAa,GAAiC,CAAC,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;IACnF,MAAM,kBAAkB,GAAwB,CAAC,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAGpF,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEvD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;SAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,aAAa,CAAC,GAAG,EAAE,CAAC;QACpB,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE1E,MAAM,WAAW,GACf,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC;IAEjG,OAAO;QACL,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,aAAa;QACb,kBAAkB;QAClB,UAAU;QACV,KAAK,EAAE,WAAW,CAAC,KAAK,GAAG,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;KACnC,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRawDocPayload = void 0;
+exports.fetchRawDocPayload = fetchRawDocPayload;
 const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
 async function fetchRawDocPayload(siteContext, parsedRoute) {
     const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
@@ -11,7 +11,6 @@ async function fetchRawDocPayload(siteContext, parsedRoute) {
         language: parsedRoute.language,
     });
 }
-exports.fetchRawDocPayload = fetchRawDocPayload;
 function buildRawDocPayloadQuery(siteContext, parsedRoute) {
     const query = siteContext.cn.createQueryBuilder();
     query
@@ -20,15 +19,15 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
         language: parsedRoute.language,
     })
         .andWhere("l0.depth = 0")
-        .andWhere("l0.leafType = 'home'")
+        .andWhere("l0.typeName = 'home'")
         .andWhere("l0.publishDate <= current_timestamp")
         .andWhere("s0.ready = 1");
     let prev = 0;
     for (const routingPoint of parsedRoute.routingPoints.slice(1)) {
         const cur = prev + 1;
         query
-            .innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.leafType = :leafType${cur}`, {
-            [`leafType${cur}`]: routingPoint.leafType,
+            .innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.typeName = :typeName${cur}`, {
+            [`typeName${cur}`]: routingPoint.typeName,
         })
             .innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
             language: parsedRoute.language,
@@ -37,7 +36,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
             .andWhere(`s${cur}.ready = 1`);
         prev = cur;
     }
-    for (const { candidateTypes, relativeId } of parsedRoute.classicRelativeIds) {
+    for (const { candidateTypes, relativeId } of parsedRoute.regularRelativeIds) {
         const cur = prev + 1;
         query
             .innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.relativeId = :relativeId${cur}`, {
@@ -46,15 +45,15 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
             .innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
             language: parsedRoute.language,
         })
-            .andWhere(`l${cur}.leafType in (:...leafType${cur})`, {
-            [`leafType${cur}`]: candidateTypes.map((t) => t.leafType),
+            .andWhere(`l${cur}.typeName in (:...typeName${cur})`, {
+            [`typeName${cur}`]: candidateTypes.map((t) => t.typeName),
         })
             .andWhere(`l${cur}.publishDate <= current_timestamp`)
             .andWhere(`s${cur}.ready = 1`);
         prev = cur;
     }
     query
-        .addSelect(`l${prev}.leafType`, "leafType")
+        .addSelect(`l${prev}.typeName`, "typeName")
         .addSelect(`l${prev}.id`, "leafId")
         .addSelect(`l${prev}.relativeId`, "relativeId")
         .addSelect(`l${prev}.publishDate`, "publishDate");

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

	@@ -1 +1 @@
1	- {"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":"~~;;;AACA~~,mFAA6E;AAKtE,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,WAA8B;IAE9B,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;IAC5C,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,OAAO,IAAA,oCAAe,EAAC,GAAG,EAAE;QAC1B,QAAQ,EAAE,WAAW,CAAC,QAAQ;KAC/B,CAAC,CAAC;AACL,CAAC;~~AAXD,gDAWC;~~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"}
1	+ {"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":";;AAMA,gDAWC;AAhBD,mFAA6E;AAKtE,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,WAA8B;IAE9B,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;IAC5C,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,OAAO,IAAA,oCAAe,EAAC,GAAG,EAAE;QAC1B,QAAQ,EAAE,WAAW,CAAC,QAAQ;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,WAAwB,EAAE,WAA8B;IACvF,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,KAAK;SACF,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;SACpB,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,2CAA2C,EAAE;QACzE,QAAQ,EAAE,WAAW,CAAC,QAAQ;KAC/B,CAAC;SACD,QAAQ,CAAC,cAAc,CAAC;SACxB,QAAQ,CAAC,sBAAsB,CAAC;SAChC,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,QAAQ,CAAC,cAAc,CAAC,CAAC;IAE5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAgC,CAAC;QAC5F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACrB,KAAK;aACF,SAAS,CACR,QAAQ,EACR,IAAI,GAAG,EAAE,EACT,IAAI,IAAI,UAAU,GAAG,kBAAkB,GAAG,wBAAwB,GAAG,EAAE,EACvE;YACE,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,QAAQ;SAC1C,CACF;aACA,SAAS,CACR,WAAW,EACX,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,UAAU,GAAG,gBAAgB,GAAG,mBAAmB,EAC1D;YACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CACF;aACA,QAAQ,CAAC,IAAI,GAAG,mCAAmC,CAAC;aACpD,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;QACjC,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,KAAK,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;QAC5E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACrB,KAAK;aACF,SAAS,CACR,QAAQ,EACR,IAAI,GAAG,EAAE,EACT,IAAI,IAAI,UAAU,GAAG,kBAAkB,GAAG,4BAA4B,GAAG,EAAE,EAC3E;YACE,CAAC,aAAa,GAAG,EAAE,CAAC,EAAE,UAAU;SACjC,CACF;aACA,SAAS,CACR,WAAW,EACX,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,UAAU,GAAG,gBAAgB,GAAG,mBAAmB,EAC1D;YACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CACF;aACA,QAAQ,CAAC,IAAI,GAAG,6BAA6B,GAAG,GAAG,EAAE;YACpD,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;SAC1D,CAAC;aACD,QAAQ,CAAC,IAAI,GAAG,mCAAmC,CAAC;aACpD,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;QACjC,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,KAAK;SACF,SAAS,CAAC,IAAI,IAAI,WAAW,EAAE,UAAU,CAAC;SAC1C,SAAS,CAAC,IAAI,IAAI,KAAK,EAAE,QAAQ,CAAC;SAClC,SAAS,CAAC,IAAI,IAAI,aAAa,EAAE,YAAY,CAAC;SAC9C,SAAS,CAAC,IAAI,IAAI,cAAc,EAAE,aAAa,CAAC,CAAC;IAEpD,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC5B,KAAK;aACF,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;aAC7B,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;aAC3B,SAAS,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;aACjD,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC;aAC3C,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,IAAI,uBAAuB,IAAI,gBAAgB,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

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

@@ -12,7 +12,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serveHomePage = exports.PublicSiteController = void 0;
+exports.PublicSiteController = void 0;
+exports.serveHomePage = serveHomePage;
 const common_1 = require("@nestjs/common");
 const internal_server_lib_1 = require("@paroicms/internal-server-lib");
 const serve_text_or_1 = require("../../common/serve-text-or");
@@ -54,5 +55,4 @@ async function serveHomePage(siteContext, req, res, tracker) {
     });
     await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());
 }
-exports.serveHomePage = serveHomePage;
 //# sourceMappingURL=public-site.controller.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AAAA~~,2CAA2D;AAC3D,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,gFAAiF;AACjF,kEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAY,EAAS,GAAa;QACnD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAA;AARY,oDAAoB;AAEzB;IADL,IAAA,YAAG,GAAE;IACO,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAKtC;+BAPU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAQhC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,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,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,CAAC;QACxB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC~~;AAlBD,sCAkBC~~"}
1	+ {"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAuBA,sCAkBC;AAzCD,2CAA2D;AAC3D,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,gFAAiF;AACjF,kEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAY,EAAS,GAAa;QACnD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAA;AARY,oDAAoB;AAEzB;IADL,IAAA,YAAG,GAAE;IACO,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAKtC;+BAPU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAQhC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,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,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,CAAC;QACxB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDocumentHtml = void 0;
+exports.generateDocumentHtml = generateDocumentHtml;
 const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
 const text_cache_1 = require("../../../common/text-cache");
 const render_liquidjs_1 = require("../../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
@@ -35,7 +35,7 @@ async function generateDocumentHtml(siteContext, options, tracker) {
     if (completeDocUrl !== req.url) {
         return { status: 301, url: completeDocUrl, dependencyKeys: urlDependencyKeys };
     }
-    const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByLeafType)(siteContext.siteSchema, docValues.leafType);
+    const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteContext.siteSchema, docValues.typeName);
     const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, {
         cacheKey,
         tracker,
@@ -51,7 +51,6 @@ async function generateDocumentHtml(siteContext, options, tracker) {
         dependencyKeys: renderingContext.getDependencyKeys(),
     };
 }
-exports.generateDocumentHtml = generateDocumentHtml;
 function makeRegularPublicPayload(siteContext, renderingContext, docValues, url) {
     return {
         site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, docValues.language),

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

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":"~~;;;AAAA~~,~~2EAA4E~~;~~AAG5E~~,2DAAoE;AACpE,gGAAkG;AAClG,oGAGsE;AACtE,6EAA+E;AAE/E,uEAAuE;AAEvE,uDAA4D;AAC5D,6EAG6C;AAC7C,+EAA0E;AAiBnE,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,OAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE/C,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,IAAA,uDAAiC,EAAC,WAAW,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/F,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,2BAAgB,EACpD,WAAW,EACX,OAAO,EACP;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAEvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,2BAAgB,EAC/E,WAAW,EACX,OAAO,EACP;QACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;IACF,MAAM,cAAc,GAAG,GAAG,MAAM,GAAG,WAAW,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;IACrE,IAAI,cAAc,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACjF,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,~~iDAAyB~~,EAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;~~IAE3F~~,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;KACjE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,YAAY,CAAC,aAAa;QACzC,OAAO,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC;KACpF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;QACJ,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;KACrD,CAAC;AACJ,CAAC;~~AAhED,oDAgEC;~~AAED,SAAS,wBAAwB,CAC/B,WAAwB,EACxB,gBAAkC,EAClC,SAAoB,EACpB,GAAW;IAEX,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAC;QACxE,GAAG,EAAE,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC;KAC7E,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":"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"}

package/dist/plugins/plugin-api.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { Plugin } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../site-context/site-context.types";
-export declare function initialisePlugins(siteContext: SiteContext, plugins: Plugin[]): void;
+export declare function initialisePlugins(siteContext: SiteContext, plugins: Plugin[]): Promise<void>;

package/dist/plugins/plugin-api.js CHANGED Viewed

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialisePlugins = void 0;
+exports.initialisePlugins = initialisePlugins;
 const liquidjs_filter_1 = require("../liquidjs-tools/liquidjs-filter");
-function initialisePlugins(siteContext, plugins) {
+async function initialisePlugins(siteContext, plugins) {
     for (const p of plugins) {
         const api = createPluginApi(siteContext, p);
         try {
-            p.plugin.siteInit?.(api);
+            await p.plugin.siteInit?.(api);
         }
         catch (error) {
             siteContext.siteLog.error(`Failed initializing plugin '${p.pluginName}'`);
@@ -14,10 +14,10 @@ function initialisePlugins(siteContext, plugins) {
         }
     }
 }
-exports.initialisePlugins = initialisePlugins;
 function createPluginApi(siteContext, plugin) {
     const { liquidEngine } = siteContext;
     return {
+        siteLog: siteContext.siteLog,
         registerLiquidFilter(filterName, handler, options) {
             liquidEngine.registerFilter(filterName, {
                 handler: (0, liquidjs_filter_1.toLiquidJsFilterHandler)(siteContext, handler),
@@ -27,6 +27,9 @@ function createPluginApi(siteContext, plugin) {
         setPublicAssetsDirectory(directory) {
             plugin.publicAssetsDir = directory;
         },
+        setBoAssetsDirectory(directory) {
+            plugin.boAssetsDir = directory;
+        },
         addHeadTag(...htmlTags) {
             siteContext.headTags.push(...htmlTags);
         },

package/dist/plugins/plugin-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/plugins/plugin-api.ts"],"names":[],"mappings":"~~;;;AACA~~,uEAA4E;~~AAG5E~~,~~SAAgB~~,iBAAiB,CAAC,WAAwB,EAAE,OAAiB;~~IAC3E~~,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;~~QAC3B~~,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;YAC1E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC;~~AAVD,8CAUC;~~AAED,SAAS,eAAe,CAAC,WAAwB,EAAE,MAAc;IAC/D,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IAErC,OAAO;QACL,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO;YAC/C,YAAY,CAAC,cAAc,CAAC,UAAU,EAAE;gBACtC,OAAO,EAAE,IAAA,yCAAuB,EAAC,WAAW,EAAE,OAAO,CAAC;gBACtD,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,KAAK;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,SAAS;YAChC,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;QACrC,CAAC;QACD,UAAU,CAAC,GAAG,QAAQ;YACpB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,mBAAmB,CAAC,OAAO;YACzB,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC;QACpC,CAAC;QACD,sBAAsB,CAAC,QAAQ,EAAE,OAAO;YACtC,MAAM,oBAAoB,GAAG,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1E,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/plugins/plugin-api.ts"],"names":[],"mappings":";;AAIA,8CAUC;AAbD,uEAA4E;AAGrE,KAAK,UAAU,iBAAiB,CAAC,WAAwB,EAAE,OAAiB;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;YAC1E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,WAAwB,EAAE,MAAc;IAC/D,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IAErC,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO;YAC/C,YAAY,CAAC,cAAc,CAAC,UAAU,EAAE;gBACtC,OAAO,EAAE,IAAA,yCAAuB,EAAC,WAAW,EAAE,OAAO,CAAC;gBACtD,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,KAAK;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,SAAS;YAChC,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;QACrC,CAAC;QACD,oBAAoB,CAAC,SAAS;YAC5B,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;QACjC,CAAC;QACD,UAAU,CAAC,GAAG,QAAQ;YACpB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,mBAAmB,CAAC,OAAO;YACzB,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC;QACpC,CAAC;QACD,sBAAsB,CAAC,QAAQ,EAAE,OAAO;YACtC,MAAM,oBAAoB,GAAG,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1E,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/public-payload/breadcrumb.queries.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPublicBreadcrumb = void 0;
+exports.getPublicBreadcrumb = getPublicBreadcrumb;
 const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
 const text_cache_1 = require("../common/text-cache");
 const section_queries_1 = require("../modules/core/section/section.queries");
@@ -22,5 +22,4 @@ async function getPublicBreadcrumb(siteContext, renderingContext, documentId) {
     renderingContext.addDependencyKey(...items.map((item) => (0, text_cache_1.makeCacheDependencyKey)({ documentId: item.documentId })));
     return result;
 }
-exports.getPublicBreadcrumb = getPublicBreadcrumb;
 //# sourceMappingURL=breadcrumb.queries.js.map

package/dist/public-payload/breadcrumb.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"~~;;;AAAA~~,uEAAsF;AACtF,qDAA8D;AAE9D,6EAAwE;AACxE,2EAAgF;AAIzE,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAA2B;IAE3B,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAa,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAgB,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,IAAA,qCAAe,EAAC,IAAI,CAAC,UAAU,CAAC;YACpC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC~~;AAtBD,kDAsBC~~"}
1	+ {"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":";;AAQA,kDAsBC;AA9BD,uEAAsF;AACtF,qDAA8D;AAE9D,6EAAwE;AACxE,2EAAgF;AAIzE,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAA2B;IAE3B,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAa,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAgB,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,IAAA,qCAAe,EAAC,IAAI,CAAC,UAAU,CAAC;YACpC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}