@paroicms/server 1.78.0 → 1.79.0

package/dist/public-payload/doc-values.queries.js

@@ -4,17 +4,21 @@ import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
 import { getTypeNameOf } from "../modules/core/node/node.queries.js";
 export async function getDocItem(siteContext, tracker, documentId, options = {}) {
-    const query = siteContext.cn.createQueryBuilder();
+    const query = siteContext.cn("PaDocument as d");
     querySelectDocValues(query, { omitId: true });
     query
-        .from("PaDocument", "d")
-        .innerJoin("PaNodel", "s", "s.nodeId = d.nodeId and s.language = d.language")
-        .innerJoin("PaNode", "l", "l.id = d.nodeId")
-        .andWhere("d.nodeId = :nodeId", { nodeId: documentId.nodeId })
-        .andWhere("d.language = :language", { language: documentId.language })
-        .andWhere("s.ready = 1")
-        .andWhere("l.publishDate <= current_timestamp");
-    const row = await query.getRawOne();
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "d.nodeId",
+        "s.language": "d.language",
+    })
+        .innerJoin("PaNode as l", "l.id", "d.nodeId")
+        .where({
+        "d.nodeId": documentId.nodeId,
+        "d.language": documentId.language,
+        "s.ready": 1,
+    })
+        .whereRaw("l.publishDate <= current_timestamp");
+    const row = await query.first();
     tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     if (!row) {
         if (options.allowUndef)
@@ -51,7 +55,7 @@ export async function getListOfDocValues(siteContext, tracker, options) {
     if (!typeNames?.length)
         return [];
     const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
-    query.andWhere("l.typeName in (:...typeNames)", { typeNames });
+    query.whereIn("l.typeName", typeNames);
     querySelectDocValues(query);
     applyRegularChildrenSortingOnQuery(siteContext, {
         query,
@@ -69,41 +73,36 @@ export async function getListOfDocValues(siteContext, tracker, options) {
     if (options.limit !== undefined) {
         query.limit(options.limit);
     }
-    const rows = await query.getRawMany();
+    const rows = await query;
     tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     return rows.map((row) => formatDocValues(row, { language: parentId.language }));
 }
 async function countDocItems(siteContext, tracker, { parentId }) {
-    const row = await createBaseDocItemsQueryBuilder(siteContext, { parentId })
-        .select("count(1)", "total")
-        .getRawOne();
+    const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
+    const row = (await query.count("* as total").first());
     tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
-    return nbVal(row.total);
+    return nbVal(row?.total);
 }
 export function querySelectDocValues(query, { omitId } = {}) {
-    query.select("l.typeName", "typeName");
     if (!omitId) {
-        query.addSelect("l.id", "nodeId");
+        query.select("l.id as nodeId");
     }
-    query
-        .addSelect("l.relativeId", "relativeId")
-        .addSelect("d.title", "title")
-        .addSelect("d.slug", "slug")
-        .addSelect("l.publishDate", "publishDate")
-        .addSelect("d.metaDescription", "metaDescription")
-        .addSelect("d.metaKeywords", "metaKeywords");
+    query.select("l.typeName", "l.relativeId", "d.title", "d.slug", "l.publishDate", "d.metaDescription", "d.metaKeywords");
 }
 function createBaseDocItemsQueryBuilder(siteContext, { parentId }) {
-    return siteContext.cn
-        .createQueryBuilder()
-        .from("PaNode", "l")
-        .innerJoin("PaNodel", "s", "s.nodeId = l.id and s.language = :language", {
-        language: parentId.language,
+    const { cn } = siteContext;
+    return cn("PaNode as l")
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "l.id",
+        "s.language": cn.raw("?", [parentId.language]),
+    })
+        .innerJoin("PaDocument as d", {
+        "d.nodeId": "s.nodeId",
+        "d.language": "s.language",
     })
-        .innerJoin("PaDocument", "d", "d.nodeId = s.nodeId and d.language = s.language")
-        .andWhere("l.parentId = :parentId", { parentId: parentId.nodeId })
-        .andWhere("s.ready = 1")
-        .andWhere("l.publishDate <= current_timestamp");
+        .where("l.parentId", parentId.nodeId)
+        .where("s.ready", 1)
+        .whereRaw("l.publishDate <= current_timestamp");
 }
 export function formatDocValues(row, { language, nodeId, typeName } = {}) {
     return {

package/dist/public-payload/doc-values.queries.js.map

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

package/dist/public-payload/excerpt.queries.js

@@ -17,14 +17,15 @@ export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, m
     const orderedFieldTypes = excerptFieldTypes.sort((a, b) => a.useAsExcerpt - b.useAsExcerpt);
     for (const field of orderedFieldTypes) {
         const dbLanguage = field.localized ? nodelId.language : dbAnyLanguage;
-        const query = siteContext.cn
-            .createQueryBuilder()
-            .select("f.excerpt", "excerpt")
-            .from("PaFieldText", "f")
-            .andWhere("f.field = :fieldName", { fieldName: field.name })
-            .andWhere("f.nodeId = :nodeId", { nodeId: nodelId.nodeId })
-            .andWhere("f.language = :language", { language: dbLanguage });
-        const row = await query.getRawOne();
+        const row = await siteContext
+            .cn("PaFieldText as f")
+            .select("f.excerpt as excerpt")
+            .where({
+            "f.field": field.name,
+            "f.nodeId": nodelId.nodeId,
+            "f.language": dbLanguage,
+        })
+            .first();
         tracker.trackAccess(mainDbSchemaName, "PaFieldText", "read");
         let excerpt = strValOrUndef(row?.excerpt);
         excerpt = excerpt === "" ? undefined : excerpt;

package/dist/public-payload/excerpt.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/public-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,EACE,OAAO,EACP,UAAU,EACV,SAAS,GAKV;IAED,MAAM,iBAAiB,GAIjB,EAAE,CAAC;IAET,KAAK,MAAM,KAAK,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7F,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,GAAG,KAAK;gBACR,YAAY;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5F,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACtE,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE;aACzB,kBAAkB,EAAE;aACpB,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC;aAC9B,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC;aACxB,QAAQ,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;aAC3D,QAAQ,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;aAC1D,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAChE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAO,CAAC;QACzC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,IAAI,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/public-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,EACE,OAAO,EACP,UAAU,EACV,SAAS,GAKV;IAED,MAAM,iBAAiB,GAIjB,EAAE,CAAC;IAET,KAAK,MAAM,KAAK,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7F,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,GAAG,KAAK;gBACR,YAAY;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5F,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACtE,MAAM,GAAG,GAAG,MAAM,WAAW;aAC1B,EAAE,CAAC,kBAAkB,CAAC;aACtB,MAAM,CAAC,sBAAsB,CAAC;aAC9B,KAAK,CAAC;YACL,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,YAAY,EAAE,UAAU;SACzB,CAAC;aACD,KAAK,EAAE,CAAC;QAEX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,IAAI,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/public-payload/get-siblings.queries.js

@@ -34,14 +34,12 @@ export async function getSiblingDocuments(siteContext, renderingContext, documen
     };
 }
 async function getParentNode(siteContext, tracker, nodeId) {
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .select("l2.typeName", "parentTypeName")
-        .addSelect("l2.id", "parentId")
-        .from("PaNode", "l")
-        .andWhere("l.id = :nodeId", { nodeId })
-        .innerJoin("PaNode", "l2", "l2.id = l.parentId")
-        .getRawOne();
+    const row = await siteContext
+        .cn("PaNode as l")
+        .select(["l2.typeName as parentTypeName", "l2.id as parentId"])
+        .where("l.id", nodeId)
+        .innerJoin("PaNode as l2", "l2.id", "l.parentId")
+        .first();
     tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
     if (!row)
         return;
@@ -50,47 +48,40 @@ async function getParentNode(siteContext, tracker, nodeId) {
         parentNodeId: strVal(row.parentId),
     };
 }
-class MissingOrderByError extends Error {
-}
 async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentNodeId, parentDocumentType, }) {
     const { language } = documentId;
-    let query;
-    try {
-        query = siteContext.cn
-            .createQueryBuilder()
-            .select("b.prevId", "prevId")
-            .addSelect("b.nextId", "nextId")
-            .from((subQuery) => {
-            subQuery
-                .select("l.id", "id")
-                .from("PaNode", "l")
-                .innerJoin("PaNodel", "s", "s.nodeId = l.id and s.language = :language", { language })
-                .innerJoin("PaDocument", "d", "d.nodeId = s.nodeId and d.language = s.language")
-                .andWhere("l.parentId = :parentId", {
-                parentId: parentNodeId,
-            })
-                .andWhere("s.ready = 1")
-                .andWhere("l.publishDate <= current_timestamp");
-            const { orderBy } = applyRegularChildrenSortingOnQuery(siteContext, {
-                query: subQuery,
-                parentDocumentType,
-                orderByAsString: true,
-            });
-            if (!orderBy)
-                throw new MissingOrderByError();
-            subQuery
-                .addSelect(`lag(l.id) over (order by ${orderBy})`, "prevId")
-                .addSelect(`lead(l.id) over (order by ${orderBy})`, "nextId");
-            return subQuery;
-        }, "b")
-            .andWhere("b.id = :nodeId", { nodeId: documentId.nodeId });
-    }
-    catch (err) {
-        if (err instanceof MissingOrderByError)
-            return {};
-        throw err;
-    }
-    const row = await query.getRawOne();
+    const { cn } = siteContext;
+    const subQuery = cn("PaNode as l")
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "l.id",
+        "s.language": cn.raw("?", [language]),
+    })
+        .innerJoin("PaDocument as d", {
+        "d.nodeId": "s.nodeId",
+        "d.language": "s.language",
+    })
+        .where("l.parentId", parentNodeId)
+        .andWhere("s.ready", 1)
+        .andWhere("l.publishDate", "<=", cn.fn.now());
+    const { orderBy } = applyRegularChildrenSortingOnQuery(siteContext, {
+        query: subQuery,
+        parentDocumentType,
+        orderByAsString: true,
+        leftJoinDocument: false,
+    });
+    if (!orderBy)
+        return {};
+    subQuery.select([
+        "l.id as id",
+        cn.raw("lag(l.id) over (?) as prevId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
+        cn.raw("lead(l.id) over (?) as nextId", [cn.raw("order by ?", [cn.raw(orderBy)])]),
+    ]);
+    const query = cn
+        .with("ordered_nodes", subQuery)
+        .select(["prevId", "nextId"])
+        .from("ordered_nodes")
+        .where("id", documentId.nodeId);
+    const row = await query.first();
     tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
     if (!row)
         return {};

package/dist/public-payload/get-siblings.queries.js.map

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

package/dist/public-payload/parts.queries.js

@@ -4,27 +4,28 @@ import { getPartTypeByName, sortParts } from "@paroicms/internal-anywhere-lib";
 import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
 export async function loadPartsOf(siteContext, tracker, documentId, listType) {
     const listNames = [...getRecursiveListNames(siteContext.siteSchema, listType)];
-    const rows = await siteContext.cn
-        .createQueryBuilder()
-        .addSelect("l.id", "nodeId")
-        .addSelect("l.relativeId", "relativeId")
-        .addSelect("l.publishDate", "publishDate")
-        .addSelect("l.typeName", "typeName")
-        .addSelect("l.parentId", "parentNodeId")
-        .addSelect("p.listName", "listName")
-        .addSelect("o.orderNum", "orderNum")
-        .addSelect("s.nodeId", "tNodeId")
-        .from("PaNode", "l")
-        .innerJoin("PaPartNode", "p", "p.nodeId = l.id")
-        .leftJoin("PaNodel", "s", "s.nodeId = l.id and s.language = :language", {
-        language: documentId.language,
+    const rows = await siteContext
+        .cn("PaNode as l")
+        .select([
+        "l.id as nodeId",
+        "l.relativeId as relativeId",
+        "l.publishDate as publishDate",
+        "l.typeName as typeName",
+        "l.parentId as parentNodeId",
+        "p.listName as listName",
+        "o.orderNum as orderNum",
+        "s.nodeId as tNodeId",
+    ])
+        .innerJoin("PaPartNode as p", "p.nodeId", "l.id")
+        .leftJoin("PaNodel as s", {
+        "s.nodeId": "l.id",
+        "s.language": siteContext.cn.raw("?", [documentId.language]),
     })
-        .leftJoin("PaOrderedNode", "o", "o.nodeId = l.id")
-        .andWhere("p.documentNodeId = :nodeId", { nodeId: documentId.nodeId })
-        .andWhere("p.listName in (:...listNames)", { listNames })
-        .andWhere("l.publishDate <= current_timestamp")
-        .andWhere("s.ready = 1")
-        .getRawMany();
+        .leftJoin("PaOrderedNode as o", "o.nodeId", "l.id")
+        .where("p.documentNodeId", documentId.nodeId)
+        .whereIn("p.listName", listNames)
+        .whereRaw("l.publishDate <= current_timestamp")
+        .where("s.ready", 1);
     tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
     const oneLanguageItems = rows.map((row) => {
         const inRightLanguage = strValOrUndef(row.tNodeId) !== undefined;
@@ -93,15 +94,11 @@ async function completeMissingTranslations(siteContext, tracker, list) {
     const missingNodeIds = list.filter((item) => !item.inRightLanguage).map((item) => item.nodeId);
     let otherLanguageItems;
     if (missingNodeIds.length > 0) {
-        const rows = await siteContext.cn
-            .createQueryBuilder()
-            .addSelect("s.nodeId", "nodeId")
-            .addSelect("s.language", "language")
-            .addSelect("l.typeName", "typeName")
-            .from("PaNodel", "s")
-            .innerJoin("PaNode", "l", "l.id = s.nodeId")
-            .andWhere("s.nodeId in (:...nodeIds)", { nodeIds: missingNodeIds })
-            .getRawMany();
+        const rows = await siteContext
+            .cn("PaNodel as s")
+            .select(["s.nodeId as nodeId", "s.language as language", "l.typeName as typeName"])
+            .innerJoin("PaNode as l", "l.id", "s.nodeId")
+            .whereIn("s.nodeId", missingNodeIds);
         tracker.trackAccess(mainDbSchemaName, "PaNodel", "read");
         const formatted = rows.map((row) => {
             return {
@@ -137,16 +134,15 @@ async function completeMissingTranslations(siteContext, tracker, list) {
 }
 export async function countPartsOf(siteContext, tracker, parentId, listType) {
     const { listName } = listType;
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .select("count(1)", "cnt")
-        .from("PaNode", "l")
-        .innerJoin("PaPartNode", "p", "p.nodeId = l.id")
-        .andWhere("l.parentId = :parentId", { parentId: parentId.nodeId })
-        .andWhere("p.listName = :listName", { listName })
-        .getRawOne();
+    const result = await siteContext
+        .cn("PaNode as l")
+        .count("* as cnt")
+        .innerJoin("PaPartNode as p", "p.nodeId", "l.id")
+        .where("l.parentId", parentId.nodeId)
+        .where("p.listName", listName)
+        .first();
     tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
-    return nbValOrUndef(row?.cnt) ?? 0;
+    return nbValOrUndef(result?.cnt) ?? 0;
 }
 function getRecursiveListNames(siteSchema, list) {
     const listNames = new Set([list.listName]);

package/dist/public-payload/parts.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAIL,aAAa,GACd,MAAM,+BAA+B,CAAC;AA+BvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,QAAoB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,MAAM,WAAW;SAC3B,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC;QACN,gBAAgB;QAChB,4BAA4B;QAC5B,8BAA8B;QAC9B,wBAAwB;QACxB,4BAA4B;QAC5B,wBAAwB;QACxB,wBAAwB;QACxB,qBAAqB;KACtB,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAEhD,QAAQ,CAAC,cAAc,EAAE;QACxB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KAC7D,CAAC;SACD,QAAQ,CAAC,oBAAoB,EAAE,UAAU,EAAE,MAAM,CAAC;SAClD,KAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,MAAM,CAAC;SAC5C,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;SAChC,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEvB,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,MAAM,gBAAgB,GAAe,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACpD,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC;QACjE,MAAM,YAAY,GAAG;YACnB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;YAClC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;YACtC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;YAC/B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE;SACpD,CAAC;QACF,OAAO,eAAe;YACpB,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B;YACH,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,SAAS;aACpB,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC,WAAW,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE5F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IACxD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,CAAC;YACV,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAgD;IAClF,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAAwB,EACxB,IAAyB,EACzB,QAAoB;IAEpB,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC1B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/C,OAAO,gBAAgB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,WAA4C,EAC5C,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAoE;IAE/F,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM,EAAE,KAAK,GAAG,CAAC;QACjB,YAAY;QACZ,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;KACpE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,WAAwB,EACxB,OAAgB,EAChB,IAAgB;IAEhB,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/F,IAAI,kBAUS,CAAC;IAEd,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,WAAW;aAC3B,EAAE,CAAC,cAAc,CAAC;aAClB,MAAM,CAAC,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;aAClF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC;aAC5C,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACvC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,OAAO;gBACL,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC9B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC1B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;aAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,kBAAkB,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,kBAAkB,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACxF,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,QAAQ;oBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,eAAe,EAAE,KAAK;oBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAAgB,EAChB,QAAuB,EACvB,QAAsC;IAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,WAAW;SAC7B,EAAE,CAAC,aAAa,CAAC;SACjB,KAAK,CAAC,UAAU,CAAC;SACjB,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;SACpC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC7B,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAwB,EAAE,IAAgB;IACvE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACjD,IAAI,CAAC,aAAa;YAAE,MAAM;QAC1B,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/public-payload/taxonomies.queries.js

@@ -2,25 +2,27 @@ import { boolVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { mainDbSchemaName } from "@paroicms/connector";
 import { formatDocValues, querySelectDocValues } from "./doc-values.queries.js";
 export async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyTypeName }) {
-    const query = siteContext.cn.createQueryBuilder();
+    const { cn } = siteContext;
+    const query = cn("PaNode as l");
     querySelectDocValues(query);
     query
-        .addSelect("f.lead", "lead")
-        .addSelect("d.nodeId", "dNodeId")
-        .from("PaNode", "l")
-        .innerJoin("PaLabeling", "f", "f.termId = l.id")
-        .innerJoin("PaNode", "l2", "l2.id = l.parentId")
-        .innerJoin("PaNodel", "s", "s.nodeId = l.id and s.language = :language and s.ready = 1", {
-        language: documentId.language,
+        .select("f.lead", "d.nodeId as dNodeId")
+        .innerJoin("PaLabeling as f", "f.termId", "l.id")
+        .innerJoin("PaNode as l2", "l2.id", "l.parentId")
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "l.id",
+        "s.language": cn.raw("?", [documentId.language]),
+        "s.ready": cn.raw("1"),
     })
-        .innerJoin("PaDocument", "d", "d.nodeId = s.nodeId and d.language = :language", {
-        language: documentId.language,
+        .innerJoin("PaDocument as d", {
+        "d.nodeId": "s.nodeId",
+        "d.language": cn.raw("?", [documentId.language]),
     })
-        .andWhere("f.labeledId = :nodeId", { nodeId: documentId.nodeId })
-        .andWhere("l.publishDate <= current_timestamp")
-        .andWhere("l2.typeName = :taxonomyTypeName", { taxonomyTypeName })
-        .orderBy("d.title", "ASC");
-    const rows = await query.getRawMany();
+        .where("f.labeledId", documentId.nodeId)
+        .whereRaw("l.publishDate <= current_timestamp")
+        .where("l2.typeName", taxonomyTypeName)
+        .orderBy("d.title", "asc");
+    const rows = await query;
     tracker.trackAccess(mainDbSchemaName, "PaLabeling", "read");
     return rows.map((row) => {
         return {

package/dist/public-payload/taxonomies.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA2D;IAEzF,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC5B,KAAK;SACF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC3B,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;SAC/C,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,oBAAoB,CAAC;SAC/C,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,4DAA4D,EAAE;QACvF,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,gDAAgD,EAAE;QAC9E,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,QAAQ,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC;SAChE,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,QAAQ,CAAC,iCAAiC,EAAE,EAAE,gBAAgB,EAAE,CAAC;SACjE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;IAC3C,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA2D;IAEzF,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAE3B,MAAM,KAAK,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC;IAGhC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAG5B,KAAK;SACF,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC;SACvC,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,YAAY,CAAC;SAChD,SAAS,CAAC,cAAc,EAAE;QACzB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChD,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;KACvB,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE;QAC5B,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KACjD,CAAC;SACD,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC;SACvC,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,KAAK,CAAC,aAAa,EAAE,gBAAgB,CAAC;SACtC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAU,MAAM,KAAK,CAAC;IAChC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC"}

package/dist/public-payload/translations.queries.js

@@ -44,13 +44,11 @@ export async function loadTranslationsAsDrops(siteContext, renderingContext, doc
     return translations;
 }
 async function getExistingLanguagesOf(siteContext, tracker, nodeId) {
-    const documents = await siteContext.cn
-        .createQueryBuilder()
-        .select("s.language", "language")
-        .from("PaNodel", "s")
-        .andWhere("s.nodeId = :nodeId", { nodeId })
-        .andWhere("s.ready = 1")
-        .getRawMany();
+    const documents = await siteContext
+        .cn("PaNodel as s")
+        .select("s.language as language")
+        .where("s.nodeId", nodeId)
+        .where("s.ready", 1);
     tracker.trackAccess(mainDbSchemaName, "PaNodel", "read");
     return new Set(documents.map((item) => strVal(item.language)));
 }

package/dist/public-payload/translations.queries.js.map

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

package/dist/site-context/site-context.types.d.ts

@@ -5,11 +5,11 @@ import type { BackendHookHandler, FieldPreprocessor, SimpleTranslator } from "@p
 import type { MediaStorage } from "@paroicms/server-database-media-storage";
 import type { ImageCacheEngine } from "@paroicms/server-image-cache-engine";
 import type { TextCacheSystem } from "@paroicms/server-text-cache-system";
+import type { Knex } from "knex";
 import type { Liquid } from "liquidjs";
-import type { DataSource } from "typeorm";
 export interface SiteContext extends PublicSiteContext {
     logger: AppLogger;
-    cn: DataSource;
+    cn: Knex;
     siteConfiguration: SiteConfiguration;
     siteIds: SiteIds;
     liquidEngine: Liquid;