@paroicms/server 1.78.1 → 1.79.0

package/dist/modules/core/labeling/labeling.queries.js

@@ -1,16 +1,15 @@
 import { invalidateDocumentRelationCache } from "../../../common/text-cache.js";
 import { getTypeNameOf } from "../node/node.queries.js";
 export async function setLabeling(siteContext, { labeledNodeId, taxonomyNodeId, terms, }) {
-    const rows = await siteContext.cn
-        .createQueryBuilder()
-        .select("id")
-        .from("PaNode", "l")
-        .andWhere("l.id in (:...termIds)", { termIds: terms.map((term) => term.termNodeId) })
-        .andWhere("l.parentId <> :taxonomyNodeId", { taxonomyNodeId })
-        .getRawMany();
+    const termIds = terms.map((term) => term.termNodeId);
+    const rows = await siteContext
+        .cn("PaNode as l")
+        .select("l.id as id")
+        .whereIn("l.id", termIds)
+        .andWhereNot("l.parentId", taxonomyNodeId);
     if (rows.length > 0) {
-        const termIds = rows.map((row) => row.id);
-        throw new Error(`term(s) '${termIds.join("', '")}' should be in taxonomy '${taxonomyNodeId}'`);
+        const invalidTermIds = rows.map((row) => row.id);
+        throw new Error(`term(s) '${invalidTermIds.join("', '")}' should be in taxonomy '${taxonomyNodeId}'`);
     }
     await siteContext.cn.transaction(async (tx) => {
         await deleteOldLabelings(tx, { labeledNodeId, taxonomyNodeId });
@@ -26,28 +25,23 @@ export async function setLabeling(siteContext, { labeledNodeId, taxonomyNodeId,
     });
 }
 async function deleteOldLabelings(cn, { labeledNodeId, taxonomyNodeId }) {
-    await cn
-        .createQueryBuilder()
-        .delete()
-        .from("PaLabeling")
-        .andWhere("labeledId = :labeledId", {
-        labeledId: labeledNodeId,
+    await cn("PaLabeling")
+        .where("labeledId", labeledNodeId)
+        .whereExists(function () {
+        this.select(1)
+            .from("PaNode as t")
+            .whereRaw("t.id = PaLabeling.termId")
+            .andWhere("t.parentId", taxonomyNodeId);
     })
-        .andWhere(`exists (
-select 1
-from PaNode t
-where t.id = PaLabeling.termId
-  and t.parentId = :taxonomyNodeId)`, { taxonomyNodeId })
-        .execute();
+        .delete();
 }
 async function insertNewLabelings(labeledNodeId, { terms, cn }) {
     for (const term of terms) {
-        await cn
-            .createQueryBuilder()
-            .insert()
-            .into("PaLabeling")
-            .values({ labeledId: labeledNodeId, termId: term.termNodeId, lead: term.isLead })
-            .execute();
+        await cn("PaLabeling").insert({
+            labeledId: labeledNodeId,
+            termId: term.termNodeId,
+            lead: term.isLead,
+        });
     }
 }
 //# sourceMappingURL=labeling.queries.js.map

package/dist/modules/core/labeling/labeling.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"labeling.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/labeling/labeling.queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAaxD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,EACE,aAAa,EACb,cAAc,EACd,KAAK,GAKN;IAED,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,EAAE;SAC9B,kBAAkB,EAAE;SACpB,MAAM,CAAC,IAAI,CAAC;SACZ,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;SACpF,QAAQ,CAAC,+BAA+B,EAAE,EAAE,cAAc,EAAE,CAAC;SAC7D,UAAU,EAAO,CAAC;IACrB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,cAAc,GAAG,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,MAAM,kBAAkB,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;QAEhE,MAAM,kBAAkB,CAAC,aAAa,EAAE;YACtC,KAAK;YACL,EAAE,EAAE,EAAE;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,+BAA+B,CAAC,WAAW,EAAE;QACjD,MAAM,EAAE,aAAa;QACrB,QAAQ,EAAE,SAAS;QACnB,gBAAgB,EAAE,MAAM,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,EAA0B,EAC1B,EAAE,aAAa,EAAE,cAAc,EAAqD;IAEpF,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,YAAY,CAAC;SAClB,QAAQ,CAAC,wBAAwB,EAAE;QAClC,SAAS,EAAE,aAAa;KACzB,CAAC;SACD,QAAQ,CACP;;;;oCAI8B,EAC9B,EAAE,cAAc,EAAE,CACnB;SACA,OAAO,EAAE,CAAC;AACf,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,aAAqB,EACrB,EAAE,KAAK,EAAE,EAAE,EAAuD;IAElE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,YAAY,CAAC;aAClB,MAAM,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;aAChF,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"labeling.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/labeling/labeling.queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAaxD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,EACE,aAAa,EACb,cAAc,EACd,KAAK,GAKN;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,MAAM,WAAW;SAC3B,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC,YAAY,CAAC;SACpB,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;SACxB,WAAW,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,KAAK,CACb,YAAY,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,cAAc,GAAG,CACrF,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,MAAM,kBAAkB,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;QAEhE,MAAM,kBAAkB,CAAC,aAAa,EAAE;YACtC,KAAK;YACL,EAAE,EAAE,EAAE;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,+BAA+B,CAAC,WAAW,EAAE;QACjD,MAAM,EAAE,aAAa;QACrB,QAAQ,EAAE,SAAS;QACnB,gBAAgB,EAAE,MAAM,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,EAAoB,EACpB,EAAE,aAAa,EAAE,cAAc,EAAqD;IAEpF,MAAM,EAAE,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC;SACjC,WAAW,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACX,IAAI,CAAC,aAAa,CAAC;aACnB,QAAQ,CAAC,0BAA0B,CAAC;aACpC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC,CAAC;SACD,MAAM,EAAE,CAAC;AACd,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,aAAqB,EACrB,EAAE,KAAK,EAAE,EAAE,EAAiD;IAE5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,aAAa;YACxB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,IAAI,EAAE,IAAI,CAAC,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/modules/core/node/node.queries.d.ts

@@ -1,4 +1,4 @@
-import type { Tracker } from "@paroicms/internal-server-lib";
+import { type Tracker } from "@paroicms/internal-server-lib";
 import type { ScDocumentType } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../../site-context/site-context.types.js";
 import type { LabelingSeed } from "../labeling/labeling.queries.js";

package/dist/modules/core/node/node.queries.js

@@ -1,17 +1,17 @@
 import { dateValOrUndef, listVal, nbVal, strVal } from "@paroi/data-formatters-lib";
 import { mainDbSchemaName } from "@paroicms/connector";
 import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
+import { sqliteDateTime } from "@paroicms/internal-server-lib";
 import { ApiError } from "../../../common/api-error-handler.js";
 import { formatLabelingObjectType, toNodeObjectType } from "../../../common/data-format.js";
 import { depKeysOfNodeRelationCache, invalidateMultipleDocumentsInCache, invalidateNodeInCache, makeCacheDependencyKey, makeDependencyKeysForDocuments, } from "../../../common/text-cache.js";
 import { getDocumentNodeIdOfPart } from "../part/part.queries.js";
 export async function getTypeNameOf(siteContext, nodeId) {
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .select("l.typeName", "typeName")
-        .from("PaNode", "l")
-        .andWhere("l.id = :nodeId", { nodeId })
-        .getRawOne();
+    const row = await siteContext
+        .cn("PaNode as l")
+        .select("l.typeName")
+        .where("l.id", nodeId)
+        .first();
     if (!row)
         throw new ApiError(`cannot find node '${nodeId}'`, { status: 404 });
     return strVal(row.typeName);
@@ -24,48 +24,33 @@ export async function getDocumentSchemaOf(siteContext, nodeId) {
     return nodeType;
 }
 export async function findOneNode({ cn }, id) {
-    const node = await cn
-        .createQueryBuilder()
-        .select("l.id", "id")
-        .addSelect("l.parentId", "parentId")
-        .addSelect("l.typeName", "typeName")
-        .addSelect("l.relativeId", "relativeId")
-        .addSelect("l.publishDate", "publishDate")
-        .from("PaNode", "l")
-        .where("l.id = :id", { id })
-        .getRawOne();
+    const node = await cn("PaNode as l")
+        .select("l.id", "l.parentId", "l.typeName", "l.relativeId", "l.publishDate")
+        .where("l.id", id)
+        .first();
     if (!node)
         throw new ApiError(`can't find node ${id}`, { status: 404 });
     return toNodeObjectType(node);
 }
 export async function readTranslationsOf({ cn }, nodeId) {
-    const rows = await cn
-        .createQueryBuilder()
-        .addSelect("s.language", "language")
-        .from("PaNodel", "s")
-        .where("s.nodeId = :nodeId", { nodeId })
-        .getRawMany();
+    const rows = await cn("PaNodel as s").select("s.language").where("s.nodeId", nodeId);
     return rows.map((row) => strVal(row.language));
 }
 export async function setNodePublishDate(siteContext, { nodeId, publishDate }) {
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .addSelect("l.typeName", "typeName")
-        .addSelect("l.publishDate", "publishDate")
-        .from("PaNode", "l")
-        .andWhere("l.id = :nodeId", { nodeId })
-        .getRawOne();
+    const { cn, siteSchema } = siteContext;
+    const row = await siteContext
+        .cn("PaNode as l")
+        .select("l.typeName", "l.publishDate")
+        .where("l.id", nodeId)
+        .first();
     if (!row)
         throw new ApiError(`cannot find node '${nodeId}'`, { status: 404 });
     const typeName = strVal(row.typeName);
     const prevPublishDate = dateValOrUndef(row.publishDate);
-    const nodeType = getNodeTypeByName(siteContext.siteSchema, typeName);
-    await siteContext.cn
-        .createQueryBuilder()
-        .update("PaNode")
-        .set({ publishDate })
-        .where("id = :nodeId", { nodeId })
-        .execute();
+    const nodeType = getNodeTypeByName(siteSchema, typeName);
+    await cn("PaNode")
+        .where("id", nodeId)
+        .update({ publishDate: sqliteDateTime(publishDate) });
     if (nodeType.kind === "document") {
         await invalidateOrScheduleDocument(siteContext, { nodeId, publishDate, prevPublishDate });
     }
@@ -117,47 +102,33 @@ async function invalidateOrSchedulePart(siteContext, options) {
     }
 }
 export async function loadLabelingTermsOf({ cn }, labeledId) {
-    const rows = await cn
-        .createQueryBuilder()
-        .select("f.lead", "lead")
-        .addSelect("f.termId", "termId")
-        .addSelect("l2.typeName", "parentTypeName")
-        .from("PaLabeling", "f")
-        .innerJoin("PaNode", "l1", "l1.id = f.termId")
-        .innerJoin("PaNode", "l2", "l2.id = l1.parentId")
-        .andWhere("f.labeledId = :labeledId", { labeledId })
-        .getRawMany();
+    const rows = await cn("PaLabeling as f")
+        .select("f.lead", "f.termId", "l2.typeName as parentTypeName")
+        .innerJoin("PaNode as l1", "l1.id", "f.termId")
+        .innerJoin("PaNode as l2", "l2.id", "l1.parentId")
+        .where("f.labeledId", labeledId);
     return listVal(rows, formatLabelingObjectType);
 }
 export async function getNodeDepth(siteContext, tracker, nodeId) {
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .select("l.depth", "depth")
-        .from("PaNode", "l")
-        .andWhere("l.id = :nodeId", { nodeId })
-        .getRawOne();
+    const row = await siteContext.cn("PaNode as l").select("l.depth").where("l.id", nodeId).first();
     tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
     if (!row)
         throw new ApiError(`cannot find node '${nodeId}'`, { status: 404 });
     return nbVal(row.depth);
 }
 export async function countNodeChildrenOf(siteContext, parendId) {
-    const row = await siteContext.cn
-        .createQueryBuilder()
-        .select("count(1)", "cnt")
-        .from("PaNode", "l")
-        .andWhere("l.parentId = :parendId", { parendId })
-        .getRawOne();
-    return nbVal(row?.cnt);
+    const result = await siteContext
+        .cn("PaNode as l")
+        .count("* as cnt")
+        .where("l.parentId", parendId)
+        .first();
+    return nbVal(result?.cnt);
 }
 export async function getScheduledNodes(siteContext) {
-    const rows = await siteContext.cn
-        .createQueryBuilder()
-        .select("l.id", "id")
-        .addSelect("l.publishDate", "publishDate")
-        .from("PaNode", "l")
-        .andWhere("l.publishDate > current_timestamp")
-        .getRawMany();
+    const rows = await siteContext
+        .cn("PaNode as l")
+        .select("l.id", "l.publishDate")
+        .whereRaw("l.publishDate > current_timestamp");
     return rows.map((row) => ({
         nodeId: strVal(row.id),
         publishDate: strVal(row.publishDate),

package/dist/modules/core/node/node.queries.js.map

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

package/dist/modules/core/node/ordered-node.queries.js

@@ -2,20 +2,16 @@ import { nbVal, strVal } from "@paroi/data-formatters-lib";
 import { invalidateMultipleDocumentsInCache } from "../../../common/text-cache.js";
 export async function reorderNodes(siteContext, { nodeIds, parentNodeId, listName, }) {
     const { cn } = siteContext;
-    const query = cn
-        .createQueryBuilder()
-        .select("l.id", "nodeId")
-        .addSelect("o.orderNum", "orderNum")
-        .from("PaNode", "l")
-        .innerJoin("PaOrderedNode", "o", "l.id = o.nodeId")
-        .andWhere("l.parentId = :parentNodeId", { parentNodeId })
+    let query = cn("PaNode as l")
+        .select(["l.id as nodeId", "o.orderNum as orderNum"])
+        .innerJoin("PaOrderedNode as o", "l.id", "o.nodeId")
+        .where("l.parentId", parentNodeId)
         .orderBy("o.orderNum", "ASC")
-        .addOrderBy("l.id", "ASC");
+        .orderBy("l.id", "ASC");
     if (listName) {
-        query.innerJoin("PaPartNode", "p", "p.nodeId = l.id");
-        query.andWhere("p.listName = :listName", { listName });
+        query = query.innerJoin("PaPartNode as p", "p.nodeId", "l.id").where("p.listName", listName);
     }
-    const rows = await query.getRawMany();
+    const rows = await query;
     const oldItems = rows.map((row) => ({
         nodeId: strVal(row.nodeId),
         orderNum: nbVal(row.orderNum),
@@ -35,23 +31,15 @@ export async function reorderNodes(siteContext, { nodeIds, parentNodeId, listNam
     await cn.transaction(async (tx) => {
         for (const newItem of newItems) {
             if (oldItems.find((old) => old.nodeId === newItem.nodeId)) {
-                await tx
-                    .createQueryBuilder()
-                    .update("PaOrderedNode")
-                    .set({ orderNum: newItem.orderNum })
-                    .where("nodeId = :nodeId", { nodeId: newItem.nodeId })
-                    .execute();
+                await tx("PaOrderedNode")
+                    .update({ orderNum: newItem.orderNum })
+                    .where("nodeId", newItem.nodeId);
             }
             else {
-                await tx
-                    .createQueryBuilder()
-                    .insert()
-                    .into("PaOrderedNode")
-                    .values({
+                await tx("PaOrderedNode").insert({
                     nodeId: newItem.nodeId,
                     orderNum: newItem.orderNum,
-                })
-                    .execute();
+                });
             }
         }
     });

package/dist/modules/core/node/ordered-node.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"ordered-node.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/node/ordered-node.queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ordered-node.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/node/ordered-node.queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AAGnF,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,EACE,OAAO,EACP,YAAY,EACZ,QAAQ,GACuD;IAEjE,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAE3B,IAAI,KAAK,GAAG,EAAE,CAAC,aAAa,CAAC;SAC1B,MAAM,CAAC,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;SACpD,SAAS,CAAC,oBAAoB,EAAE,MAAM,EAAE,UAAU,CAAC;SACnD,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC;SACjC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;SAC5B,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAE1B,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC/F,CAAC;IAED,MAAM,IAAI,GAAU,MAAM,KAAK,CAAC;IAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAClC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;QAC1B,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;KAC9B,CAAC,CAAC,CAAC;IAEJ,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,QAAQ,GAA2C,EAAE,CAAC;IAC5D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpC,EAAE,QAAQ,CAAC;IACb,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACjD,EAAE,QAAQ,CAAC;QACb,CAAC;IACH,CAAC;IAED,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAChC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1D,MAAM,EAAE,CAAC,eAAe,CAAC;qBACtB,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;qBACtC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,kCAAkC,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IAChF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/modules/core/nodel/nodel-wrap.resolver.js

@@ -62,22 +62,17 @@ export const nodelWrapResolvers = {
     },
     NodelWrap: {
         translatedInto: async ({ nodeId }, _args, { req, siteContext }) => {
-            const nodels = await siteContext.cn
-                .createQueryBuilder()
-                .select("s.language", "language")
-                .from("PaNodel", "s")
-                .andWhere("s.nodeId = :nodeId", { nodeId })
-                .getRawMany();
+            const nodels = await siteContext
+                .cn("PaNodel as s")
+                .select("s.language as language")
+                .where("s.nodeId", nodeId);
             return nodels.map((item) => strVal(item.language));
         },
         translations: async ({ nodeId }, _args, { req, siteContext }) => {
             const { cn } = siteContext;
-            const rows = await cn
-                .createQueryBuilder()
-                .select("nodel.language", "language")
-                .from("PaNodel", "nodel")
-                .andWhere("nodel.nodeId = :nodeId", { nodeId })
-                .getRawMany();
+            const rows = await cn("PaNodel as nodel")
+                .select("nodel.language as language")
+                .where("nodel.nodeId", nodeId);
             const translations = rows.map((row) => {
                 const language = strVal(row.language);
                 return {

package/dist/modules/core/nodel/nodel-wrap.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodel-wrap.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/nodel/nodel-wrap.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nodel-wrap.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/nodel/nodel-wrap.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/nodel/nodel.queries.d.ts

@@ -1,7 +1,7 @@
 import { type NodelRow } from "@paroicms/connector";
 import type { Tracker } from "@paroicms/internal-server-lib";
 import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
-import type { DataSource, EntityManager } from "typeorm";
+import type { Knex } from "knex";
 import type { SiteContext } from "../../../site-context/site-context.types.js";
 export interface NodelWrapSeed {
     nodelId: string;
@@ -48,7 +48,7 @@ export declare function getBreadcrumb(siteContext: Pick<SiteContext, "cn" | "sit
     ensurePublished?: boolean;
     skipHome?: boolean;
 }): Promise<BreadcrumbItem[]>;
-export declare function isOrphanNode(cn: EntityManager | DataSource, nodeId: string): Promise<boolean>;
+export declare function isOrphanNode(cn: Knex, nodeId: string): Promise<boolean>;
 export declare function searchDocuments(siteContext: SiteContext, options: {
     language: string;
     queryString: string;

package/dist/modules/core/nodel/nodel.queries.js

@@ -10,14 +10,9 @@ import { getParentNodelIdOf } from "../document/load-documents.queries.js";
 import { getNodeDepth, getTypeNameOf } from "../node/node.queries.js";
 import { getDocumentNodeIdOfPart } from "../part/part.queries.js";
 export async function nodeNodels({ cn }, nodeId) {
-    const nodels = await cn
-        .createQueryBuilder()
-        .addSelect("s.language", "language")
-        .addSelect("s.nodeId", "nodeId")
-        .addSelect("s.ready", "ready")
-        .from("PaNodel", "s")
-        .where("s.nodeId = :nodeId", { nodeId })
-        .getRawMany();
+    const nodels = await cn("PaNodel as s")
+        .select(["s.language as language", "s.nodeId as nodeId", "s.ready as ready"])
+        .where("s.nodeId", nodeId);
     return nodels.map((nodel) => {
         return {
             nodeId,
@@ -27,15 +22,11 @@ export async function nodeNodels({ cn }, nodeId) {
     });
 }
 export async function findOneNodel({ cn }, nodelId) {
-    const found = await cn
-        .createQueryBuilder()
-        .addSelect("s.language", "language")
-        .addSelect("s.nodeId", "nodeId")
-        .addSelect("s.ready", "ready")
-        .from("PaNodel", "s")
-        .where("s.nodeId = :nodeId", { nodeId: nodelId.nodeId })
-        .andWhere("s.language = :language", { language: nodelId.language })
-        .getRawOne();
+    const found = await cn("PaNodel as s")
+        .select(["s.language as language", "s.nodeId as nodeId", "s.ready as ready"])
+        .where("s.nodeId", nodelId.nodeId)
+        .andWhere("s.language", nodelId.language)
+        .first();
     if (!found) {
         throw new ApiError(`can't find nodel ${nodelId.language}:${nodelId.nodeId}`, {
             status: 404,
@@ -102,10 +93,7 @@ async function getChildNodelsForAllLanguages(siteContext, options) {
     const query = createBaseChildNodelsForAllLanguagesQueryBuilder(siteContext, {
         parentNodeId: options.parentNodeId,
         typeNames: parentDocumentType.regularChildren ?? [],
-    })
-        .select("s.nodeId", "nodeId")
-        .addSelect("s.language", "language")
-        .addSelect("s.ready", "ready");
+    }).select(["s.nodeId as nodeId", "s.language as language", "s.ready as ready"]);
     applyRegularChildrenSortingOnQuery(siteContext, {
         query,
         parentDocumentType,
@@ -115,16 +103,25 @@ async function getChildNodelsForAllLanguages(siteContext, options) {
     if (options.pagination) {
         query.limit(options.pagination.limit).offset(options.pagination.start);
     }
-    const rows = await query.getRawMany();
+    const rows = await query;
     const formattedRows = rows.map((row) => ({
         nodeId: strVal(row.nodeId),
         language: strVal(row.language),
         ready: boolVal(row.ready),
     }));
     if (options.pagination) {
-        const total = rows.length < options.pagination.limit
-            ? options.pagination.start + rows.length
-            : await query.getCount();
+        let total;
+        if (rows.length < options.pagination.limit) {
+            total = options.pagination.start + rows.length;
+        }
+        else {
+            const countQuery = createBaseChildNodelsForAllLanguagesQueryBuilder(siteContext, {
+                parentNodeId: options.parentNodeId,
+                typeNames: parentDocumentType.regularChildren ?? [],
+            });
+            const countResult = await countQuery.count("* as total").first();
+            total = nbVal(countResult?.total);
+        }
         return {
             list: formattedRows,
             total,
@@ -133,14 +130,11 @@ async function getChildNodelsForAllLanguages(siteContext, options) {
     return formattedRows;
 }
 function createBaseChildNodelsForAllLanguagesQueryBuilder(siteContext, { parentNodeId, typeNames, }) {
-    return siteContext.cn
-        .createQueryBuilder()
-        .from("PaNodel", "s")
-        .innerJoin("PaNode", "l", "l.id = s.nodeId")
-        .andWhere("l.parentId =  :parentId", {
-        parentId: parentNodeId,
-    })
-        .andWhere("l.typeName in (:...typeNames)", { typeNames });
+    return siteContext
+        .cn("PaNodel as s")
+        .innerJoin("PaNode as l", "l.id", "s.nodeId")
+        .where("l.parentId", parentNodeId)
+        .whereIn("l.typeName", typeNames);
 }
 export async function setNodelReady(siteContext, { nodelId, ready }) {
     const typeName = await getTypeNameOf(siteContext, nodelId.nodeId);
@@ -148,15 +142,10 @@ export async function setNodelReady(siteContext, { nodelId, ready }) {
     if (nodeType.kind !== "document" && nodeType.kind !== "part") {
         throw new Error(`invalid nodel type '${typeName}'`);
     }
-    await siteContext.cn
-        .createQueryBuilder()
-        .update("PaNodel")
-        .set({ ready })
-        .where("nodeId = :nodeId and language = :language", {
+    await siteContext.cn("PaNodel").update({ ready }).where({
         nodeId: nodelId.nodeId,
         language: nodelId.language,
-    })
-        .execute();
+    });
     if (nodeType.kind === "document") {
         const parentId = await getParentNodelIdOf(siteContext, nodelId);
         if (ready) {
@@ -184,32 +173,35 @@ export async function setNodelReady(siteContext, { nodelId, ready }) {
     }
 }
 export async function getBreadcrumb(siteContext, tracker, documentId, options = {}) {
+    const { cn } = siteContext;
     const depth = await getNodeDepth(siteContext, tracker, documentId.nodeId);
     if (depth === 0)
         return [];
     const language = documentId.language;
-    const query = siteContext.cn
-        .createQueryBuilder()
-        .from("PaNode", `l${depth}`)
-        .andWhere(`l${depth}.id = :nodeId`, { nodeId: documentId.nodeId });
-    if (options.ensurePublished)
-        queryEnsurePublished(query, depth, language);
+    const selectColumns = [];
     const minDepth = options.skipHome ? 1 : 0;
+    for (let cur = minDepth; cur < depth; ++cur) {
+        selectColumns.push(`l${cur}.id as nodeId${cur}`);
+        selectColumns.push(`l${cur}.typeName as typeName${cur}`);
+        selectColumns.push(`d${cur}.title as title${cur}`);
+    }
+    const query = cn(`PaNode as l${depth}`)
+        .select(selectColumns)
+        .where(`l${depth}.id`, documentId.nodeId);
+    if (options.ensurePublished)
+        queryEnsurePublished(cn, query, depth, language);
     let prev = depth;
     for (let cur = depth - 1; cur >= minDepth; --cur) {
-        query
-            .addSelect(`l${cur}.id`, `nodeId${cur}`)
-            .addSelect(`l${cur}.typeName`, `typeName${cur}`)
-            .addSelect(`d${cur}.title`, `title${cur}`)
-            .innerJoin("PaNode", `l${cur}`, `l${cur}.id = l${prev}.parentId`)
-            .leftJoin("PaDocument", `d${cur}`, `d${cur}.nodeId = l${cur}.id and d${cur}.language = :language`, {
-            language,
+        query.innerJoin(`PaNode as l${cur}`, `l${cur}.id`, `l${prev}.parentId`);
+        query.leftJoin(`PaDocument as d${cur}`, {
+            [`d${cur}.nodeId`]: `l${cur}.id`,
+            [`d${cur}.language`]: cn.raw("?", [language]),
         });
         if (options.ensurePublished)
-            queryEnsurePublished(query, cur, language);
+            queryEnsurePublished(cn, query, cur, language);
         prev = cur;
     }
-    const row = await query.getRawOne();
+    const row = await query.first();
     tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
     if (!row)
         throw new Error(`cannot get breadcrumb of '${documentId.language}:${documentId.nodeId}'`);
@@ -231,21 +223,17 @@ export async function getBreadcrumb(siteContext, tracker, documentId, options =
     }
     return result;
 }
-function queryEnsurePublished(query, d, language) {
+function queryEnsurePublished(cn, query, d, language) {
     query
-        .innerJoin("PaNodel", `s${d}`, `s${d}.nodeId = l${d}.id and s${d}.language = :language`, {
-        language,
+        .innerJoin(`PaNodel as s${d}`, {
+        [`s${d}.nodeId`]: `l${d}.id`,
+        [`s${d}.language`]: cn.raw("?", [language]),
     })
-        .andWhere(`s${d}.ready = 1`)
-        .andWhere(`l${d}.publishDate <= current_timestamp`);
+        .where(`s${d}.ready`, 1)
+        .whereRaw(`l${d}.publishDate <= current_timestamp`);
 }
 export async function isOrphanNode(cn, nodeId) {
-    const row = await cn
-        .createQueryBuilder()
-        .select("count(s.nodeId)", "cnt")
-        .from("PaNodel", "s")
-        .where("s.nodeId = :nodeId", { nodeId })
-        .getRawOne();
+    const row = await cn("PaNodel as s").count("s.nodeId as cnt").where("s.nodeId", nodeId).first();
     return nbVal(row?.cnt) === 0;
 }
 export async function searchDocuments(siteContext, options) {