@paroicms/server 1.83.1 → 1.84.1

package/dist/common/child-ordering-query.js

@@ -7,10 +7,10 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
     if (!orderBy)
         return { ordered: false };
     const orderPropertiesMap = makeMapOfOrderProperties(siteContext, parentDocumentType.regularChildren);
-    const orderByQb = orderByAsString ? makeOrderByAsStringQB() : query;
+    const orderByQ = orderByAsString ? makeOrderByAsStringQuery() : query;
     if (orderBy === "manual") {
         query.leftJoin("PaOrderedNode as o", "o.nodeId", "l.id");
-        orderByQb.orderBy("o.orderNum", "asc").orderBy("l.id", "asc");
+        orderByQ.orderBy("o.orderNum", "asc").orderBy("l.id", "asc");
     }
     else {
         let index = 0;
@@ -22,10 +22,10 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
                         "d.language": "s.language",
                     });
                 }
-                orderByQb.orderBy("d.title", direction);
+                orderByQ.orderBy("d.title", direction);
             }
             else if (fieldName === "publishDate") {
-                orderByQb.orderBy("l.publishDate", direction);
+                orderByQ.orderBy("l.publishDate", direction);
             }
             else {
                 const orderProperties = orderPropertiesMap.get(fieldName);
@@ -43,20 +43,20 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
                     throw new Error(`invalid data type '${dataType}'`);
                 }
                 query.leftJoin(`PaFieldVarchar as f${index}`, {
-                    [`f${index}.field`]: fieldName,
+                    [`f${index}.field`]: siteContext.cn.raw("?", [fieldName]),
                     [`f${index}.nodeId`]: "s.nodeId",
                     [`f${index}.language`]: localized
                         ? "s.language"
                         : siteContext.cn.raw("?", [dbAnyLanguage]),
                 });
-                orderByQb.orderBy(orderByField, direction);
+                orderByQ.orderByRaw(`${orderByField} ${direction}`);
             }
             ++index;
         }
     }
     return {
         ordered: true,
-        orderBy: orderByAsString ? orderByQb.getAsString() : undefined,
+        orderBy: orderByAsString ? orderByQ.getAsString() : undefined,
     };
 }
 function makeMapOfOrderProperties(siteContext, children) {
@@ -82,22 +82,22 @@ function makeMapOfOrderProperties(siteContext, children) {
     }
     return orderProperties;
 }
-function makeOrderByAsStringQB() {
-    let arr = [];
-    const qb = {
+function makeOrderByAsStringQuery() {
+    const arr = [];
+    const query = {
         orderBy(column, direction) {
-            arr = [`${column} ${direction}`];
-            return qb;
-        },
-        addOrderBy(column, direction) {
             arr.push(`${column} ${direction}`);
-            return qb;
+            return query;
+        },
+        orderByRaw(raw) {
+            arr.push(raw);
+            return query;
         },
         getAsString() {
             return arr.join(", ");
         },
     };
-    return qb;
+    return query;
 }
 function toOrderByOrManual(regularChildrenSorting) {
     if (!regularChildrenSorting)

package/dist/common/child-ordering-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}

package/dist/context.d.ts

@@ -1,13 +1,13 @@
 import { type CommonSchemaLibrary } from "@paroicms/connector";
 import type { ImageSize } from "@paroicms/public-anywhere-lib";
-import { type SimpleTranslator, type SiteConf } from "@paroicms/public-server-lib";
+import { type RegisteredSite, type SimpleTranslator } from "@paroicms/public-server-lib";
 export declare const dbAnyLanguage = ".";
 export declare const packageDir: string;
 export declare const appVersion: any, appName: any;
 export declare const appConf: import("@paroicms/connector").AppConf;
 export declare const platformLogger: import("@paroicms/internal-server-lib").PlatformLog;
 export declare const thumbRealSize: ImageSize;
-export declare let siteConfs: Map<string, SiteConf>;
+export declare let registeredSites: Map<string, RegisteredSite>;
 export declare const httpRedirections: Map<string, import("@paroicms/connector").JtHttpRedirection>;
 export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
 export declare function getCommonSchemaLib(): CommonSchemaLibrary;
@@ -16,5 +16,6 @@ export declare const jwtExpiresIn = "180d";
 export declare const platformJwtSecret: string | undefined;
 export declare const platformAuthUrl: string | undefined;
 export declare let simpleI18n: SimpleTranslator;
-export declare function initializeContext(siteConfsVal: Map<string, SiteConf>): Promise<void>;
-export declare function addSiteConf(siteConf: SiteConf): void;
+export declare function initializeContext(registeredSitesVal: Map<string, RegisteredSite>): Promise<void>;
+export declare function addRegisteredSite(regSite: RegisteredSite): void;
+export declare function removeRegisteredSite(fqdn: string): void;

package/dist/context.js

@@ -13,7 +13,7 @@ export const platformLogger = createPlatformLog({
     reportMessage: true,
 });
 export const thumbRealSize = "x200x";
-export let siteConfs;
+export let registeredSites;
 export const httpRedirections = new Map((appConf.httpRedirections ?? []).map((item) => [item.fromFqdn, item]));
 let commonSchemaLib;
 export function initCommonSchemaLib(val) {
@@ -47,23 +47,23 @@ export const platformAuthUrl = appConf.googleAuth && !appConf.googleAuth.disable
     })
     : undefined;
 export let simpleI18n;
-export async function initializeContext(siteConfsVal) {
-    siteConfs = siteConfsVal;
+export async function initializeContext(registeredSitesVal) {
+    registeredSites = registeredSitesVal;
     simpleI18n = await loadSimpleTranslatorFromDirectory({
         l10nDir: join(packageDir, "locales"),
         languages: supportedLanguages,
         logger: platformLogger,
     });
-    for (const siteConf of siteConfs.values()) {
-        if (!siteConf.redirectWww)
+    for (const regSite of registeredSites.values()) {
+        if (!regSite.redirectWww)
             continue;
-        const tokens = siteConf.fqdn.split(".");
+        const tokens = regSite.fqdn.split(".");
         if (tokens.length < 2 || tokens[tokens.length - 1] === "localhost")
             continue;
         const fromFqdn = tokens.length === 2
-            ? `www.${siteConf.fqdn}`
-            : tokens.length === 3 && siteConf.fqdn.startsWith("www.")
-                ? siteConf.fqdn.substring(4)
+            ? `www.${regSite.fqdn}`
+            : tokens.length === 3 && regSite.fqdn.startsWith("www.")
+                ? regSite.fqdn.substring(4)
                 : undefined;
         if (!fromFqdn || httpRedirections.has(fromFqdn))
             continue;
@@ -71,7 +71,7 @@ export async function initializeContext(siteConfsVal) {
             fromFqdn,
             to: makeUrl({
                 protocol: appConf.publicProtocol,
-                fqdn: siteConf.fqdn,
+                fqdn: regSite.fqdn,
                 port: appConf.publicPort,
             }),
         });
@@ -83,10 +83,14 @@ export async function initializeContext(siteConfsVal) {
             .join("\n  - ")}`);
     }
 }
-export function addSiteConf(siteConf) {
-    const { fqdn } = siteConf;
-    if (siteConfs.has(fqdn))
-        throw new Error(`siteConf for "${fqdn}" already exists.`);
-    siteConfs.set(fqdn, siteConf);
+export function addRegisteredSite(regSite) {
+    const { fqdn } = regSite;
+    if (registeredSites.has(fqdn))
+        throw new Error(`regSite for "${fqdn}" already exists.`);
+    registeredSites.set(fqdn, regSite);
+}
+export function removeRegisteredSite(fqdn) {
+    if (!registeredSites.delete(fqdn))
+        throw new Error(`unknown site "${fqdn}"`);
 }
 //# sourceMappingURL=context.js.map

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAGL,iCAAiC,EACjC,OAAO,EACP,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAC9D,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CACxD,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,iBAAiB,CAAC;IAC9C,KAAK,EAAE,OAAO,CAAC,QAAQ;IACvB,IAAI,EAAE,OAAO,CAAC,OAAO;IACrB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAc,OAAO,CAAC;AAEhD,MAAM,CAAC,IAAI,SAAgC,CAAC;AAE5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,GAAG,CACrC,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtE,CAAC;AAEF,IAAI,eAAgD,CAAC;AAErD,MAAM,UAAU,mBAAmB,CAAC,GAAwB;IAC1D,eAAe,GAAG,GAAG,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,eAAe,GACnB,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;AAEvF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC;AACnF,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC;AAGnC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;AACjE,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;IACxB,IAAI,OAAO,CAAC,UAAU;QAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;;QACnF,UAAU,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAGD,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU;IACjD,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAC9D,CAAC,CAAC,SAAS,CAAC;AAEd,MAAM,CAAC,MAAM,eAAe,GAC1B,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ;IAChD,CAAC,CAAC,OAAO,CAAC;QACN,QAAQ,EAAE,OAAO,CAAC,cAAc;QAChC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;QAC7B,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,IAAI,EAAE,OAAO;KACd,CAAC;IACJ,CAAC,CAAC,SAAS,CAAC;AAEhB,MAAM,CAAC,IAAI,UAA4B,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAmC;IACzE,SAAS,GAAG,YAAY,CAAC;IACzB,UAAU,GAAG,MAAM,iCAAiC,CAAC;QACnD,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;QACpC,SAAS,EAAE,kBAAkB;QAC7B,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW;YAAE,SAAS;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW;YAAE,SAAS;QAE7E,MAAM,QAAQ,GACZ,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,OAAO,QAAQ,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5B,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,QAAQ,IAAI,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1D,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC7B,QAAQ;YACR,EAAE,EAAE,OAAO,CAAC;gBACV,QAAQ,EAAE,OAAO,CAAC,cAAc;gBAChC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,IAAI,EAAE,OAAO,CAAC,UAAU;aACzB,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC9B,cAAc,CAAC,IAAI,CACjB,+BAA+B,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;aACjE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aACpD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;aACjD,IAAI,CAAC,QAAQ,CAAC,EAAE,CACpB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAkB;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC1B,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,mBAAmB,CAAC,CAAC;IACnF,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}

package/dist/helpers/cors-middleware.js

@@ -1,5 +1,5 @@
 import cors from "cors";
-import { siteConfs } from "../context.js";
+import { registeredSites } from "../context.js";
 export function createCorsMiddleware() {
     return cors({
         credentials: true,
@@ -11,7 +11,7 @@ export function createCorsMiddleware() {
             }
             try {
                 const originDomain = new URL(origin).hostname;
-                const allowedDomains = Array.from(siteConfs.values()).map((conf) => conf.fqdn);
+                const allowedDomains = Array.from(registeredSites.values()).map((conf) => conf.fqdn);
                 if (allowedDomains.some((domain) => originDomain === domain || originDomain.endsWith(`.${domain}`))) {
                     return callback(null, true);
                 }

package/dist/helpers/cors-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../src/helpers/cors-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,CAAmB;QAC5B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAE3B,IAAI,CAAC,MAAM;gBAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAGzC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YAID,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAE9C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE/E,IACE,cAAc,CAAC,IAAI,CACjB,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,KAAK,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CAC3E,EACD,CAAC;oBACD,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,CAAC;gBAED,QAAQ,CAAC,IAAI,KAAK,CAAC,UAAU,MAAM,sBAAsB,CAAC,EAAE,KAAK,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,QAAQ,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../src/helpers/cors-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,CAAmB;QAC5B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAE3B,IAAI,CAAC,MAAM;gBAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAGzC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YAID,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAE9C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAErF,IACE,cAAc,CAAC,IAAI,CACjB,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,KAAK,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CAC3E,EACD,CAAC;oBACD,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,CAAC;gBAED,QAAQ,CAAC,IAAI,KAAK,CAAC,UAAU,MAAM,sBAAsB,CAAC,EAAE,KAAK,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,QAAQ,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/helpers/make-backend-plugin-service.d.ts

@@ -1,6 +1,6 @@
 import { type SitePlugin } from "@paroicms/connector";
-import { type BackendPluginRenderService, type BackendPluginService } from "@paroicms/public-server-lib";
+import { type BackendPluginRenderService } from "@paroicms/public-server-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-export declare function makeBackendPluginService(siteContext: SiteContext, plugin: SitePlugin): BackendPluginService;
+export declare function executeHook(siteContext: SiteContext, hookName: string, params?: any): any[];
 export declare function makeBackendPluginRenderService(siteContext: SiteContext, renderingContext: RenderingContext, plugin: SitePlugin): BackendPluginRenderService;

package/dist/helpers/make-backend-plugin-service.js

@@ -1,45 +1,23 @@
-import { createNewSiteConf, getPluginAssetsUrl } from "@paroicms/connector";
+import { getPluginAssetsUrl } from "@paroicms/connector";
 import { parseNodelId, unwrapReadFieldValue } from "@paroicms/public-anywhere-lib";
 import { toAbsoluteUrl, } from "@paroicms/public-server-lib";
 import { getSiteFieldValue } from "../bo-backend/fields/load-fields.queries.js";
 import { sendMail } from "../common/mail/sendMail.helpers.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
-import { addSiteConf, appConf } from "../context.js";
+import { appConf } from "../context.js";
 import { validateRecaptchaResponse } from "../public-api/mail/validate-recaptcha-response.js";
 import { renderChildPartials, renderSearchPartials } from "../public-api/public-api-rendering.js";
 import { getDocItem } from "../public-payload/doc-values.queries.js";
 import { makeImageAvailable } from "../public-payload/make-image-available.js";
 import { getUrlOfDocument } from "../public-site/public-route/make-url.js";
 import { createRunningInstanceConnector } from "./running-instance-connector.js";
-export function makeBackendPluginService(siteContext, plugin) {
-    return {
-        fqdn: siteContext.fqdn,
-        logger: siteContext.logger,
-        siteSchema: siteContext.siteSchema,
-        siteUrl: siteContext.siteUrl,
-        themeConf: siteContext.themeConf,
-        validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
-        sendMail: (mailData) => sendMail(mailData, { logger: siteContext.logger }),
-        executeHook: (hookName, params) => {
-            const hook = siteContext.hooks.get(hookName);
-            if (!hook)
-                return [];
-            return hook.map(({ handler, plugin }) => {
-                return handler(makeBackendPluginService(siteContext, plugin), params);
-            });
-        },
-        configuration: plugin.configuration,
-        pluginAssetsUrl: getPluginAssetsUrl(plugin),
-        registerNewSite: async (options) => {
-            if (appConf.kind !== "multisite") {
-                throw new Error("registerNewSite is only available in multisite mode");
-            }
-            const siteConf = await createNewSiteConf(options, appConf);
-            addSiteConf(siteConf);
-            return Object.freeze({ ...siteConf });
-        },
-        connector: createRunningInstanceConnector(),
-    };
+export function executeHook(siteContext, hookName, params) {
+    const hook = siteContext.hooks.get(hookName);
+    if (!hook)
+        return [];
+    return hook.map(({ handler, plugin }) => {
+        return handler(makeBackendPluginService(siteContext, plugin), params);
+    });
 }
 export function makeBackendPluginRenderService(siteContext, renderingContext, plugin) {
     return {
@@ -63,6 +41,22 @@ export function makeBackendPluginRenderService(siteContext, renderingContext, pl
         },
     };
 }
+function makeBackendPluginService(siteContext, plugin) {
+    return {
+        fqdn: siteContext.fqdn,
+        logger: siteContext.logger,
+        siteSchema: siteContext.siteSchema,
+        siteUrl: siteContext.siteUrl,
+        themeConf: siteContext.themeConf,
+        validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
+        sendMail: (mailData) => sendMail(mailData, { logger: siteContext.logger }),
+        executeHook: (hookName, params) => executeHook(siteContext, hookName, params),
+        configuration: plugin.configuration,
+        pluginAssetsUrl: getPluginAssetsUrl(plugin),
+        registeredSite: siteContext.regSite,
+        connector: createRunningInstanceConnector(),
+    };
+}
 function createValidateRecaptchaResponseForPlugin(siteContext) {
     if (!appConf.googleRecaptcha || appConf.googleRecaptcha.disabled) {
         return () => Promise.resolve(true);

package/dist/helpers/make-backend-plugin-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAkB,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAIL,aAAa,GACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAoB,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAE3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,MAAM,UAAU,wBAAwB,CACtC,WAAwB,EACxB,MAAkB;IAElB,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,yBAAyB,EAAE,wCAAwC,CAAC,WAAW,CAAC;QAChF,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;QAC1E,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBAAE,OAAO,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;gBACtC,OAAO,OAAO,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;QACL,CAAC;QACD,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,eAAe,EAAE,kBAAkB,CAAC,MAAM,CAAC;QAC3C,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACjC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3D,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;QACxC,CAAC;QACD,SAAS,EAAE,8BAA8B,EAAE;KAC5C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,WAAwB,EACxB,gBAAkC,EAClC,MAAkB;IAElB,OAAO;QACL,GAAG,wBAAwB,CAAC,WAAW,EAAE,MAAM,CAAC;QAChD,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;gBACjD,GAAG,OAAO;gBACV,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC3C,CAAC;QACD,mBAAmB,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YAClD,OAAO,MAAM,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACtE,CAAC;QACD,oBAAoB,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YACnD,OAAO,MAAM,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACvE,CAAC;QACD,QAAQ,EAAE,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC;QACzD,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAChC,OAAO,MAAM,WAAW,CAAC,WAAW,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;QACtE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,wCAAwC,CAC/C,WAAsC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACjE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,OAAO,CAAC,kBAAsC,EAAE,EAAE,CAChD,yBAAyB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAwB,EAAE,gBAAkC;IACpF,OAAO,KAAK,EAAE,OAA8C,EAAE,EAAE;QAC9D,MAAM,KAAK,GAA4B,MAAM,kBAAkB,CAAC,WAAW,EAAE,gBAAgB,EAAE;YAC7F,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAEvD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,WAAwB,EACxB,gBAAkC,EAClC,aAAqB;IAErB,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IAC/C,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAE1E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACrF,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,OAAO;QACL,EAAE,EAAE,aAAa;QACjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACxB,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,gBAAgB,CACpD,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,EACV,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,CAAC;YACrD,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,CAAC;QACD,QAAQ,EAAE,UAAU,CAAC,IAAI;QACzB,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,WAAW,EAAE,UAAU,CAAC,WAAW;KACpC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"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"}

package/dist/helpers/running-instance-connector.js

@@ -1,7 +1,8 @@
+import { createNewRegisteredSite } from "@paroicms/connector";
 import { getNodeTypeByName, getRegularDocumentTypeByName, getRoutingDocumentTypeByName, } from "@paroicms/internal-anywhere-lib";
 import { generateSlug } from "@paroicms/public-anywhere-lib";
 import mime from "mime";
-import { readFile } from "node:fs/promises";
+import { readFile, rm } from "node:fs/promises";
 import { basename } from "node:path";
 import { createDocumentOnNode, createNodeWithDocument, updateDocument, } from "../bo-backend/document/save-documents.queries.js";
 import { saveFieldValues } from "../bo-backend/fields/save-fields.queries.js";
@@ -9,8 +10,8 @@ import { addMediaToNode } from "../bo-backend/media/add-media-to-node.js";
 import { getTypeNameOf } from "../bo-backend/node/node.queries.js";
 import { createNodeWithPart, createPartOnNode } from "../bo-backend/part/part.queries.js";
 import { getHandleOfFeaturedImage, getHandleOfField } from "../common/media-handles.helpers.js";
-import { appConf } from "../context.js";
-import { getSiteContext } from "../site-context/site-context.js";
+import { addRegisteredSite, appConf, platformLogger, registeredSites, removeRegisteredSite, } from "../context.js";
+import { getActiveSiteContext, getSiteContext, unloadSiteContext, } from "../site-context/site-context.js";
 import { hashPassword } from "./passwordEncrypt-helper.js";
 export function createRunningInstanceConnector() {
     return {
@@ -35,6 +36,8 @@ export function createRunningInstanceConnector() {
         updateDocumentContent,
         addMultipleDocumentContents,
         addMultiplePartContents,
+        registerNewSite,
+        removeSite,
     };
 }
 async function createAccount(fqdn, account, options) {
@@ -291,4 +294,40 @@ function createFieldValuesToAdd(fields, fieldTypes) {
     }
     return { multilingualFieldValues, fieldMedias: medias };
 }
+async function registerNewSite(options) {
+    if (appConf.kind !== "multisite") {
+        throw new Error("registerNewSite is only available in multisite mode");
+    }
+    const newRegSite = await createNewRegisteredSite(options, appConf);
+    addRegisteredSite(newRegSite);
+    return newRegSite;
+}
+async function removeSite(fqdn) {
+    if (appConf.kind !== "multisite") {
+        throw new Error("removeSite is only available in multisite mode");
+    }
+    const regSite = registeredSites.get(fqdn);
+    if (!regSite)
+        throw new Error(`unknown site "${fqdn}"`);
+    removeRegisteredSite(fqdn);
+    const siteContext = getActiveSiteContext(fqdn, { returnsUndef: true });
+    if (siteContext) {
+        await unloadSiteContext(siteContext);
+    }
+    const directories = Array.from(new Set([regSite.dataDir, regSite.cacheDir, regSite.backupDir, regSite.siteDir])).sort();
+    platformLogger.info(`Remove site "${fqdn}": ${directories.join(", ")}`);
+    for (const dir of directories) {
+        await rmDirRecursive(dir);
+    }
+}
+async function rmDirRecursive(dir) {
+    try {
+        await rm(dir, { recursive: true, force: true });
+    }
+    catch (error) {
+        if (error.code !== "ENOENT") {
+            throw error;
+        }
+    }
+}
 //# sourceMappingURL=running-instance-connector.js.map

package/dist/helpers/running-instance-connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"running-instance-connector.js","sourceRoot":"","sources":["../../src/helpers/running-instance-connector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"running-instance-connector.js","sourceRoot":"","sources":["../../src/helpers/running-instance-connector.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,11 +1,11 @@
-import { createSiteConfsFromSingle, loadSitePackConfs, readCommonSchemaLibrary, } from "@paroicms/connector";
+import { createRegisteredSitesFromSingle, loadRegisteredSitesFromPacks, readCommonSchemaLibrary, } from "@paroicms/connector";
 import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
 import { makeUrl } from "@paroicms/public-server-lib";
 import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
 import compression from "compression";
 import express from "express";
 import rateLimit from "express-rate-limit";
-import { appConf, initCommonSchemaLib, initializeContext, platformAuthUrl, platformLogger, siteConfs, } from "./context.js";
+import { appConf, initCommonSchemaLib, initializeContext, platformAuthUrl, platformLogger, registeredSites, } from "./context.js";
 import { httpRedirectionMiddleware } from "./express/http-redirection-middleware.js";
 import { loadPaContextsMiddleware, reqHandlerToExpressMiddleware, } from "./express/route-handler-wrapper.js";
 import { createBoGraphqlMiddleware, createSiteMiddleware } from "./express/site-middleware.js";
@@ -23,10 +23,10 @@ export async function start(options = {}) {
         await platformLogger.untilReady;
         watchForIdleSiteContexts();
         setupImageProcessor({ ...appConf.imageProcessor, logger: platformLogger });
-        const siteConfs = appConf.kind === "multisite"
-            ? await loadSitePackConfs(appConf, options.sitePackPlaces)
-            : await createSiteConfsFromSingle(appConf);
-        await initializeContext(siteConfs);
+        const regSites = appConf.kind === "multisite"
+            ? await loadRegisteredSitesFromPacks(appConf, options.sitePackPlaces)
+            : await createRegisteredSitesFromSingle(appConf);
+        await initializeContext(regSites);
         initCommonSchemaLib(await readCommonSchemaLibrary());
         const stopCron = startCronLike(maintenanceTask, {
             shouldExecute: eachDay({ hours: 2 }),
@@ -70,14 +70,14 @@ export async function start(options = {}) {
     }
 }
 function getListOfSiteUrls() {
-    return Array.from(siteConfs.values())
-        .map((siteConf) => {
+    return Array.from(registeredSites.values())
+        .map((regSite) => {
         return {
-            siteUrl: siteConf.siteUrl,
+            siteUrl: regSite.siteUrl,
             boUrl: makeUrl({
                 protocol: appConf.publicProtocol,
                 port: appConf.boPort,
-                fqdn: siteConf.fqdn,
+                fqdn: regSite.fqdn,
                 path: "/adm",
             }),
         };

package/dist/index.js.map

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

package/dist/oauth/oauth2-client.controller.js

@@ -1,6 +1,6 @@
 import { ApiError, escapeHtml, makeUrl } from "@paroicms/public-server-lib";
 import { generatePlatformToken, googleAuthGuard } from "../bo-backend/auth/auth.helper.js";
-import { appConf, platformAuthUrl, siteConfs } from "../context.js";
+import { appConf, platformAuthUrl, registeredSites } from "../context.js";
 import { getRouteParameter } from "../express/http-helpers.js";
 export async function authController(req, res) {
     if (!appConf.googleAuth || appConf.googleAuth.disabled || !platformAuthUrl) {
@@ -29,13 +29,13 @@ export async function siteUrlController(req, _res) {
     if (!appConf.googleAuth || appConf.googleAuth.disabled || !platformAuthUrl) {
         throw new Error("Google auth is disabled");
     }
-    const siteConf = siteConfs.get(redirectTo);
-    if (!siteConf)
+    const regSite = registeredSites.get(redirectTo);
+    if (!regSite)
         throw new ApiError("Site not found", 404);
     return makeUrl({
         protocol: appConf.publicProtocol,
         port: appConf.boPort,
-        fqdn: siteConf.fqdn,
+        fqdn: regSite.fqdn,
     });
 }
 function generateGoogleRedirectPageHtml({ platformToken, platformAuthUrl, }) {

package/dist/oauth/oauth2-client.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE5E,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa;IAC9D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAI,QAAQ,CAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,OAAO,CAAC,cAAc;QAChC,IAAI,EAAE,OAAO,CAAC,MAAM;QACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;KACpB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,aAAa,EACb,eAAe,GACoC;IACnD,OAAO;;;;;;;;;;;;;;iEAcwD,UAAU,CAAC,aAAa,CAAC;;;;iCAIzD,UAAU,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;QAgBpD,CAAC;AACT,CAAC;AAED,SAAS,oBAAoB,CAAC,eAAuB;IACnD,OAAO;;;;;;;;;;;;;;+BAcsB,UAAU,CAAC,eAAe,CAAC;;;QAGlD,CAAC;AACT,CAAC"}
+{"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE5E,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa;IAC9D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAI,QAAQ,CAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACxD,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,OAAO,CAAC,cAAc;QAChC,IAAI,EAAE,OAAO,CAAC,MAAM;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,aAAa,EACb,eAAe,GACoC;IACnD,OAAO;;;;;;;;;;;;;;iEAcwD,UAAU,CAAC,aAAa,CAAC;;;;iCAIzD,UAAU,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;QAgBpD,CAAC;AACT,CAAC;AAED,SAAS,oBAAoB,CAAC,eAAuB;IACnD,OAAO;;;;;;;;;;;;;;+BAcsB,UAAU,CAAC,eAAe,CAAC;;;QAGlD,CAAC;AACT,CAAC"}

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

@@ -1,3 +1,4 @@
+import { nbVal } from "@paroi/data-formatters-lib";
 import { dbAnyLanguage } from "../../context.js";
 import { formatDocValues, querySelectDocValues } from "../../public-payload/doc-values.queries.js";
 export async function searchText(siteContext, options) {
@@ -27,11 +28,9 @@ export async function searchText(siteContext, options) {
             language,
             words,
             onlyPublished,
-        })
-            .distinct()
-            .count("* as count");
+        }).countDistinct("l.id as cnt");
         const countResult = await countQuery.first();
-        total = countResult ? countResult.count : 0;
+        total = countResult ? nbVal(countResult.cnt) : 0;
     }
     return {
         rows: rows.map((row) => formatDocValues(row, { language })),