@paroicms/server 1.44.0 → 1.46.0

package/dist/public-payload/site-payload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSitePayload = void 0;
+exports.makeSitePayload = makeSitePayload;
 const data_format_1 = require("../common/data-format");
 const context_1 = require("../context");
 const make_url_1 = require("../modules/public-site/public-route/make-url");
@@ -27,17 +27,16 @@ function makeSitePayload(siteContext, renderingContext, language) {
         languageLabel: siteContext.siteSchema.languageLabels[language],
     };
 }
-exports.makeSitePayload = makeSitePayload;
 function toPublicRoutingPointSectionIds(ids, language) {
     const sectionId = ids.sectionIds[language];
     if (sectionId === undefined) {
-        throw new Error(`missing section for '${ids.leafType}', language '${language}'`);
+        throw new Error(`missing section for '${ids.typeName}', language '${language}'`);
     }
     const parentIds = {
         id: sectionId,
     };
-    for (const [childLeafType, childIds] of Object.entries(ids.children ?? {})) {
-        parentIds[childLeafType] = toPublicRoutingPointSectionIds(childIds, language);
+    for (const [childTypeName, childIds] of Object.entries(ids.children ?? {})) {
+        parentIds[childTypeName] = toPublicRoutingPointSectionIds(childIds, language);
     }
     return parentIds;
 }

package/dist/public-payload/site-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":";;;AACA,uDAA4E;AAC5E,wCAAqC;AAErC,2EAA0E;AAE1E,iDAA0D;AAG1D,SAAgB,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,8BAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,aAAa,EAAE;YACb,KAAK,EAAE,GAAG,cAAc,WAAW;SACpC;QACD,SAAS,EAAE,IAAA,8BAAgB,EAAC,WAAW,CAAC;QACxC,KAAK,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,YAAY,EAAE,iBAAO,CAAC,eAAe,EAAE,OAAO;QAC9C,IAAI,EAAE;YACJ,GAAG,EAAE,IAAA,qBAAU,EAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ,EAAE,QAAQ;QAClB,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;KAC/D,CAAC;AACJ,CAAC;AAzBD,0CAyBC;AAED,SAAS,8BAA8B,CACrC,GAAoB,EACpB,QAAgB;IAEhB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,SAAS,GAAyC;QACtD,EAAE,EAAE,SAAS;KACd,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,8BAA8B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":";;AASA,0CAyBC;AAjCD,uDAA4E;AAC5E,wCAAqC;AAErC,2EAA0E;AAE1E,iDAA0D;AAG1D,SAAgB,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,8BAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,aAAa,EAAE;YACb,KAAK,EAAE,GAAG,cAAc,WAAW;SACpC;QACD,SAAS,EAAE,IAAA,8BAAgB,EAAC,WAAW,CAAC;QACxC,KAAK,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,YAAY,EAAE,iBAAO,CAAC,eAAe,EAAE,OAAO;QAC9C,IAAI,EAAE;YACJ,GAAG,EAAE,IAAA,qBAAU,EAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ,EAAE,QAAQ;QAClB,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACrC,GAAoB,EACpB,QAAgB;IAEhB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,SAAS,GAAyC;QACtD,EAAE,EAAE,SAAS;KACd,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,8BAA8B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/public-payload/taxonomies.queries.d.ts

@@ -3,12 +3,12 @@ import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedSectionId } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../site-context/site-context.types";
 import type * as publicPayload from "./public-payload.types";
-export declare function loadLabeledByTerms(siteContext: SiteContext, tracker: Tracker, { documentId, taxonomyLeafType }: {
+export declare function loadLabeledByTerms(siteContext: SiteContext, tracker: Tracker, { documentId, taxonomyTypeName }: {
     documentId: ParsedSectionId;
-    taxonomyLeafType: string;
+    taxonomyTypeName: string;
 }): Promise<publicPayload.TermValues[] | undefined>;
-export declare function formatTermValues(row: Obj, { language, leafId, leafType }?: {
+export declare function formatTermValues(row: Obj, { language, leafId, typeName }?: {
     language?: string;
     leafId?: string;
-    leafType?: string;
+    typeName?: string;
 }): publicPayload.TermValues;

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatTermValues = exports.loadLabeledByTerms = void 0;
+exports.loadLabeledByTerms = loadLabeledByTerms;
+exports.formatTermValues = formatTermValues;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const connector_1 = require("@paroicms/connector");
 const doc_values_queries_1 = require("./doc-values.queries");
-async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyLeafType }) {
+async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyTypeName }) {
     const query = siteContext.cn.createQueryBuilder();
     (0, doc_values_queries_1.querySelectDocValues)(query);
     query
@@ -21,7 +22,7 @@ async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyLe
     })
         .andWhere("f.labeledId = :leafId", { leafId: documentId.leafId })
         .andWhere("l.publishDate <= current_timestamp")
-        .andWhere("l2.leafType = :taxonomyLeafType", { taxonomyLeafType })
+        .andWhere("l2.typeName = :taxonomyTypeName", { taxonomyTypeName })
         .orderBy("d.title", "ASC");
     const rows = await query.getRawMany();
     tracker.trackAccess(connector_1.mainDbSchemaName, "PaLabeling", "read");
@@ -33,13 +34,11 @@ async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyLe
         };
     });
 }
-exports.loadLabeledByTerms = loadLabeledByTerms;
-function formatTermValues(row, { language, leafId, leafType } = {}) {
+function formatTermValues(row, { language, leafId, typeName } = {}) {
     return {
-        ...(0, doc_values_queries_1.formatDocValues)(row, { language, leafId, leafType }),
+        ...(0, doc_values_queries_1.formatDocValues)(row, { language, leafId, typeName }),
         inRightLanguage: (0, data_formatters_lib_1.boolVal)(row.inRightLanguage),
         isLead: (0, data_formatters_lib_1.boolVal)(row.inRightLanguage),
     };
 }
-exports.formatTermValues = formatTermValues;
 //# sourceMappingURL=taxonomies.queries.js.map

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,oEAA8E;AAC9E,mDAAuD;AAIvD,6DAA6E;AAGtE,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA6D;IAE3F,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAA,yCAAoB,EAAC,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,WAAW,EAAE,GAAG,EAAE,wDAAwD,EAAE;QACrF,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,4CAA4C,EAAE;QAC1E,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,4BAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,gDAkCC;AAED,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC;AATD,4CASC"}
+{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":";;AAQA,gDAkCC;AAED,4CASC;AArDD,oEAA8E;AAC9E,mDAAuD;AAIvD,6DAA6E;AAGtE,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA6D;IAE3F,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAA,yCAAoB,EAAC,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,WAAW,EAAE,GAAG,EAAE,wDAAwD,EAAE;QACrF,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,4CAA4C,EAAE;QAC1E,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,4BAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC"}

package/dist/public-payload/translations.queries.d.ts

@@ -3,5 +3,5 @@ import { type DropInst } from "../liquidjs-tools/liquidjs-drop";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
 import type { SiteContext } from "../site-context/site-context.types";
 import type { DocTranslation } from "./public-payload.types";
-export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">): DocTranslation[];
+export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema">): DocTranslation[];
 export declare function loadTranslationsAsDrops(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedSectionId): Promise<DropInst<DocTranslation>[]>;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTranslationsAsDrops = exports.makeBasicTranslationsPayload = void 0;
+exports.makeBasicTranslationsPayload = makeBasicTranslationsPayload;
+exports.loadTranslationsAsDrops = loadTranslationsAsDrops;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const connector_1 = require("@paroicms/connector");
 const text_cache_1 = require("../common/text-cache");
@@ -16,7 +17,6 @@ function makeBasicTranslationsPayload(siteContext) {
         url: (0, make_url_1.getHomeUrl)(siteContext, language),
     }));
 }
-exports.makeBasicTranslationsPayload = makeBasicTranslationsPayload;
 async function loadTranslationsAsDrops(siteContext, renderingContext, documentId) {
     const { leafId } = documentId;
     const existingLanguages = await getExistingLanguagesOf(siteContext, renderingContext.tracker, leafId);
@@ -47,7 +47,6 @@ async function loadTranslationsAsDrops(siteContext, renderingContext, documentId
     renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ leafId }));
     return translations;
 }
-exports.loadTranslationsAsDrops = loadTranslationsAsDrops;
 async function getExistingLanguagesOf(siteContext, tracker, leafId) {
     const documents = await siteContext.cn
         .createQueryBuilder()

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/create-site-context.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSiteContext = void 0;
+exports.createSiteContext = createSiteContext;
 const common_1 = require("@nestjs/common");
 const connector_1 = require("@paroicms/connector");
 const internal_server_lib_1 = require("@paroicms/internal-server-lib");
@@ -33,7 +33,6 @@ const get_doc_tag_1 = require("../modules/public-site/liquidjs-tags/get-doc-tag"
 const get_docs_tag_1 = require("../modules/public-site/liquidjs-tags/get-docs-tag");
 const get_paginated_docs_tag_1 = require("../modules/public-site/liquidjs-tags/get-paginated-docs-tag");
 const use_image_tag_1 = require("../modules/public-site/liquidjs-tags/use-image-tag");
-const plugin_api_1 = require("../plugins/plugin-api");
 async function createSiteContext(siteConf) {
     const { siteName, siteDir, dataDir, cacheDir, backupDir, fqdn } = siteConf;
     const themeDir = (0, node_path_1.join)(siteDir, "theme");
@@ -41,7 +40,7 @@ async function createSiteContext(siteConf) {
     await (0, internal_server_lib_1.ensureDirectory)(dataDir);
     await (0, internal_server_lib_1.ensureDirectory)(cacheDir);
     await (0, internal_server_lib_1.ensureDirectory)(backupDir);
-    const { siteSchema, plugins } = await (0, connector_1.loadSiteSchema)(siteConf, context_1.platformLog, (0, context_1.getSiteSchemaLib)());
+    const { siteSchema, plugins } = await (0, connector_1.loadSiteSchema)(siteLog, siteConf, (0, context_1.getCommonSchemaLib)());
     const mediaStorage = await (0, connector_1.initializeMediaStorage)({ siteLog, dataDir }, { canCreate: !!context_1.appConf.generateMissingDatabases });
     const { cn, logNextQuery } = await (0, connector_1.createOrOpenMainConnection)(dataDir, {
         canCreate: !!context_1.appConf.generateMissingDatabases,
@@ -90,19 +89,41 @@ async function createSiteContext(siteConf) {
         imageCache,
         textCache,
         themeTranslator,
-        multilingual: siteSchema.languages.length > 1,
         themeConf,
-        plugins: new Map(plugins.map((plugin) => [plugin.publicDirName, plugin])),
+        plugins: new Map(plugins.map((plugin) => [plugin.publicDirName, toSitePlugin(plugin)])),
         headTags: [],
         logNextQuery,
         siteLog,
         fieldPreprocessors: new Map(),
     };
     configureLiquidEngine(siteContext);
-    await (0, plugin_api_1.initialisePlugins)(siteContext, plugins);
+    postInitPlugins(siteContext, plugins);
     return siteContext;
 }
-exports.createSiteContext = createSiteContext;
+function toSitePlugin(plugin) {
+    const { postInitData, ...rest } = plugin;
+    return rest;
+}
+function postInitPlugins(siteContext, plugins) {
+    for (const plugin of plugins) {
+        const { postInitData } = plugin;
+        for (const { filterName, handler, options } of postInitData.liquidFilters) {
+            siteContext.liquidEngine.registerFilter(filterName, {
+                handler: (0, liquidjs_filter_1.toLiquidJsFilterHandler)(siteContext, handler),
+                raw: options?.raw ?? false,
+            });
+        }
+        for (const { dataType, handler } of postInitData.fieldPreprocessors) {
+            let preprocessors = siteContext.fieldPreprocessors.get(dataType);
+            if (!preprocessors) {
+                preprocessors = [];
+                siteContext.fieldPreprocessors.set(dataType, preprocessors);
+            }
+            preprocessors.push(handler);
+        }
+        siteContext.headTags.push(...postInitData.headHtmlTags);
+    }
+}
 function configureLiquidEngine(siteContext) {
     const { liquidEngine } = siteContext;
     liquidEngine.registerTag("include", createDisabledLiquidJSTag("include"));

package/dist/site-context/create-site-context.js.map

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

package/dist/site-context/site-context.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watchForIdleSiteContexts = exports.unloadSiteContext = exports.getSiteContext = exports.getActiveSiteContext = exports.getActiveSiteContexts = void 0;
+exports.getActiveSiteContexts = getActiveSiteContexts;
+exports.getActiveSiteContext = getActiveSiteContext;
+exports.getSiteContext = getSiteContext;
+exports.unloadSiteContext = unloadSiteContext;
+exports.watchForIdleSiteContexts = watchForIdleSiteContexts;
 const common_1 = require("@nestjs/common");
 const context_1 = require("../context");
 const create_site_context_1 = require("./create-site-context");
@@ -10,7 +14,6 @@ const activeContextAndTimes = new Map();
 function getActiveSiteContexts() {
     return Array.from(activeContextAndTimes.values()).map((item) => item.siteContext);
 }
-exports.getActiveSiteContexts = getActiveSiteContexts;
 function getActiveSiteContext(fqdn, options = {}) {
     const item = activeContextAndTimes.get(fqdn);
     if (item) {
@@ -21,7 +24,6 @@ function getActiveSiteContext(fqdn, options = {}) {
         return;
     throw new Error(`should have the site-context for '${fqdn}'`);
 }
-exports.getActiveSiteContext = getActiveSiteContext;
 function getSiteContext(fqdn, options = {}) {
     let promise = promises.get(fqdn);
     if (promise) {
@@ -39,7 +41,6 @@ function getSiteContext(fqdn, options = {}) {
     }
     return promise;
 }
-exports.getSiteContext = getSiteContext;
 async function unloadSiteContext(siteContext) {
     const { siteLog } = siteContext;
     promises.delete(siteContext.fqdn);
@@ -52,7 +53,6 @@ async function unloadSiteContext(siteContext) {
     ]);
     siteLog.info("Site unloaded ↘");
 }
-exports.unloadSiteContext = unloadSiteContext;
 async function wrapCreateSiteContext(siteConf) {
     const siteContext = await (0, create_site_context_1.createSiteContext)(siteConf);
     activeContextAndTimes.set(siteConf.fqdn, {
@@ -72,7 +72,6 @@ function watchForIdleSiteContexts() {
     const intervalId = setInterval(closeIdlingSiteContexts, 1000 * 60 * 5);
     intervalId.unref();
 }
-exports.watchForIdleSiteContexts = watchForIdleSiteContexts;
 async function closeIdlingSiteContexts() {
     const limit = Date.now() - MAX_IDLE_TIME;
     for (const { lastUseTimeMs, siteContext } of activeContextAndTimes.values()) {

package/dist/site-context/site-context.js.map

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

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

@@ -1,6 +1,6 @@
-import type { PublicSiteContext } from "@paroicms/connector";
+import type { PublicSiteContext, SitePlugin } from "@paroicms/connector";
 import type { SiteIds } from "@paroicms/public-anywhere-lib";
-import type { FieldPreprocessor, Plugin, SimpleTranslator } from "@paroicms/public-server-lib";
+import type { FieldPreprocessor, SimpleTranslator } from "@paroicms/public-server-lib";
 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";
@@ -14,7 +14,7 @@ export interface SiteContext extends PublicSiteContext {
     imageCache: ImageCacheEngine;
     textCache: TextCacheSystem;
     themeTranslator: SimpleTranslator;
-    plugins: Map<string, Plugin>;
+    plugins: Map<string, SitePlugin>;
     headTags: string[];
     logNextQuery: (count?: number) => void;
     fieldPreprocessors: Map<string, FieldPreprocessor[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "1.44.0",
+  "version": "1.46.0",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -22,7 +22,7 @@
     "start": "node dist/start.js | npm run _pino-pretty",
     "build": "tsc",
     "tsc": "tsc",
-    "nodemon": "nodemon --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch ../../packages/server-database-media-storage/dist --watch ../../packages/server-image-cache-engine/dist --watch ../../packages/server-text-cache-system/dist --watch ../../packages/internal-server-lib/dist --watch ../../packages/internal-anywhere-lib/dist --watch ../../packages/public-anywhere-lib/dist dist/start.js | npm run _pino-pretty",
+    "nodemon": "nodemon --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch ../../packages/connector/dist --watch ../../packages/server-database-media-storage/dist --watch ../../packages/server-image-cache-engine/dist --watch ../../packages/server-text-cache-system/dist --watch ../../packages/internal-server-lib/dist --watch ../../packages/internal-anywhere-lib/dist --watch ../../packages/public-anywhere-lib/dist dist/start.js | npm run _pino-pretty",
     "tsc:watch": "tsc --watch --preserveWatchOutput",
     "dev": "turbo dev",
     "clear": "rimraf dist/*",
@@ -45,16 +45,16 @@
     "@nestjs/platform-express": "~10.3.8",
     "@nestjs/throttler": "~5.1.2",
     "@paroi/data-formatters-lib": "~0.4.0",
-    "@paroicms/internal-anywhere-lib": "1.17.1",
-    "@paroicms/bo": "1.35.1",
-    "@paroicms/public-anywhere-lib": "0.2.1",
-    "@paroicms/public-server-lib": "0.7.0",
-    "@paroicms/server-database-media-storage": "1.7.3",
-    "@paroicms/server-image-cache-engine": "1.10.3",
-    "@paroicms/internal-server-lib": "1.6.3",
-    "@paroicms/server-text-cache-system": "1.6.3",
-    "@paroicms/site-app": "1.9.1",
-    "@paroicms/connector": "0.2.0",
+    "@paroicms/internal-anywhere-lib": "1.18.1",
+    "@paroicms/bo": "1.37.0",
+    "@paroicms/public-anywhere-lib": "0.4.0",
+    "@paroicms/public-server-lib": "0.9.0",
+    "@paroicms/server-database-media-storage": "1.8.1",
+    "@paroicms/server-image-cache-engine": "1.12.0",
+    "@paroicms/internal-server-lib": "1.7.1",
+    "@paroicms/server-text-cache-system": "1.7.1",
+    "@paroicms/site-app": "1.10.0",
+    "@paroicms/connector": "0.4.0",
     "bcrypt": "~5.1.0",
     "class-transformer": "~0.5.1",
     "class-validator": "~0.14.0",
@@ -87,7 +87,7 @@
     "rimraf": "~6.0.1",
     "sass": "~1.77.8",
     "source-map-support": "~0.5.21",
-    "typescript": "~5.4.5",
+    "typescript": "~5.5.4",
     "vitest": "~1.5.3"
   },
   "peerDependencies": {

package/schema.gql

@@ -39,9 +39,9 @@ type BackupInfo {
 type BreadcrumbItem {
   language: String!
   leafId: ID!
-  leafType: String!
   sectionId: ID!
   title: String
+  typeName: String!
 }
 
 input CreateAccountValues {
@@ -57,9 +57,9 @@ input CreateDocumentValues {
 }
 
 input CreateLeafWithDocumentValues {
-  leafType: String!
   slug: String
   title: String
+  typeName: String!
 }
 
 type CurrentThemeConf {
@@ -100,7 +100,7 @@ type FaviconThumb {
 type Labeling {
   document(language: String!): TermDocument
   isLead: Boolean!
-  taxonomyLeafType: String!
+  taxonomyTypeName: String!
   termId: ID!
 }
 
@@ -112,11 +112,11 @@ type LanguageWithLabel {
 type Leaf {
   id: ID!
   labeledBy: [Labeling!]!
-  leafType: String!
   parentId: ID
   planned: Boolean!
   publishDate: DateTime
   relativeId: String!
+  typeName: String!
 }
 
 type Media {
@@ -135,7 +135,7 @@ type Mutation {
   createAccount(values: CreateAccountValues!): Account!
   createDocumentOnLeaf(language: String!, leafId: ID!, values: CreateDocumentValues): Document!
   createLeafWithDocument(parentSectionId: String!, values: CreateLeafWithDocumentValues!): Document!
-  createLeafWithPart(leafType: String!, listName: String!, parentSectionId: String!): Part!
+  createLeafWithPart(listName: String!, parentSectionId: String!, typeName: String!): Part!
   createPartOnLeaf(language: String!, leafId: ID!): Part!
   deleteAccount(accountId: ID!): Boolean!
   deleteDocument(sectionId: String!): Boolean!
@@ -178,23 +178,23 @@ type Part {
   fieldValues(fieldNames: [String!], preprocess: Boolean): String!
   language: String!
   leafId: ID!
-  leafType: String!
   listName: String!
   orderNum: Int
   parts: [PartOrPlaceholder!]
   publishDate: DateTime!
   scheduled: Boolean!
   sectionId: ID!
+  typeName: String!
 }
 
 union PartOrPlaceholder = Part | PartPlaceholder
 
 type PartPlaceholder {
   leafId: ID!
-  leafType: String!
   listName: String!
   orderNum: Int
   publishDate: DateTime!
+  typeName: String!
 }
 
 type Query {

package/dist/plugins/plugin-api.d.ts

@@ -1,3 +0,0 @@
-import type { Plugin } from "@paroicms/public-server-lib";
-import type { SiteContext } from "../site-context/site-context.types";
-export declare function initialisePlugins(siteContext: SiteContext, plugins: Plugin[]): Promise<void>;

package/dist/plugins/plugin-api.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialisePlugins = void 0;
-const liquidjs_filter_1 = require("../liquidjs-tools/liquidjs-filter");
-async function initialisePlugins(siteContext, plugins) {
-    for (const p of plugins) {
-        const api = createPluginApi(siteContext, p);
-        try {
-            await p.plugin.siteInit?.(api);
-        }
-        catch (error) {
-            siteContext.siteLog.error(`Failed initializing plugin '${p.pluginName}'`);
-            throw error;
-        }
-    }
-}
-exports.initialisePlugins = initialisePlugins;
-function createPluginApi(siteContext, plugin) {
-    const { liquidEngine } = siteContext;
-    return {
-        siteLog: siteContext.siteLog,
-        registerLiquidFilter(filterName, handler, options) {
-            liquidEngine.registerFilter(filterName, {
-                handler: (0, liquidjs_filter_1.toLiquidJsFilterHandler)(siteContext, handler),
-                raw: options?.raw ?? false,
-            });
-        },
-        setPublicAssetsDirectory(directory) {
-            plugin.publicAssetsDir = directory;
-        },
-        setBoAssetsDirectory(directory) {
-            plugin.boAssetsDir = directory;
-        },
-        addHeadTag(...htmlTags) {
-            siteContext.headTags.push(...htmlTags);
-        },
-        setPublicApiHandler(handler) {
-            plugin.publicApiHandler = handler;
-        },
-        registerFieldProcessor(dataType, handler) {
-            const existingPreprocessor = siteContext.fieldPreprocessors.get(dataType);
-            if (!existingPreprocessor) {
-                siteContext.fieldPreprocessors.set(dataType, [handler]);
-                return;
-            }
-            existingPreprocessor.push(handler);
-        },
-    };
-}
-//# sourceMappingURL=plugin-api.js.map

package/dist/plugins/plugin-api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/plugins/plugin-api.ts"],"names":[],"mappings":";;;AACA,uEAA4E;AAGrE,KAAK,UAAU,iBAAiB,CAAC,WAAwB,EAAE,OAAiB;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;YAC1E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC;AAVD,8CAUC;AAED,SAAS,eAAe,CAAC,WAAwB,EAAE,MAAc;IAC/D,MAAM,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IAErC,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO;YAC/C,YAAY,CAAC,cAAc,CAAC,UAAU,EAAE;gBACtC,OAAO,EAAE,IAAA,yCAAuB,EAAC,WAAW,EAAE,OAAO,CAAC;gBACtD,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,KAAK;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,SAAS;YAChC,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;QACrC,CAAC;QACD,oBAAoB,CAAC,SAAS;YAC5B,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;QACjC,CAAC;QACD,UAAU,CAAC,GAAG,QAAQ;YACpB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,mBAAmB,CAAC,OAAO;YACzB,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC;QACpC,CAAC;QACD,sBAAsB,CAAC,QAAQ,EAAE,OAAO;YACtC,MAAM,oBAAoB,GAAG,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1E,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;AACJ,CAAC"}