npm - @paroicms/server - Versions diffs - 1.118.0 → 1.119.0 - Mend

@paroicms/server 1.118.0 → 1.119.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 (26) hide show

package/dist/admin-backend/document/document.resolver.js CHANGED Viewed

@@ -9,7 +9,7 @@ import { findOneDocumentSeed } from "../lnode/lnode.queries.js";
 import { findOneNode, getTypeNameOf } from "../node/node.queries.js";
 import { moveDocument as moveDocumentQuery } from "./document-moving.queries.js";
 import { getOneDocument } from "./load-documents.queries.js";
-import { createDocumentOnNode, createNodeWithDocument, deleteDocument, deleteNodeAndDocuments, parseDocumentMetadataValues, updateDocument, } from "./save-documents.queries.js";
+import { createDocumentOnNode, createNodeWithDocument, deleteDocument, deleteNodeAndDocuments, parseDocumentMetadataValues, updateDocument, updateNodeRelativeId, } from "./save-documents.queries.js";
 export const documentResolvers = {
     Query: {
         document: async (_parent, { documentId }, { siteContext, httpContext }) => {
@@ -24,9 +24,14 @@ export const documentResolvers = {
             const authorizedAccount = await permissionGuard(siteContext, httpContext, "document.edit");
             const lNodeId = parseLNodeId(id);
             const values = parseDocumentMetadataValues(valuesJson);
+            const { relativeId, ...documentValues } = values;
+            if (typeof relativeId === "string") {
+                await updateNodeRelativeId(siteContext, lNodeId, relativeId);
+            }
             const changedFields = Object.keys(values);
-            if (changedFields.length > 0) {
-                await updateDocument(siteContext, lNodeId, values);
+            const documentChangedFields = Object.keys(documentValues);
+            if (documentChangedFields.length > 0) {
+                await updateDocument(siteContext, lNodeId, documentValues);
             }
             const doc = await getOneDocument(siteContext, lNodeId);
             if (changedFields.length > 0) {
@@ -105,6 +110,7 @@ export const documentResolvers = {
             const documentId = await createNodeWithDocument(siteContext, {
                 parentId: parseLNodeId(parentDocumentId),
                 values: {
+                    relativeId: values.relativeId ?? undefined,
                     title: values.title ?? undefined,
                     slug: values.slug ?? undefined,
                     typeName: values.typeName,

package/dist/admin-backend/document/document.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAqB,MAAM,6BAA6B,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAOhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,2BAA2B,EAC3B,cAAc,~~GACf~~,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,KAAK,EAAE;QACL,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACxE,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,OAAO,MAAM,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1E,CAAC;KACF;IAED,QAAQ,EAAE;QACR,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC1F,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;YAGvD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;~~YAE1C~~,IAAI,~~aAAa~~,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;~~gBAC7B~~,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,~~MAAM~~,CAAC,CAAC;~~YACrD~~,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAEvD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9D,WAAW,CAAC,WAAW,EAAE;oBACvB,SAAS,EAAE,iBAAiB;oBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;oBACpC,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;oBAChC,SAAS,EAAE;wBACT,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,QAAQ;wBACR,KAAK,EAAE,GAAG,CAAC,KAAK;wBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,aAAa;qBACqB;iBACrC,CAAC,CAAC;YACL,CAAC;YAED,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9E,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;YAE1C,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAE9D,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAE5C,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,UAAU;gBACpB,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,YAAY,EAAE,KAAK,EACjB,OAAO,EACP,EAAE,cAAc,EAAE,eAAe,EAAE,EACnC,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAE3F,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;gBAC5C,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;aAC9C,CAAC,CAAC;YAEH,MAAM,iBAAiB,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAC;YAE1E,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,eAAe;gBAC1B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC3E,SAAS,EAAE;oBACT,cAAc;oBACd,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,eAAe,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;oBACpC,eAAe;iBACiB;aACnC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACtF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,MAAM,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB,EAAE,KAAK,EAC3B,OAAO,EACP,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC5B,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;gBAC3D,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC;gBACxC,MAAM,EAAE;oBACN,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS;oBAChC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS;oBAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,oBAAoB,EAAE,KAAK,EACzB,OAAO,EACP,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAC5B,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;gBACzD,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,MAAM;oBACZ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS,EAAE;oBACtE,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KACF;IAED,QAAQ,EAAE;QACR,KAAK,CAAC,GAAG,CAAC,MAAoB,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE;YACtD,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,WAAW,EACX,eAAe,EAAE,EACjB;gBACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;YACF,OAAO,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,CAAC;KACF;CACF,CAAC"}
1	+ {"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.resolver.ts"],"names":[],"mappings":"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"}

package/dist/admin-backend/document/save-documents.queries.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export declare function parseDocumentMetadataValues(jsonVal: string): UpdateDocumentMetadataValues;
 export interface CreateNodeWithDocumentValues {
+    relativeId?: string;
     slug?: string;
     title?: string;
     typeName: string;
@@ -14,6 +15,7 @@ export declare class CreateDocumentValues {
 export declare function updateDocument(siteContext: SiteContext, documentId: ParsedLNodeId, values: UpdateDocumentMetadataValues, options?: {
     skipHistory?: boolean;
 }): Promise<void>;
+export declare function updateNodeRelativeId(siteContext: SiteContext, documentId: ParsedLNodeId, relativeId: string): Promise<void>;
 export declare function createDocumentOnNode(siteContext: SiteContext, { language, nodeId, values, forceReady, }: {
     language: string;
     nodeId: string;

package/dist/admin-backend/document/save-documents.queries.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { getDocumentTypeByName, getNodeTypeByName, isRootOfRoutingCluster, isRootOfSubRoutingCluster, } from "@paroicms/internal-anywhere-lib";
-import { isDef } from "@paroicms/public-anywhere-lib";
+import { generateSlug, isDef } from "@paroicms/public-anywhere-lib";
 import { ApiError, getHandleOfFeaturedImage } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 import { invalidateDocumentInCache, invalidateDocumentRelationCache, invalidateMultipleDocumentsInCache, } from "../../common/text-cache.js";
@@ -15,6 +15,7 @@ import { getParentDocumentIdsOf, getParentLNodeIdOf, getParentNodeIdOf, } from "
 const UpdateDocumentMetadataValuesAT = type({
     "title?": "string|null",
     "slug?": "string|null",
+    "relativeId?": "string|null",
     "metaDescription?": "string|null",
     "metaKeywords?": "string|null",
     "+": "reject",
@@ -56,6 +57,33 @@ export async function updateDocument(siteContext, documentId, values, options) {
         perimeter: isDef(values.slug) ? "slug" : undefined,
     });
 }
+const UpdateNodeParentIdRowAT = type({
+    parentId: "string|number",
+    "+": "reject",
+});
+export async function updateNodeRelativeId(siteContext, documentId, relativeId) {
+    const { cn } = siteContext;
+    const { nodeId } = documentId;
+    if (generateSlug(relativeId) !== relativeId) {
+        throw new ApiError("invalid relativeId format", 400);
+    }
+    const parentRow = await cn("PaNode").select("parentId").where("id", nodeId).first();
+    if (!parentRow)
+        throw new ApiError("node not found", 404);
+    const { parentId } = UpdateNodeParentIdRowAT.assert(parentRow);
+    const existing = await cn("PaNode")
+        .select("id")
+        .where({ parentId, relativeId })
+        .whereNot("id", nodeId)
+        .first();
+    if (existing)
+        throw new ApiError("relativeId already in use", 409);
+    await cn("PaNode").where("id", nodeId).update({ relativeId });
+    await invalidateDocumentInCache(siteContext, {
+        documentId,
+        perimeter: "slug",
+    });
+}
 export async function createDocumentOnNode(siteContext, { language, nodeId, values, forceReady, }) {
     const { cn, siteSchema } = siteContext;
     const typeName = await getTypeNameOf({ cn: siteContext.cn }, nodeId);
@@ -125,9 +153,25 @@ export async function createNodeWithDocument(siteContext, { parentId, values, fo
         }
     }
     const documentId = await siteContext.cn.transaction(async (tx) => {
+        let providedRelativeId;
+        if (documentType.documentKind === "regular" && documentType.route === ":relativeId") {
+            if (!values.relativeId)
+                throw new ApiError("relativeId is required", 400);
+            if (generateSlug(values.relativeId) !== values.relativeId) {
+                throw new ApiError("invalid relativeId format", 400);
+            }
+            const existing = await tx("PaNode")
+                .select("id")
+                .where({ parentId: parentNodeId, relativeId: values.relativeId })
+                .first();
+            if (existing)
+                throw new ApiError("relativeId already in use", 409);
+            providedRelativeId = values.relativeId;
+        }
         const { id: nodeId } = await createNode(siteContext.siteSchema, tx, {
             parentId: parentNodeId,
             typeName: values.typeName,
+            relativeId: providedRelativeId,
         });
         const newId = await createDocumentWithManager({
             language,

package/dist/admin-backend/document/save-documents.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/save-documents.queries.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/save-documents.queries.ts"],"names":[],"mappings":"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"}

package/dist/connector/db-init/init-node-queries.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { type ScSiteSchema } from "@paroicms/public-anywhere-lib";
 import type { Knex } from "knex";
 import type { NodeRow } from "../row-types.js";
-export declare function createNode(siteSchema: ScSiteSchema, cn: Knex | Knex.Transaction, { parentId, typeName, }: {
+export declare function createNode(siteSchema: ScSiteSchema, cn: Knex | Knex.Transaction, { parentId, typeName, relativeId, }: {
     parentId?: string;
     typeName: string;
+    relativeId?: string;
 }): Promise<NodeRow>;
 export declare function findAvailableRelativeId(siteSchema: ScSiteSchema, cn: Knex | Knex.Transaction, { parentId, typeName, }: {
     parentId?: string;

package/dist/connector/db-init/init-node-queries.js CHANGED Viewed

@@ -14,7 +14,7 @@ const CreateNodeInsertedAT = type({
     id: String(r.id),
     publishDate: parseSqliteDateTime(r.publishDate),
 }));
-export async function createNode(siteSchema, cn, { parentId, typeName, }) {
+export async function createNode(siteSchema, cn, { parentId, typeName, relativeId, }) {
     if (typeName === "_site") {
         if (isDef(parentId))
             throw new Error(`cannot create site node with parentId '${parentId}'`);
@@ -30,7 +30,7 @@ export async function createNode(siteSchema, cn, { parentId, typeName, }) {
             throw new Error(`invalid parentTypeName '${parentNode.typeName}'`);
         }
     }
-    const newRelativeId = await findAvailableRelativeId(siteSchema, cn, { parentId, typeName });
+    const newRelativeId = relativeId ?? (await findAvailableRelativeId(siteSchema, cn, { parentId, typeName }));
     const [inserted] = await cn("PaNode")
         .insert({
         parentId,

package/dist/connector/db-init/init-node-queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init-node-queries.js","sourceRoot":"","sources":["../../../src/connector/db-init/init-node-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EACL,KAAK,GAGN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAI/B,MAAM,sBAAsB,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,IAAI,CAAC;IAChC,EAAE,EAAE,QAAQ;IACZ,WAAW,EAAE,oBAAoB;IACjC,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC;CAChD,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,UAAwB,EACxB,EAA2B,EAC3B,EACE,QAAQ,EACR,QAAQ,~~GAIT~~;IAED,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,GAAG,CAAC,CAAC;IAC9F,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,oBAAoB,CAAC,CAAC;QAE3F,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;QAEhF,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,GAAG,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEtD,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,MAAM,aAAa,~~GAAG~~,MAAM,uBAAuB,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;~~IAE5F~~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"}
1	+ {"version":3,"file":"init-node-queries.js","sourceRoot":"","sources":["../../../src/connector/db-init/init-node-queries.ts"],"names":[],"mappings":"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"}

package/dist/connector/site-schema/site-schema-factory.js CHANGED Viewed

@@ -9,7 +9,12 @@ import { completeSchemaLocales, createEmptySchemaLocales, importPartOfL10n, make
 import { prepareLib } from "./schema-lib.js";
 import { checkSiteSchemaFormatVersion } from "./site-schema-helpers.js";
 const StringAT = type("string");
-const authorizedClassicRoute = new Set([":relativeId-:slug", ":yyyy/:mm/:dd/:relativeId-:slug"]);
+const authorizedClassicRoute = new Set([
+    ":relativeId-:slug",
+    ":yyyy/:mm/:dd/:relativeId-:slug",
+    ":slug",
+    ":relativeId",
+]);
 const invalidFieldNames = ["featuredImage", "adminUiFavicon"];
 export async function loadSiteSchema({ logger, regSite, commonSchemaLib, pluginStaticConfigurations, trusted, }) {
     const jtRead = await readJtSiteSchema(join(regSite.siteDir, "site-schema.json"));

package/dist/connector/site-schema/site-schema-factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"site-schema-factory.js","sourceRoot":"","sources":["../../../src/connector/site-schema/site-schema-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AA8BzE,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,uBAAuB,GAIxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAExE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;AAEhC,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,mBAAmB,EAAE,iCAAiC,CAAC,CAAC,CAAC;AACjG,MAAM,iBAAiB,GAAG,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAqB9D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,MAAM,EACN,OAAO,EACP,eAAe,EACf,0BAA0B,EAC1B,OAAO,GAOR;IAaC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAEjF,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,SAAS,EAAE,MAAM,CAAC,QAAQ;SAC3B,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACzF,MAAM,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAE5D,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;QAC3B,MAAM;QACN,OAAO;QACP,0BAA0B;QAC1B,eAAe;QACf,SAAS;QACT,iBAAiB,EAAE,QAAQ,CAAC,OAAO;KACpC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE5E,MAAM,kBAAkB,GACtB,QAAQ,CAAC,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,kBAAkB,IAAI,yBAAyB,CAAC;IAC5F,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAExF,MAAM,cAAc,GAAG,QAAQ,CAAC,mBAAmB,IAAI,MAAM,CAAC;IAC9D,MAAM,mBAAmB,GACvB,cAAc,KAAK,MAAM;QACvB,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YACtB,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,WAAW;QACf,CAAC,CAAC,cAAc,CAAC;IAErB,MAAM,SAAS,GAAiB;QAC9B,SAAS;QACT,cAAc,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC;QACpC,mBAAmB;QACnB,cAAc,EAAE,sBAAsB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;QAC5E,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7B,SAAS,EAAE;YACT,KAAK,EAAE,SAAgB;YACvB,IAAI,EAAE,SAAgB;SACvB;QACD,aAAa,EAAE;YACb,OAAO,EAAE,SAAgB;SAC1B;QACD,kBAAkB;QAClB,IAAI;KACL,CAAC;IAEF,MAAM,GAAG,GAAmB;QAC1B,GAAG;QACH,SAAS;QACT,qBAAqB,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5F,eAAe,EAAE,EAAE;QACnB,OAAO;KACR,CAAC;IAEF,2BAA2B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3C,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACjC,6BAA6B,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,qBAAqB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnD,qCAAqC,CAAC,SAAS,CAAC,CAAC;IAGjD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,cAAc,GAAG,sBAAsB,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE7F,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,mBAAmB,GAAG,GAAG,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,mBAAmB,EAAE,CAAC;YACxB,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;YACD,SAAS,CAAC,aAAa,CAAC,OAAO,GAAG,mBAA2C,CAAC;QAChF,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,aAAa,CAAC,OAAO,GAAG,kBAAkB,CAAC;QACvD,CAAC;IACH,CAAC;IAED,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,SAAS;QACrB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAChD,iBAAiB,EAAE,QAAQ,CAAC,aAAa,IAAI,EAAE;KAChD,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,GAAmB,EAAE,QAAsB;IAC9E,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IAC1B,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAChE,IAAI,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,GAAG,CAAC,CAAC;QACzF,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,MAAM;gBACT,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACtD,MAAM;YACR,KAAK,UAAU;gBACb,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE;oBACvD,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,SAAS,CAAC,SAAS;iBAC/B,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,MAAM;gBACT,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3E,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,2BAA4B,IAAmB,CAAC,IAAI,GAAG,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC/B,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC;IACrD,SAAS,CAAC,SAAS,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,2BAA2B,CAAC,GAAmB;IACtD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;IAC3C,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,MAAM;QACjB,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;YAAE,SAAS;QACjD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,UAAU;gBACb,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACrC,aAAa,EAAE,IAAI;oBACnB,YAAY,EAAE,IAAI,CAAC,YAAY;iBAChC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,MAAM;gBACT,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5D,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,2BAA4B,IAA+B,CAAC,IAAI,GAAG,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,GAAmB;IACxD,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IAC1B,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;IAEhD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,IAAI,WAAW,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAC9E,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7E,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;SAAM,CAAC;QAGN,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACpF,kBAAkB,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;IAGD,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IAC1C,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,sBAAsB,GAAG,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC;IAC9D,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,QAAQ,CAAC,eAAe,GAAG,CAAC,GAAG,sBAAsB,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,GAAmB,EAAE,QAAgC;IAC3E,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC/B,gBAAgB,CAAC;QACf,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI;QACrB,QAAQ,EAAE,CAAC,YAAY,CAAC;QACxB,EAAE,EAAE,SAAS,CAAC,IAAI;QAClB,MAAM,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC;QACxC,WAAW,EAAE,WAAW;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC;IACrF,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAc,CAAC,IAAI,EAAE,EAAE,CAC1D,OAAO,IAAI,KAAK,QAAQ;QACtB,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE;YACnB,kBAAkB,EAAE,IAAI;YACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;YACxB,YAAY,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC;SAC/C,CAAC;QACJ,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAC3B,CAAC;IACF,mBAAmB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAErC,MAAM,QAAQ,GAAe;QAC3B,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC;KAClF,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;QAC5E,IAAI,YAAY,EAAE,CAAC;YACjB,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,cAAc,CACrB,GAAmB,EACnB,EACE,QAAQ,EACR,SAAS,GAIV;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IAE1B,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;IACnC,MAAM,MAAM,GACV,UAAU,KAAK,SAAS;QACtB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE;gBACnB,kBAAkB,EAAE,IAAI;gBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI;gBACxB,YAAY,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;aACzD,CAAC;YACJ,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAC3B,CAAC;IAER,IAAI,MAAM;QAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAE9C,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACxC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAClC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,qBAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,8BAA8B,CAAC,GAAmB,EAAE,QAAwB;IACnF,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QAC5C,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACtC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,KAAK,MAAM,aAAa,IAAI,QAAQ,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;QAC3D,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;YACvB,QAAQ,EAAE,aAAa;YACvB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,MAAM,aAAa,IAAI,QAAQ,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;QAC3D,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;YACvB,QAAQ,EAAE,aAAa;YACvB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAA+B,EAC/B,SAAmB,EACnB,MAAiC;IAEjC,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,KAAoC,CAAC;IACzC,IAAI,QAAQ,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC7D,CAAC;QACD,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,QAAQ,GACZ,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;QAC7D,CAAC,CAAC,QAAQ,CAAC,eAAe;QAC1B,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,QAAQ,CAAC,cAAc,IAAI,QAAQ,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,QAAQ,8DAA8D,CAC7F,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,QAAQ,0DAA0D,CACzF,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,IAAI,0BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEzF,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,SAAS;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS;QACT,KAAK;QACL,UAAU,EAAE,QAAQ,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU;QAC1E,MAAM;QACN,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,eAAe,EAAE,QAAQ;QACzB,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;YACrD,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC;YAC/C,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,aAAa,EAAE,CAAC,SAAS,CAAC;QAC1B,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAAgB;IAClC,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CACjB,KAAmC,EACnC,SAAmB,EACnB,eAAgD;IAEhD,MAAM,QAAQ,GAAmC,EAAE,CAAC;IAEpD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,QAAQ,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAE1E,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YACrF,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,QAAQ,kBAAkB,CAAC,CAAC;YACrF,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YACvE,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAA+B,EAC/B,MAAiC;IAEjC,IACE,QAAQ,CAAC,KAAK;QACd,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EACnF,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,QAAQ,GACZ,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;QAC7D,CAAC,CAAC,QAAQ,CAAC,eAAe;QAC1B,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,QAAQ,CAAC,cAAc,IAAI,QAAQ,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,QAAQ,8DAA8D,CAC7F,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,IAAI,0BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEzF,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,SAAS;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS;QACT,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,MAAM;QACN,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,eAAe,EAAE,QAAQ;QACzB,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;YACrD,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC;YAC/C,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,mBAAmB,EAAE,+BAA+B,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YACjF,OAAO,EAAE,qBAAqB;SAC/B,CAAC;QACF,aAAa,EAAE,CAAC,SAAS,CAAC;QAC1B,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,GAA0C,EAC1C,aAAkC;IAElC,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,4BAA4B,aAAa,CAAC,OAAO,GAAG,CAAC,CAAC;IACxE,CAAC;IACD,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,OAAO,GAAgC,CAAC;AAC1C,CAAC;AAED,SAAS,qCAAqC,CAAC,UAAwB;IACrE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAEvC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;YAAE,SAAS;QACvC,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,SAAS;QAE/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAEnC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,KAAK,CAAC,QAAQ,KAAK,UAAU;gBAAE,SAAS;YAE5C,MAAM,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC;YAGxC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAEzC,MAAM,uBAAuB,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACtE,MAAM,qBAAqB,GACzB,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ;oBACpE,CAAC,CAAC,uBAAuB,CAAC,MAAM;oBAChC,CAAC,CAAC,SAAS,CAAC;gBAChB,MAAM,oBAAoB,GACxB,qBAAqB,IAAI,OAAO,qBAAqB,KAAK,QAAQ;oBAChE,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC;oBACnC,CAAC,CAAC,SAAS,CAAC;gBAChB,MAAM,kBAAkB,GACtB,oBAAoB,IAAI,OAAO,oBAAoB,KAAK,QAAQ;oBAC9D,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBAC5B,CAAC,CAAC,SAAS,CAAC;gBAChB,IAAI,kBAAkB;oBAAE,SAAS;gBAGjC,MAAM,uBAAuB,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC;gBAC9E,MAAM,aAAa,GACjB,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ;oBACpE,CAAC,CAAC,uBAAuB,CAAC,KAAK;oBAC/B,CAAC,CAAC,SAAS,CAAC;gBAChB,IAAI,CAAC,aAAa;oBAAE,SAAS;gBAG7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAC1C,CAAC;gBACD,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACjE,IAAI,OAAO,qBAAqB,KAAK,QAAQ;oBAAE,SAAS;gBAExD,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC;oBAClC,qBAAqB,CAAC,MAAM,GAAG,EAAE,CAAC;gBACpC,CAAC;gBACD,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,MAAM,CAAC;gBACzD,IAAI,OAAO,mBAAmB,KAAK,QAAQ;oBAAE,SAAS;gBAEtD,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACrC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvC,CAAC;gBACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3D,IAAI,OAAO,kBAAkB,KAAK,QAAQ;oBAAE,SAAS;gBAGrD,kBAAkB,CAAC,KAAK,GAAG,aAAa,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,SAAuB;IACzD,IACE,SAAS,CAAC,SAAS,CAAC,IAAI;QACxB,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU;YAC3C,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC,EACtD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;YAAE,SAAS;QAC3C,IAAI,UAA8B,CAAC;QACnC,KAAK,MAAM,aAAa,IAAI,QAAQ,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,gCAAgC,aAAa,GAAG,CAAC,CAAC;YACpE,CAAC;YACD,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACrC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7B,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC3B,CAAC;qBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;oBACtC,MAAM,IAAI,KAAK,CACb,wBAAwB,UAAU,UAAU,KAAK,CAAC,KAAK,oCAAoC,QAAQ,CAAC,QAAQ,GAAG,CAChH,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;YAAE,SAAS;QAC3C,iCAAiC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAGD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;YAAE,SAAS;QAC3C,IAAI,QAAQ,CAAC,QAAQ,KAAK,MAAM;YAAE,SAAS;QAE3C,IAAI,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,CAAC,QAAQ,6EAA6E,CACjH,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iCAAiC,CAAC,QAAwB,EAAE,MAAoB;IACvF,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,KAAK,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5F,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,QAAQ,gCAAgC,CAAC,CAAC;IAC1F,CAAC;IAED,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;QAChG,IACE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;YAC3C,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAC3C,CAAC;YACD,MAAM,IAAI,KAAK,CACb,qBAAqB,QAAQ,CAAC,QAAQ,8CAA8C,CACrF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC7B,KAAK,MAAM,SAAS,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;YACjD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,SAAS,SAAS,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;YACpF,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CACb,UAAU,SAAS,SAAS,QAAQ,CAAC,QAAQ,8BAA8B,CAC5E,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,GAAmB,EAAE,QAAoB,EAAE,IAAqB;IAClF,MAAM,MAAM,GACV,QAAQ,CAAC,MAAM,KAAK,SAAS;QAC3B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE;gBACnB,kBAAkB,EAAE,IAAI;gBACxB,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;aACzD,CAAC;YACJ,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAC3B,CAAC;IACR,IAAI,MAAM;QAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3C,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEtD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS;QACT,MAAM;QACN,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACjB,CAAC,CAAC;gBACE,QAAQ,EAAE,sBAAsB;gBAChC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;gBAC1B,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;gBAC1B,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;aAC7C;YACH,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,GAAmB,EACnB,QAAgB,EAChB,OAAyE;IAEzE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC/B,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAA2B,CAAC;IAC7E,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,cAAc,QAAQ,oCAAoC,YAAY,CAAC,IAAI,EAAE,CAC9E,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CACb,cAAc,QAAQ,mBAAmB,YAAY,QAAQ,YAAY,CAAC,YAAY,EAAE,CACzF,CAAC;QACJ,CAAC;QACD,IAAI,aAAa;YAAE,OAAO;QAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,GAAG,CAAC,CAAC;IACzD,CAAC;IAED,gBAAgB,CAAC;QACf,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC;QACjC,EAAE,EAAE,SAAS,CAAC,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,0BAA0B,YAAY,GAAG,CACjF,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE;QAClD,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B,CAAC,CAAC;IAEH,8BAA8B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,cAAc,CACrB,GAAmB,EACnB,QAAgB,EAChB,UAAuC,EAAE;IAEzC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC/B,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAA2B,CAAC;IAC7E,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,YAAY,CAAC,IAAI,KAAK,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,GAAG,CAAC,CAAC;QACxF,IAAI,OAAO,CAAC,aAAa;YAAE,OAAO;QAClC,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,GAAG,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,GAAG,CAAC,CAAC;IAE9F,gBAAgB,CAAC;QACf,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC;QACjC,EAAE,EAAE,SAAS,CAAC,IAAI;KACnB,CAAC,CAAC;IAEH,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,GAAmB,EACnB,UAAkB,EAClB,UAAuC,EAAE;IAEzC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC/B,IAAI,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,IAAI,OAAO,CAAC,aAAa;YAAE,OAAO;QAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,QAAQ,GACZ,GAAG,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACpF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,UAAU,GAAG,CAAC,CAAC;IAEvE,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAY;IAW1C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE;QAChC,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,GAAG,GACP,IAAI,CAAC,+BAA+B;QACpC,CAAC,IAAI,CAAC,mBAAmB,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,uBAAuB,EAAE,CAAC;QAC/D,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,uBAAuB,EAAE,GAAG;YAC5B,QAAQ,EAAE,IAAI;SACf,CAAC;IACJ,CAAC;IACD,4BAA4B,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,MAAM,MAAM,CAAC,KAAK,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAoB;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,GAAmB,EACnB,EACE,kBAAkB,EAClB,QAAQ,EACR,YAAY,GAKb;IAED,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IACpB,IAAI,CAAC,CAAC,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,kBAAkB,kBAAkB,GAAG,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC1E,gBAAgB,CAAC;QACf,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAC5C,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,CAAC,GAAG,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC;KACtC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,GAAmB,EAAE,QAAqB;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEzC,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CACb,uBAAuB,QAAQ,CAAC,IAAI,yDAAyD;YAC3F,mEAAmE,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC7E,MAAM,KAAK,GACT,QAAQ,CAAC,QAAQ,KAAK,UAAU;QAC9B,CAAC,CAAC;YACE,GAAG,QAAQ;YACX,QAAQ,EAAE,UAAU;YACpB,aAAa;SACd;QACH,CAAC,CAAC;YACE,GAAG,QAAQ;YACX,aAAa;SACd,CAAC;IACR,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,IAAI,qBAAqB,MAAM,GAAG,CAAC,CAAC;QACnE,CAAC;QACD,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC;IAC5B,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACrC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;YACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAiD;IAClF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM;aACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClF,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA0B,EAAE,GAAoC;IAC3F,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1F,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpE,YAAY,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;IACxC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,WAAW,GAAG,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAS;IACjC,OAAO,CAAC;SACL,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;SAC/C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC"}
1	+ {"version":3,"file":"site-schema-factory.js","sourceRoot":"","sources":["../../../src/connector/site-schema/site-schema-factory.ts"],"names":[],"mappings":"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"}

package/dist/express/site-middleware.js CHANGED Viewed

@@ -22,7 +22,7 @@ import { favicon16x16Controller, robotsTxtController, } from "../rendered-site/c
 import { feedReqHandler } from "../rendered-site/feed/feed.req-handler.js";
 import { serveCacheImageController, serveFilecontroller, } from "../rendered-site/media-serve/media-serve.controller.js";
 import { previewReqHandler } from "../rendered-site/preview.req-handler.js";
-import { renderedSiteReqHandler } from "../rendered-site/rendered-site.req-handler.js";
+import { siteRouterReqHandler } from "../rendered-site/site-router.req-handler.js";
 import { mergeExpressMiddlewares } from "./express-utils.js";
 import { toPaHttpContext } from "./pa-http-context.js";
 import { pluginPublicApiReqHandler } from "./public-api.req-handler.js";
@@ -88,7 +88,7 @@ export function createRenderedSiteMiddleware() {
             renderedPageAssetsReqHandler,
             feedReqHandler,
             previewReqHandler,
-            renderedSiteReqHandler,
+            siteRouterReqHandler,
         ])),
         router,
     ]);

package/dist/express/site-middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,OAAgC,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAC1F,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EACL,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,~~sBAAsB~~,EAAE,MAAM~~,+CAA+C~~,CAAC;~~AACvF~~,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GACjC,MAAM,oCAAoC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,8BAA8B;IAClD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;IAE/D,MAAM,YAAY,GAAG,IAAI,YAAY,CAAiB;QACpD,QAAQ;QACR,SAAS,EAAE,iBAAiB,EAAE;QAC9B,OAAO,EAAE;YACP,sBAAsB,EAAE;YACxB,0BAA0B,EAAE;YAC5B,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,yBAAyB,EAAE,CAAC,CAAC;SAC1D;QACD,aAAa,EAAE,eAAe;QAC9B,WAAW,CAAC,cAAc,EAAE,KAAK;YAC/B,IAAI,KAAK,YAAY,YAAY,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE,CAAC;gBACvF,OAAO,cAAc,CAAC;YACxB,CAAC;YAED,cAAc,CAAC,KAAK,CAAC,0BAA0B,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;YACxE,OAAO;gBACL,OAAO,EAAE,uBAAuB;gBAChC,IAAI,EAAE,uBAAuB;aAC9B,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IACH,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;IAG3B,OAAO,iBAAiB,CAAC,YAAY,EAAE;QACrC,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAA2B,EAAE,CAAC,CAAC;YACzD,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC;YAClC,WAAW,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;SACvC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,MAAM,CAAC,IAAI,CACT,qBAAqB,EACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,mBAAmB,CAAC,qBAAqB,CAAC,CAC3C,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,iCAAiC,EAAE,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC7F,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7F,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpE,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAExE,OAAO,uBAAuB,CAAC;QAC7B,6BAA6B,CAC3B,gBAAgB,CAAC,CAAC,gCAAgC,EAAE,wBAAwB,CAAC,CAAC,CAC/E;QACD,MAAM;QACN,6BAA6B,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;KAChF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC1F,MAAM,CAAC,GAAG,CACR,qDAAqD,EACrD,mBAAmB,CAAC,yBAAyB,CAAC,CAC/C,CAAC;IAEF,OAAO,uBAAuB,CAAC;QAC7B,6BAA6B,CAC3B,gBAAgB,CAAC;YACf,uBAAuB;YACvB,qBAAqB;YACrB,yBAAyB;YACzB,4BAA4B;YAC5B,cAAc;YACd,iBAAiB;YACjB,~~sBAAsB~~;~~SACvB~~,CAAC,CACH;QACD,MAAM;KACP,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/page-route/make-url.js CHANGED Viewed

@@ -98,6 +98,15 @@ function makeDocumentUrl(siteContext, ancestors, language) {
                 urlSegments.push(String(publishDate.getDate()).padStart(2, "0"));
                 urlSegments.push(makeRelativeIdSlugUrlPart(ancestor));
             }
+            else if (docType.route === ":slug") {
+                if (!ancestor.slug) {
+                    throw new Error(`missing slug in '${docType.typeName}' for route ':slug'`);
+                }
+                urlSegments.push(ancestor.slug);
+            }
+            else if (docType.route === ":relativeId") {
+                urlSegments.push(ancestor.relativeId);
+            }
             else {
                 throw new Error(`in '${docType.typeName}', unknown value for route: '${docType.route}'`);
             }

package/dist/rendered-site/page-route/make-url.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EACL,wBAAwB,GAEzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,MAAM,UAAU,UAAU,CACxB,WAAwD,EACxD,QAAgB,EAChB,OAAmC;IAEnC,MAAM,GAAG,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9F,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACtE,CAAC;AAoBD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,UAKI,EAAE;IAEN,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE,CACvC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAG9D,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChF,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;gBAAE,OAAO,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAChF,OAAO;gBACL,GAAG,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC;gBACvC,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;aACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACnF,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAGlE,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;QAChC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAC7B,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,cAAwB,CAAC;QAC7B,IAAI,GAAW,CAAC;QAChB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxC,cAAc,GAAG,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;YACjE,cAAc,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QACvE,CAAC;QAGD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAC/E,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;gBACE,QAAQ;gBACR,KAAK,EAAE,GAAG;gBACV,cAAc;aACf,EACD,OAAO,CACR,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxF,CAAC;IAGD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAG,cAAc,CAC/B,WAAW,CAAC,aAAa,EACzB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,MAAM,CAClB,CAAC;QACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC,uBAAuB;YACpC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,YAAY,CAAC,EAAE;YACnD,CAAC,CAAC,QAAQ,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,CAAC,WAAW;QAAE,OAAO;IAChC,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,QAAQ,wBAAwB,CAAC,CAAC;AACjG,CAAC;AAID,SAAS,2BAA2B,CAClC,SAAiC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,QAAQ,CAAC,KAAK;YACf,QAAQ,CAAC,WAAW,KAAK,SAAS;YAClC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,EACpC,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC;IACD,OAAO,SAAwC,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CACtB,WAA4C,EAC5C,SAAsC,EACtC,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,WAAW,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpD,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACpD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,4CAA4C,QAAQ,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC/G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAErE,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;gBAEjC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACrE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACtE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACjE,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,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,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiC,EAAE,QAAgB;IAChF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5B,sBAAsB,CAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAA0B;IAC3D,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"}
1	+ {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/page-route/page-route-parser.d.ts CHANGED Viewed

@@ -12,11 +12,20 @@ export interface RoutingDocumentHierarchyEntry {
     entryKind: "routing";
     documentType: ScRoutingDocumentType;
 }
-export interface RegularDocumentHierarchyEntry {
+export type RegularDocumentHierarchyEntry = RelativeIdHierarchyEntry | SlugHierarchyEntry;
+interface RegularDocumentHierarchyEntryBase {
     entryKind: "regular";
-    relativeId: string;
     candidateTypes: ScRegularDocumentType[];
     isClusterRoot: boolean;
 }
+export interface RelativeIdHierarchyEntry extends RegularDocumentHierarchyEntryBase {
+    lookupKind: "relativeId";
+    relativeId: string;
+}
+export interface SlugHierarchyEntry extends RegularDocumentHierarchyEntryBase {
+    lookupKind: "slug";
+    slug: string;
+}
 export declare function parsePageRoute(siteContext: Pick<SiteContext, "siteSchema">, urlPath: string): ParsedPageRoute | undefined;
 export declare function findParentParsedRouteWithDocument(parsedRoute: ParsedPageRoute): ParsedPageRoute | undefined;
+export {};

package/dist/rendered-site/page-route/page-route-parser.js CHANGED Viewed

@@ -166,13 +166,16 @@ function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         if (!found)
             return;
         const isClusterRoot = found.candidateTypes.some((type) => (type.routingChildren?.length ?? 0) > 0);
+        const lookupFields = found.lookupKind === "relativeId"
+            ? { lookupKind: found.lookupKind, relativeId: found.relativeId }
+            : { lookupKind: found.lookupKind, slug: found.slug };
         documentHierarchy.push({
             entryKind: "regular",
-            relativeId: found.relativeId,
+            ...lookupFields,
             candidateTypes: found.candidateTypes,
             isClusterRoot,
         });
-        urlCacheKey.push(`regular:${found.relativeId}`);
+        urlCacheKey.push(found.lookupKind === "relativeId" ? `regular:${found.relativeId}` : `slug:${found.slug}`);
         lastRedirectTo = undefined;
         currentIndex += found.skipUrlSegments;
         candidates = found.candidateTypes;
@@ -338,6 +341,7 @@ function findRegularDocumentByUrlPath({ siteSchema, parentCandidates, urlSegment
         const urlPath = urlSegments[partsIndex];
         const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
+            lookupKind: "relativeId",
             relativeId,
             candidateTypes,
             skipUrlSegments: 1,
@@ -353,11 +357,30 @@ function findRegularDocumentByUrlPath({ siteSchema, parentCandidates, urlSegment
         const urlPath = urlSegments[partsIndex + 3];
         const relativeId = parseRegularRelativeIdSlug(urlPath);
         return {
+            lookupKind: "relativeId",
             relativeId,
             candidateTypes,
             skipUrlSegments: 4,
         };
     }
+    if (route === ":slug") {
+        const slug = urlSegments[partsIndex];
+        return {
+            lookupKind: "slug",
+            slug,
+            candidateTypes,
+            skipUrlSegments: 1,
+        };
+    }
+    if (route === ":relativeId") {
+        const relativeId = urlSegments[partsIndex];
+        return {
+            lookupKind: "relativeId",
+            relativeId,
+            candidateTypes,
+            skipUrlSegments: 1,
+        };
+    }
 }
 function parseRegularRelativeIdSlug(urlPath) {
     const index = urlPath.indexOf("-");
@@ -397,7 +420,9 @@ function findParentParsedRoute(parsedRoute) {
     if (!lastEntry)
         return;
     if (lastEntry.entryKind === "regular") {
-        const expectedKey = `regular:${lastEntry.relativeId}`;
+        const expectedKey = lastEntry.lookupKind === "relativeId"
+            ? `regular:${lastEntry.relativeId}`
+            : `slug:${lastEntry.slug}`;
         if (urlCacheKey[urlCacheKey.length - 1] === expectedKey) {
             urlCacheKey.pop();
         }