@paroicms/server 1.78.0 → 1.79.0

package/dist/modules/public-api/search-text/search-text.queries.js

@@ -1,60 +1,82 @@
-import { Brackets } from "typeorm";
-import { formatTypeOrmDirection } from "../../../common/child-ordering-query.js";
 import { dbAnyLanguage } from "../../../context.js";
 import { formatDocValues, querySelectDocValues, } from "../../../public-payload/doc-values.queries.js";
 export async function searchText(siteContext, options) {
     const { words, language, start, limit, onlyPublished, orderBy = [{ fieldName: "publishDate", direction: "desc" }], } = options;
     const query = createBaseSearchTextQueryBuilder(siteContext, { language, words, onlyPublished })
-        .distinct(true)
+        .distinct()
         .limit(limit)
         .offset(start);
     querySelectDocValues(query);
     if (orderBy && orderBy.length > 0) {
         for (const i of orderBy) {
             if (i.fieldName === "title") {
-                query.addOrderBy("d.title", formatTypeOrmDirection(i.direction));
+                query.orderBy("d.title", i.direction);
             }
             else if (i.fieldName === "publishDate") {
-                query.addOrderBy("l.publishDate", formatTypeOrmDirection(i.direction));
+                query.orderBy("l.publishDate", i.direction);
             }
         }
     }
-    const rows = await query.getRawMany();
-    const total = rows.length < limit ? start + rows.length : await query.getCount();
+    const rows = await query;
+    let total;
+    if (rows.length < limit) {
+        total = start + rows.length;
+    }
+    else {
+        const countQuery = createBaseSearchTextQueryBuilder(siteContext, {
+            language,
+            words,
+            onlyPublished,
+        })
+            .distinct()
+            .count("* as count");
+        const countResult = await countQuery.first();
+        total = countResult ? countResult.count : 0;
+    }
     return {
         rows: rows.map((row) => formatDocValues(row, { language })),
         total,
     };
 }
 function createBaseSearchTextQueryBuilder(siteContext, { language, words, onlyPublished, }) {
-    const query = siteContext.cn
-        .createQueryBuilder()
-        .from("PaDocument", "d")
-        .innerJoin("PaNodel", "s", "s.nodeId = d.nodeId and s.language = d.language")
-        .innerJoin("PaNode", "l", "s.nodeId = l.id")
-        .leftJoin("PaFieldVarchar", "fv", "fv.nodeId = s.nodeId and (fv.language = s.language or fv.language = :dbAnyLanguage)")
-        .leftJoin("PaFieldText", "ft", "ft.nodeId = d.nodeId and (ft.language = d.language or ft.language = :dbAnyLanguage)")
-        .andWhere("s.language = :language");
+    const { cn } = siteContext;
+    const query = cn("PaDocument as d")
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "d.nodeId",
+        "s.language": "d.language",
+    })
+        .innerJoin("PaNode as l", "s.nodeId", "l.id")
+        .leftJoin("PaFieldVarchar as fv", function () {
+        this.on("fv.nodeId", "=", "s.nodeId").andOn(function () {
+            this.on("fv.language", "=", "s.language").orOn("fv.language", "=", cn.raw("?", [dbAnyLanguage]));
+        });
+    })
+        .leftJoin("PaFieldText as ft", function () {
+        this.on("ft.nodeId", "=", "d.nodeId").andOn(function () {
+            this.on("ft.language", "=", "d.language").orOn("ft.language", "=", cn.raw("?", [dbAnyLanguage]));
+        });
+    })
+        .where("s.language", language);
     if (onlyPublished) {
-        query.andWhere("s.ready = 1").andWhere("l.publishDate <= current_timestamp");
+        query.where("s.ready", 1).whereRaw("l.publishDate <= current_timestamp");
     }
     for (let index = 0; index < words.length; index++) {
-        query.andWhere(new Brackets((qb) => {
-            qb.andWhere(`d.title like :word${index}`)
-                .orWhere(`ft.val like :word${index}`)
-                .orWhere(`fv.val like :word${index}`)
-                .orWhere(`exists (select 1
-from PaNode l2
-inner join PaPartNode p2 on p2.nodeId = l2.id
-inner join PaNodel s2 on s2.nodeId = l2.id and s2.language = :language  
-left join PaFieldVarchar fv2 on fv2.nodeId = s2.nodeId and (fv2.language = s2.language or fv2.language = :dbAnyLanguage)
-left join PaFieldText ft2 on ft2.nodeId = s2.nodeId and (ft2.language = s2.language or ft2.language = :dbAnyLanguage)
-where p2.documentNodeId = l.id ${onlyPublished ? "and s2.ready = 1 and l2.publishDate <= current_timestamp" : ""} and (fv2.val like :word${index} or ft2.val like :word${index}))`);
-        }));
+        const wordPattern = `%${words[index]}%`;
+        query.andWhere(function () {
+            this.where("d.title", "like", wordPattern)
+                .orWhere("ft.val", "like", wordPattern)
+                .orWhere("fv.val", "like", wordPattern)
+                .orWhereRaw(`exists (
+          select 1
+          from PaNode l2
+          inner join PaPartNode p2 on p2.nodeId = l2.id
+          inner join PaNodel s2 on s2.nodeId = l2.id and s2.language = ?
+          left join PaFieldVarchar fv2 on fv2.nodeId = s2.nodeId and (fv2.language = s2.language or fv2.language = ?)
+          left join PaFieldText ft2 on ft2.nodeId = s2.nodeId and (ft2.language = s2.language or ft2.language = ?)
+          where p2.documentNodeId = l.id ${onlyPublished ? "and s2.ready = 1 and l2.publishDate <= current_timestamp" : ""} and (fv2.val like ? or ft2.val like ?)
+        )`, [language, dbAnyLanguage, dbAnyLanguage, wordPattern, wordPattern]);
+        });
     }
-    const parameters = words.map((val, index) => [`word${index}`, `%${val}%`]);
-    parameters.push(["language", language], ["dbAnyLanguage", dbAnyLanguage]);
-    query.setParameters(Object.fromEntries(parameters));
     return query;
 }
 //# sourceMappingURL=search-text.queries.js.map

package/dist/modules/public-api/search-text/search-text.queries.js.map

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

package/dist/modules/public-site/feed/feed-generator.js

@@ -63,8 +63,8 @@ export async function getSiteTitle(siteContext, language) {
 }
 async function buildFeedEntries(siteContext, renderingContext, options) {
     const { language } = options;
-    const queryBuilder = createFeedItemsQueryBuilder(siteContext, language);
-    const rows = await queryBuilder.getRawMany();
+    const query = createFeedItemsQueryBuilder(siteContext, language);
+    const rows = await query;
     renderingContext.tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     const feedItems = rows.map(formatFeedItemValues);
     const feedEntries = [];
@@ -153,23 +153,30 @@ async function loadFeedItemContent(siteContext, renderingContext, item, language
     return chunks.join("\n");
 }
 function createFeedItemsQueryBuilder(siteContext, language) {
+    const { cn } = siteContext;
     const typeNames = getFeedTypeNames(siteContext.siteSchema);
-    return siteContext.cn
-        .createQueryBuilder()
-        .addSelect("l.id", "nodeId")
-        .addSelect("l.typeName", "typeName")
-        .addSelect("l.relativeId", "relativeId")
-        .addSelect("s.language", "language")
-        .addSelect("d.slug", "slug")
-        .addSelect("d.title", "title")
-        .addSelect("l.publishDate", "publishDate")
-        .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 = :language", { language })
-        .andWhere("s.ready = 1")
-        .andWhere("l.publishDate <= current_timestamp")
-        .andWhere("l.publishDate >= datetime(current_timestamp, '-6 month')")
-        .andWhere("l.typeName in (:...typeNames)", { typeNames })
+    return cn("PaNode as l")
+        .select([
+        "l.id as nodeId",
+        "l.typeName as typeName",
+        "l.relativeId as relativeId",
+        "s.language as language",
+        "d.slug as slug",
+        "d.title as title",
+        "l.publishDate as publishDate",
+    ])
+        .innerJoin("PaNodel as s", {
+        "s.nodeId": "l.id",
+        "s.language": cn.raw("?", [language]),
+    })
+        .innerJoin("PaDocument as d", {
+        "d.nodeId": "s.nodeId",
+        "d.language": cn.raw("?", [language]),
+    })
+        .where("s.ready", 1)
+        .whereRaw("l.publishDate <= current_timestamp")
+        .whereRaw("l.publishDate >= datetime(current_timestamp, '-6 month')")
+        .whereIn("l.typeName", typeNames)
         .orderBy("l.publishDate", "DESC")
         .limit(50);
 }

package/dist/modules/public-site/feed/feed-generator.js.map

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

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

@@ -24,12 +24,12 @@ export async function getUrlOfDocument(siteContext, tracker, documentId, options
     }
     else {
         const query = buildUrlQuery(siteContext, documentId, depth);
-        const [row] = await query.getRawMany();
+        const rows = await query;
         tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
-        if (!row) {
+        if (!rows || rows.length === 0) {
             throw new Error(`invalid url data for document "${language}:${nodeId}"`);
         }
-        const urlData = formatUrlData(row, depth);
+        const urlData = formatUrlData(rows[0], depth);
         url = makeDocumentUrl(siteContext, urlData, language);
         dependencyKeys = makeUrlDependencyKeys(urlData, language);
     }
@@ -41,42 +41,56 @@ export async function getUrlOfDocument(siteContext, tracker, documentId, options
     return options.returnUrlDependencyKeys ? { url, dependencyKeys } : url;
 }
 function buildUrlQuery(siteContext, nodelId, depth) {
+    const { cn } = siteContext;
     const { nodeId, language } = nodelId;
     let cur = depth;
-    const query = siteContext.cn
-        .createQueryBuilder()
-        .addSelect(`l${cur}.id`, `id${cur}`)
-        .addSelect(`l${cur}.typeName`, `typeName${cur}`)
-        .addSelect(`l${cur}.relativeId`, `relativeId${cur}`)
-        .addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
-        .addSelect(`d${cur}.slug`, `slug${cur}`)
-        .from("PaNode", `l${cur}`)
-        .innerJoin("PaNodel", `s${cur}`, `s${cur}.nodeId = l${cur}.id and s${cur}.language = :language`, {
-        language,
+    let query = cn(`PaNode as l${cur}`)
+        .select([
+        `l${cur}.id as id${cur}`,
+        `l${cur}.typeName as typeName${cur}`,
+        `l${cur}.relativeId as relativeId${cur}`,
+        `l${cur}.publishDate as publishDate${cur}`,
+        `d${cur}.slug as slug${cur}`,
+    ])
+        .innerJoin(`PaNodel as s${cur}`, {
+        [`s${cur}.nodeId`]: `l${cur}.id`,
+        [`s${cur}.language`]: cn.raw("?", [language]),
     })
-        .leftJoin("PaDocument", `d${cur}`, `d${cur}.nodeId = s${cur}.nodeId and d${cur}.language = s${cur}.language`)
-        .andWhere(`l${cur}.id = :nodeId`, { nodeId })
-        .andWhere(`l${cur}.publishDate is not null`);
+        .leftJoin(`PaDocument as d${cur}`, {
+        [`d${cur}.nodeId`]: `s${cur}.nodeId`,
+        [`d${cur}.language`]: `s${cur}.language`,
+    })
+        .where(`l${cur}.id`, nodeId)
+        .whereNotNull(`l${cur}.publishDate`);
     let prev = cur;
     while (prev > 1) {
         cur = prev - 1;
-        query
-            .addSelect(`l${cur}.id`, `id${cur}`)
-            .addSelect(`l${cur}.typeName`, `typeName${cur}`)
-            .addSelect(`l${cur}.relativeId`, `relativeId${cur}`)
-            .addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
-            .addSelect(`d${cur}.slug`, `slug${cur}`)
-            .innerJoin("PaNode", `l${cur}`, `l${cur}.id = l${prev}.parentId`)
-            .innerJoin("PaNodel", `s${cur}`, `s${cur}.nodeId = l${cur}.id and s${cur}.language = :language`, {
-            language,
+        query = query.select([
+            `l${prev}.id as id${prev}`,
+            `l${prev}.typeName as typeName${prev}`,
+            `l${prev}.relativeId as relativeId${prev}`,
+            `l${prev}.publishDate as publishDate${prev}`,
+            `d${prev}.slug as slug${prev}`,
+            `l${cur}.id as id${cur}`,
+            `l${cur}.typeName as typeName${cur}`,
+            `l${cur}.relativeId as relativeId${cur}`,
+            `l${cur}.publishDate as publishDate${cur}`,
+            `d${cur}.slug as slug${cur}`,
+        ]);
+        query = query
+            .innerJoin(`PaNode as l${cur}`, `l${cur}.id`, `l${prev}.parentId`)
+            .innerJoin(`PaNodel as s${cur}`, {
+            [`s${cur}.nodeId`]: `l${cur}.id`,
+            [`s${cur}.language`]: cn.raw("?", [language]),
+        })
+            .leftJoin(`PaDocument as d${cur}`, {
+            [`d${cur}.nodeId`]: `s${cur}.nodeId`,
+            [`d${cur}.language`]: `s${cur}.language`,
         })
-            .leftJoin("PaDocument", `d${cur}`, `d${cur}.nodeId = s${cur}.nodeId and d${cur}.language = s${cur}.language`)
-            .andWhere(`l${cur}.publishDate is not null`);
+            .whereNotNull(`l${cur}.publishDate`);
         prev = cur;
     }
-    query.andWhere(`l${prev}.parentId = :homeNodeId`, {
-        homeNodeId: siteContext.siteIds.homeIds.nodeId,
-    });
+    query = query.where(`l${prev}.parentId`, siteContext.siteIds.homeIds.nodeId);
     return query;
 }
 function formatUrlData(row, depth) {

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":"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"}
+{"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/raw-document-payload.js

@@ -1,66 +1,76 @@
 import { formatDocValues } from "../../../public-payload/doc-values.queries.js";
 export async function fetchRawDocPayload(siteContext, parsedRoute) {
     const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
-    const [row] = await query.getRawMany();
-    if (!row)
+    const rows = await query;
+    if (!rows || rows.length === 0)
         return;
-    return formatDocValues(row, {
+    return formatDocValues(rows[0], {
         language: parsedRoute.language,
     });
 }
 function buildRawDocPayloadQuery(siteContext, parsedRoute) {
-    const query = siteContext.cn.createQueryBuilder();
-    query
-        .from("PaNode", "l0")
-        .innerJoin("PaNodel", "s0", "l0.id = s0.nodeId and s0.language = :language", {
-        language: parsedRoute.language,
+    const { cn } = siteContext;
+    let query = cn("PaNode as l0")
+        .innerJoin("PaNodel as s0", {
+        "l0.id": "s0.nodeId",
+        "s0.language": cn.raw("?", [parsedRoute.language]),
     })
-        .andWhere("l0.depth = 0")
-        .andWhere("l0.typeName = 'home'")
-        .andWhere("l0.publishDate <= current_timestamp")
-        .andWhere("s0.ready = 1");
+        .where("l0.depth", 0)
+        .where("l0.typeName", "home")
+        .whereRaw("l0.publishDate <= current_timestamp")
+        .where("s0.ready", 1);
     let prev = 0;
     for (const routingDocument of parsedRoute.routingDocuments.slice(1)) {
         const cur = prev + 1;
-        query
-            .innerJoin("PaNode", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.typeName = :typeName${cur}`, {
-            [`typeName${cur}`]: routingDocument.typeName,
+        const typeNameParam = routingDocument.typeName;
+        query = query
+            .innerJoin(`PaNode as l${cur}`, {
+            [`l${prev}.id`]: `l${cur}.parentId`,
+            [`l${cur}.typeName`]: cn.raw("?", [typeNameParam]),
         })
-            .innerJoin("PaNodel", `s${cur}`, `l${cur}.id = s${cur}.nodeId and s${cur}.language = :language`, {
-            language: parsedRoute.language,
+            .innerJoin(`PaNodel as s${cur}`, {
+            [`l${cur}.id`]: `s${cur}.nodeId`,
+            [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
         })
-            .andWhere(`l${cur}.publishDate <= current_timestamp`)
-            .andWhere(`s${cur}.ready = 1`);
+            .whereRaw(`l${cur}.publishDate <= current_timestamp`)
+            .where(`s${cur}.ready`, 1);
         prev = cur;
     }
     for (const { candidateTypes, relativeId } of parsedRoute.regularRelativeIds) {
         const cur = prev + 1;
-        query
-            .innerJoin("PaNode", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.relativeId = :relativeId${cur}`, {
-            [`relativeId${cur}`]: relativeId,
-        })
-            .innerJoin("PaNodel", `s${cur}`, `l${cur}.id = s${cur}.nodeId and s${cur}.language = :language`, {
-            language: parsedRoute.language,
+        const typeNames = candidateTypes.map((t) => t.typeName);
+        query = query
+            .innerJoin(`PaNode as l${cur}`, {
+            [`l${prev}.id`]: `l${cur}.parentId`,
+            [`l${cur}.relativeId`]: cn.raw("?", [relativeId]),
         })
-            .andWhere(`l${cur}.typeName in (:...typeName${cur})`, {
-            [`typeName${cur}`]: candidateTypes.map((t) => t.typeName),
+            .innerJoin(`PaNodel as s${cur}`, {
+            [`l${cur}.id`]: `s${cur}.nodeId`,
+            [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
         })
-            .andWhere(`l${cur}.publishDate <= current_timestamp`)
-            .andWhere(`s${cur}.ready = 1`);
+            .whereIn(`l${cur}.typeName`, typeNames)
+            .whereRaw(`l${cur}.publishDate <= current_timestamp`)
+            .where(`s${cur}.ready`, 1);
         prev = cur;
     }
-    query
-        .addSelect(`l${prev}.typeName`, "typeName")
-        .addSelect(`l${prev}.id`, "nodeId")
-        .addSelect(`l${prev}.relativeId`, "relativeId")
-        .addSelect(`l${prev}.publishDate`, "publishDate");
+    query = query.select([
+        `l${prev}.typeName as typeName`,
+        `l${prev}.id as nodeId`,
+        `l${prev}.relativeId as relativeId`,
+        `l${prev}.publishDate as publishDate`,
+    ]);
     if (!parsedRoute.redirectTo) {
-        query
-            .addSelect("d.title", "title")
-            .addSelect("d.slug", "slug")
-            .addSelect("d.metaDescription", "metaDescription")
-            .addSelect("d.metaKeywords", "metaKeywords")
-            .innerJoin("PaDocument", "d", `l${prev}.id = d.nodeId and s${prev}.language = d.language`);
+        query = query
+            .select([
+            "d.title as title",
+            "d.slug as slug",
+            "d.metaDescription as metaDescription",
+            "d.metaKeywords as metaKeywords",
+        ])
+            .innerJoin("PaDocument as d", {
+            [`l${prev}.id`]: "d.nodeId",
+            [`s${prev}.language`]: "d.language",
+        });
     }
     return query;
 }

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/public-payload/doc-values.queries.d.ts

@@ -1,7 +1,7 @@
 import { type Obj } from "@paroi/data-formatters-lib";
 import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedNodelId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
-import type { SelectQueryBuilder } from "typeorm";
+import type { Knex } from "knex";
 import type { SiteContext } from "../site-context/site-context.types.js";
 import type { DocValues } from "./public-payload.types.js";
 export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<DocValues>;
@@ -33,7 +33,7 @@ export interface GetDocsOptions {
     labeledByTermId?: string;
 }
 export declare function getListOfDocValues(siteContext: SiteContext, tracker: Tracker, options: GetDocsOptions): Promise<DocValues[]>;
-export declare function querySelectDocValues(query: SelectQueryBuilder<any>, { omitId }?: {
+export declare function querySelectDocValues(query: Knex.QueryBuilder, { omitId }?: {
     omitId?: boolean;
 }): void;
 export declare function formatDocValues(row: Obj, { language, nodeId, typeName }?: {