@paroicms/server 1.30.0 → 1.31.0

package/dist/modules/public-site/liquidjs-filters/info-filter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.infoLiquidJsFilter = void 0;
 const html_helpers_1 = require("../../../common/mail/html-helpers");
 const liquidjs_drop_1 = require("../../../liquidjs-tools/liquidjs-drop");
+const ignoreDeprecatedKeys = new Set(["lang", "flaggedWith", "flaggedWithOne"]);
 async function infoLiquidJsFilter(val) {
     const result = await valueToInfo(val, 0);
     const divCss = [
@@ -66,7 +67,7 @@ async function valueToInfo(val, depth, options = {}) {
 async function makeTableInfo(obj, childDepth, options) {
     const items = [];
     for (const name of Object.keys(obj)) {
-        if (name === "lang")
+        if (ignoreDeprecatedKeys.has(name))
             continue;
         const value = obj[name];
         items.push({

package/dist/modules/public-site/liquidjs-filters/info-filter.js.map

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

package/dist/modules/public-site/liquidjs-tags/get-docs-tag.d.ts

@@ -5,8 +5,8 @@ export declare function createGetDocsLiquidJsTag(siteContext: SiteContext, { dep
 }): {
     new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
         tokenizer: any;
-        "__#5@#varName": string;
-        "__#5@#args": Hash;
+        "__#6@#varName": string;
+        "__#6@#args": Hash;
         render(ctx: Context): Generator<unknown, void, any>;
         name: string;
         liquid: Liquid;

package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js

@@ -11,13 +11,14 @@ const liquidjs_utils_1 = require("../../../liquidjs-tools/liquidjs-utils");
 const create_doc_drop_1 = require("../../../public-payload/create-doc-drop");
 const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
 const site_schema_helpers_1 = require("../../../site-schema/site-schema-helpers");
+const get_paginated_docs_tag_1 = require("./get-paginated-docs-tag");
 const availableParameterNames = new Set([
     "parentId",
     "orderBy",
     "limit",
-    "withTotal",
     "fields",
-    "flaggedWithId",
+    "labeledById",
+    "withTotal",
 ]);
 function createGetDocsLiquidJsTag(siteContext, { deprecated } = {}) {
     return class GetDocsTag extends liquidjs_1.Tag {
@@ -42,7 +43,32 @@ function createGetDocsLiquidJsTag(siteContext, { deprecated } = {}) {
                 ctx.bottom()[this.#varName] = cacheVal.val;
                 return;
             }
-            const val = yield loadDocsWithTotal(siteContext, renderingContext, parentId, options);
+            let val;
+            if (options.withTotal !== undefined) {
+                siteContext.siteLog.warn(`The 'withTotal' parameter is deprecated. Use the 'getPaginatedDocs' tag instead.`);
+                const paginated = yield (0, get_paginated_docs_tag_1.loadPaginatedDocs)(siteContext, renderingContext, parentId, {
+                    parentId: options.parentId,
+                    orderBy: options.orderBy,
+                    fields: options.fields,
+                    labeledById: options.labeledById,
+                    pageSize: options.limit ?? 20,
+                    pageIndex: 0,
+                });
+                val = {
+                    list: paginated.items,
+                    total: paginated.total,
+                };
+            }
+            else {
+                const list = yield loadDocs(siteContext, renderingContext, parentId, options);
+                val = [...list];
+                Object.defineProperty(val, "list", {
+                    get: () => {
+                        siteContext.siteLog.warn(`On 'getDocs' tag, the 'list' property is deprecated, use the result as a list directly.`);
+                        return list;
+                    },
+                });
+            }
             renderingContext.setValueIntoCache(cacheKey, val);
             ctx.bottom()[this.#varName] = val;
         }
@@ -58,41 +84,23 @@ function validateParameters(values, varName, { siteLog }) {
     return {
         parentId: (0, data_formatters_lib_1.strVal)(values.parentId, { varName: "parentId" }),
         orderBy: (0, data_formatters_lib_1.strValOrUndef)(values.orderBy, { varName: "orderBy" }),
+        fields: (0, data_formatters_lib_1.strValOrUndef)(values.fields, { varName: "fields" }),
+        labeledById: (0, data_formatters_lib_1.strValOrUndef)(values.labeledById, { varName: "labeledById" }),
         limit: (0, data_formatters_lib_1.nbValOrUndef)(values.limit, { varName: "limit" }),
         withTotal: (0, data_formatters_lib_1.boolValOrUndef)(values.withTotal, { varName: "withTotal" }),
-        fields: (0, data_formatters_lib_1.strValOrUndef)(values.fields, { varName: "fields" }),
-        flaggedWithId: (0, data_formatters_lib_1.strValOrUndef)(values.flaggedWithId, { varName: "flaggedWithId" }),
     };
 }
-async function loadDocsWithTotal(siteContext, renderingContext, parentId, options) {
+async function loadDocs(siteContext, renderingContext, parentId, options) {
     const fieldNames = options.fields?.trim().split(/\s*,\s*/);
-    const flaggedWithLeafId = (0, anywhere_lib_1.isDef)(options.flaggedWithId)
-        ? (0, utils_helper_1.toLeafId)(options.flaggedWithId)
-        : undefined;
-    const result = options.withTotal
-        ? await (0, doc_values_queries_1.getDocItemsWithTotal)(siteContext, renderingContext.tracker, {
-            ...options,
-            parentId,
-            orderBy: options.orderBy ? (0, site_schema_helpers_1.parseChildOrdering)(options.orderBy) : undefined,
-            flaggedWithTermId: flaggedWithLeafId,
-        })
-        : {
-            list: await (0, doc_values_queries_1.getDocItems)(siteContext, renderingContext.tracker, {
-                ...options,
-                parentId,
-                orderBy: options.orderBy ? (0, site_schema_helpers_1.parseChildOrdering)(options.orderBy) : undefined,
-                flaggedWithTermId: flaggedWithLeafId,
-            }),
-            total: undefined,
-        };
-    const val = {
-        list: result.list.length === 0
-            ? undefined
-            : result.list.map((item) => (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, item, {
-                fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
-            })),
-        total: result.total,
-    };
-    return val;
+    const labeledByTermId = (0, anywhere_lib_1.isDef)(options.labeledById) ? (0, utils_helper_1.toLeafId)(options.labeledById) : undefined;
+    const items = await (0, doc_values_queries_1.getListOfDocValues)(siteContext, renderingContext.tracker, {
+        parentId,
+        orderBy: options.orderBy ? (0, site_schema_helpers_1.parseOrderChildrenBy)(options.orderBy) : undefined,
+        labeledByTermId: labeledByTermId,
+        limit: options.limit,
+    });
+    return items.map((item) => (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, item, {
+        fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
+    }));
 }
 //# sourceMappingURL=get-docs-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js.map

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

package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.d.ts

@@ -0,0 +1,28 @@
+import { type ParsedSectionId } from "@paroicms/anywhere-lib";
+import { Hash, type Context, type Liquid, type TagToken, type TopLevelToken } from "liquidjs";
+import type { DropInst } from "../../../liquidjs-tools/liquidjs-drop";
+import { type RenderingContext } from "../../../liquidjs-tools/liquidjs-rendering/rendering-context";
+import { type PaginatedResult } from "../../../public-payload/doc-values.queries";
+import type { DocPayload } from "../../../public-payload/public-payload.types";
+import type { SiteContext } from "../../../site-context/site-context.types";
+export declare function createGetPaginatedDocsLiquidJsTag(siteContext: SiteContext): {
+    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
+        tokenizer: any;
+        "__#5@#varName": string;
+        "__#5@#args": Hash;
+        render(ctx: Context): Generator<unknown, void, any>;
+        name: string;
+        liquid: Liquid;
+        token: TagToken;
+    };
+};
+interface GetPaginatedDocsRawParameters {
+    parentId: string;
+    orderBy?: string;
+    fields?: string;
+    labeledById?: string;
+    pageIndex?: number;
+    pageSize: number;
+}
+export declare function loadPaginatedDocs(siteContext: SiteContext, renderingContext: RenderingContext, parentId: ParsedSectionId, options: GetPaginatedDocsRawParameters): Promise<PaginatedResult<DropInst<DocPayload>>>;
+export {};

package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadPaginatedDocs = exports.createGetPaginatedDocsLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const anywhere_lib_1 = require("@paroicms/anywhere-lib");
+const liquidjs_1 = require("liquidjs");
+const text_cache_1 = require("../../../common/text-cache");
+const utils_helper_1 = require("../../../helpers/utils-helper");
+const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
+const liquidjs_utils_1 = require("../../../liquidjs-tools/liquidjs-utils");
+const create_doc_drop_1 = require("../../../public-payload/create-doc-drop");
+const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
+const site_schema_helpers_1 = require("../../../site-schema/site-schema-helpers");
+const availableParameterNames = new Set([
+    "parentId",
+    "orderBy",
+    "fields",
+    "labeledById",
+    "pageIndex",
+    "pageSize",
+]);
+function createGetPaginatedDocsLiquidJsTag(siteContext) {
+    return class GetPaginatedDocsTag extends liquidjs_1.Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#args = new liquidjs_1.Hash(token.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
+            const parentId = (0, anywhere_lib_1.parseSectionId)(options.parentId);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("getPaginatedDocs", { tagParameters: options });
+            const renderingContext = (0, liquidjs_utils_1.extractRenderingContext)(ctx);
+            renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId: parentId, relation: "children" }));
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const val = yield loadPaginatedDocs(siteContext, renderingContext, parentId, options);
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createGetPaginatedDocsLiquidJsTag = createGetPaginatedDocsLiquidJsTag;
+function validateParameters(values, varName, { siteLog }) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            siteLog.warn(`[getPaginatedDocs] unknown parameter "${name}"`);
+        }
+    }
+    return {
+        parentId: (0, data_formatters_lib_1.strVal)(values.parentId, { varName: "parentId" }),
+        orderBy: (0, data_formatters_lib_1.strValOrUndef)(values.orderBy, { varName: "orderBy" }),
+        fields: (0, data_formatters_lib_1.strValOrUndef)(values.fields, { varName: "fields" }),
+        labeledById: (0, data_formatters_lib_1.strValOrUndef)(values.labeledById, { varName: "labeledById" }),
+        pageIndex: (0, data_formatters_lib_1.nbValOrUndef)(values.pageIndex, { varName: "pageIndex" }),
+        pageSize: (0, data_formatters_lib_1.nbVal)(values.pageSize, { varName: "pageSize" }),
+    };
+}
+async function loadPaginatedDocs(siteContext, renderingContext, parentId, options) {
+    const fieldNames = options.fields?.trim().split(/\s*,\s*/);
+    const labeledByTermId = (0, anywhere_lib_1.isDef)(options.labeledById) ? (0, utils_helper_1.toLeafId)(options.labeledById) : undefined;
+    const result = await (0, doc_values_queries_1.getPaginatedListOfDocValues)(siteContext, renderingContext.tracker, {
+        parentId,
+        orderBy: options.orderBy ? (0, site_schema_helpers_1.parseOrderChildrenBy)(options.orderBy) : undefined,
+        labeledByTermId: labeledByTermId,
+        pageIndex: options.pageIndex ?? 0,
+        pageSize: options.pageSize,
+    });
+    return {
+        ...result,
+        items: result.items.map((item) => (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, item, {
+            fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
+        })),
+    };
+}
+exports.loadPaginatedDocs = loadPaginatedDocs;
+//# sourceMappingURL=get-paginated-docs-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js.map

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

package/dist/modules/public-site/liquidjs-tags/use-image-tag.d.ts

@@ -3,8 +3,8 @@ import type { SiteContext } from "../../../site-context/site-context.types";
 export declare function createUseImageLiquidJsTag(siteContext: SiteContext): {
     new (tagToken: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
         tokenizer: any;
-        "__#6@#hash": Hash;
-        "__#6@#varName": string;
+        "__#7@#hash": Hash;
+        "__#7@#varName": string;
         render(ctx: Context): Generator<unknown, void, unknown>;
         name: string;
         liquid: Liquid;

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

@@ -59,7 +59,7 @@ function buildUrlQuery(siteContext, sectionId, depth) {
         language,
     })
         .leftJoin("PaDocument", `d${cur}`, `d${cur}.leafId = s${cur}.leafId and d${cur}.lang = s${cur}.lang`)
-        .where(`l${cur}.id = :leafId`, { leafId })
+        .andWhere(`l${cur}.id = :leafId`, { leafId })
         .andWhere(`l${cur}.publishDate is not null`);
     let prev = cur;
     while (prev > 1) {

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

@@ -1 +1 @@
-{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;;AAAA,oEAA4E;AAC5E,yDAAmG;AAEnG,2DAAkF;AAClF,+EAA2E;AAE3E,+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,4BAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpD,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;AAED,SAAS,aAAa,CAAC,WAAwB,EAAE,SAA0B,EAAE,KAAa;IACxF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEvC,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE;SACzB,kBAAkB,EAAE;SACpB,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;SACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;SAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;SACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;SACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;SACvC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC;SACzB,SAAS,CAAC,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAAE;QAC7F,QAAQ;KACT,CAAC;SACD,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;SACA,KAAK,CAAC,IAAI,GAAG,eAAe,EAAE,EAAE,MAAM,EAAE,CAAC;SACzC,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;IAE/C,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACf,KAAK;aACF,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;aACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;aAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;aACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;aACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;aACvC,SAAS,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,UAAU,IAAI,WAAW,CAAC;aAChE,SAAS,CACR,WAAW,EACX,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAC1D;YACE,QAAQ;SACT,CACF;aACA,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;aACA,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;QAE/C,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,yBAAyB,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;KAC/C,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,GAAQ,EAAE,KAAa;IAC5C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QACtC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,MAAM,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YAC/B,QAAQ,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;YACvC,UAAU,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;YAC3C,IAAI,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACtC,WAAW,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,SAAgB,UAAU,CAAC,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,wCAAyB,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,wCAAyB,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"}
+{"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

@@ -4,7 +4,7 @@ export interface ParsedPublicRoute {
     language: string;
     routingPoints: RoutingPointDocumentSchema[];
     classicRelativeIds: ClassicRelativeId[];
-    withData: boolean;
+    redirectTo: "parent" | undefined;
     depth: number;
     urlCacheKey: string;
     urlParameters?: string;
@@ -14,4 +14,4 @@ export interface ClassicRelativeId {
     candidateTypes: ClassicDocumentSchema[];
 }
 export declare function parsePublicRoute(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">, path: string): ParsedPublicRoute | undefined;
-export declare function findParentParsedRouteWithData(parsedRoute: ParsedPublicRoute): ParsedPublicRoute | undefined;
+export declare function findParentParsedRouteWithDocument(parsedRoute: ParsedPublicRoute): ParsedPublicRoute | undefined;

package/dist/modules/public-site/public-route/public-route-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findParentParsedRouteWithData = exports.parsePublicRoute = void 0;
+exports.findParentParsedRouteWithDocument = exports.parsePublicRoute = void 0;
 function parsePublicRoute(siteContext, path) {
     const { siteSchema, multilingual } = siteContext;
     const { cleanedPath, urlParameters } = parseUrlParameters(path);
@@ -29,7 +29,7 @@ function parsePublicRoute(siteContext, path) {
         ++depth;
         prev = routingPoint;
     }
-    let lastWithData = prev.withData;
+    let lastRedirectTo = prev.redirectTo;
     let parentCandidates = [prev];
     const classicRelativeIds = [];
     while (i < parts.length) {
@@ -46,13 +46,13 @@ function parsePublicRoute(siteContext, path) {
         ++depth;
         parentCandidates = found.classicRelativeId.candidateTypes;
         i += found.skipUrlParts;
-        lastWithData = true;
+        lastRedirectTo = undefined;
     }
     return {
         language,
         routingPoints,
         classicRelativeIds,
-        withData: lastWithData,
+        redirectTo: lastRedirectTo,
         depth,
         urlCacheKey: urlCacheKey.join("/"),
         urlParameters,
@@ -142,17 +142,17 @@ function isDay(s) {
     const val = Number(s);
     return val >= 1 && val <= 31;
 }
-function findParentParsedRouteWithData(parsedRoute) {
+function findParentParsedRouteWithDocument(parsedRoute) {
     let curRoute = parsedRoute;
     while (true) {
         curRoute = findParentParsedRoute(curRoute);
         if (!curRoute)
             break;
-        if (curRoute.withData)
+        if (!curRoute.redirectTo)
             return curRoute;
     }
 }
-exports.findParentParsedRouteWithData = findParentParsedRouteWithData;
+exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
 function findParentParsedRoute(parsedRoute) {
     const routingPoints = [...parsedRoute.routingPoints];
     const classicRelativeIds = [...parsedRoute.classicRelativeIds];
@@ -168,12 +168,12 @@ function findParentParsedRoute(parsedRoute) {
     if (classicRelativeIds.length === 0 && routingPoints.length === 0)
         return;
     const lastClassic = classicRelativeIds.length > 0 ? classicRelativeIds[classicRelativeIds.length - 1] : undefined;
-    const withData = !!lastClassic || routingPoints[routingPoints.length - 1]?.withData;
+    const redirectTo = lastClassic ? undefined : routingPoints[routingPoints.length - 1]?.redirectTo;
     return {
         language: parsedRoute.language,
         routingPoints,
         classicRelativeIds,
-        withData,
+        redirectTo,
         depth: parsedRoute.depth - 1,
         urlCacheKey: urlCacheKey.join("/"),
     };

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

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

@@ -19,7 +19,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
         .innerJoin("PaSection", "s0", "l0.id = s0.leafId and s0.lang = :language", {
         language: parsedRoute.language,
     })
-        .where("l0.depth = 0")
+        .andWhere("l0.depth = 0")
         .andWhere("l0.leafType = 'home'")
         .andWhere("l0.publishDate <= current_timestamp")
         .andWhere("s0.ready = 1");
@@ -58,7 +58,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
         .addSelect(`l${prev}.id`, "leafId")
         .addSelect(`l${prev}.relativeId`, "relativeId")
         .addSelect(`l${prev}.publishDate`, "publishDate");
-    if (parsedRoute.withData) {
+    if (!parsedRoute.redirectTo) {
         query
             .addSelect("d.title", "title")
             .addSelect("d.slug", "slug")

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

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

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

@@ -12,8 +12,8 @@ const public_route_parser_1 = require("../public-route/public-route-parser");
 const raw_document_payload_1 = require("../public-route/raw-document-payload");
 async function generateDocumentHtml(siteContext, options, tracker) {
     const { req, parsedRoute, cacheKey } = options;
-    if (!parsedRoute.withData) {
-        const parentRoute = (0, public_route_parser_1.findParentParsedRouteWithData)(parsedRoute);
+    if (parsedRoute.redirectTo === "parent") {
+        const parentRoute = (0, public_route_parser_1.findParentParsedRouteWithDocument)(parsedRoute);
         const docValues = parentRoute ? await (0, raw_document_payload_1.fetchRawDocPayload)(siteContext, parentRoute) : undefined;
         if (docValues && parentRoute) {
             const { url, dependencyKeys } = await (0, make_url_1.getUrlOfDocument)(siteContext, tracker, {

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

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

@@ -23,7 +23,7 @@ const taxonomies_queries_1 = require("./taxonomies.queries");
 const translations_queries_1 = require("./translations.queries");
 function createDocPayloadDrop(siteContext, renderingContext, docValues, options = {}) {
     const documentType = (0, anywhere_lib_1.getDocumentTypeByLeafType)(siteContext.siteSchema, docValues.leafType);
-    const leafTypeLabel = (0, label_translator_helper_1.getDocumentLeafTypeLabel)(siteContext.siteSchema, {
+    const typeLabel = (0, label_translator_helper_1.getDocumentLeafTypeLabel)(siteContext.siteSchema, {
         language: docValues.language,
         leafType: docValues.leafType,
     });
@@ -64,31 +64,43 @@ function createDocPayloadDrop(siteContext, renderingContext, docValues, options
                 fieldNames: options.fieldNames,
             }),
             translations: () => (0, translations_queries_1.loadTranslationsAsDrops)(siteContext, renderingContext, docValues),
-            flaggedWith: createFlaggedWithDrop(siteContext, renderingContext, docValues, documentType),
-            flaggedWithOne: createFlaggedWithDrop(siteContext, renderingContext, docValues, documentType, { one: true }),
+            labeling: createLabelingDrop(siteContext, renderingContext, docValues, documentType),
+            singleLabeling: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
+                one: true,
+            }),
+            flaggedWith: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
+                deprecated: true,
+            }),
+            flaggedWithOne: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
+                one: true,
+                deprecated: true,
+            }),
             og: () => makeOgValuesPayload(siteContext, renderingContext, documentType, docValues, options),
             breadcrumb: () => (0, breadcrumb_queries_1.getPublicBreadcrumb)(siteContext, renderingContext, docValues),
             siblings: () => (0, get_siblings_queries_1.getSiblingDocuments)(siteContext, renderingContext, docValues),
-            leafTypeLabel,
+            typeLabel: typeLabel,
         },
     }, siteContext);
 }
 exports.createDocPayloadDrop = createDocPayloadDrop;
-function createFlaggedWithDrop(siteContext, renderingContext, documentId, documentType, { one } = { one: false }) {
+function createLabelingDrop(siteContext, renderingContext, documentId, documentType, { one, deprecated } = {}) {
     return (0, liquidjs_drop_1.createLiquidJsDrop)({
         renderingContext,
         cacheKeyOptions: { documentId },
-        values: Object.fromEntries((documentType.useTaxonomies ?? []).map((useTaxonomy) => [
-            useTaxonomy.leafType,
+        values: Object.fromEntries((documentType.labeling ?? []).map((useTaxonomy) => [
+            useTaxonomy.taxonomy,
             async () => {
+                if (deprecated) {
+                    siteContext.siteLog.warn(`The 'flaggedWith' and 'flaggedWithOne' fields are deprecated, use 'labeling' and 'singleLabeling' instead.`);
+                }
                 renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({
                     leafId: documentId.leafId,
-                    relation: "flagged",
-                    taxonomyLeafType: useTaxonomy.leafType,
+                    relation: "labeled",
+                    taxonomyLeafType: useTaxonomy.taxonomy,
                 }));
-                const rawTerms = await (0, taxonomies_queries_1.loadFlaggedWithTerms)(siteContext, renderingContext.tracker, {
+                const rawTerms = await (0, taxonomies_queries_1.loadLabeledByTerms)(siteContext, renderingContext.tracker, {
                     documentId,
-                    taxonomyLeafType: useTaxonomy.leafType,
+                    taxonomyLeafType: useTaxonomy.taxonomy,
                 });
                 if (!rawTerms || rawTerms.length === 0)
                     return;