@paroicms/server 1.69.1 → 1.70.1

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

@@ -13,7 +13,7 @@ function applyOrderChildrenByOnQuery(siteContext, options) {
     const orderPropertiesMap = makeMapOfOrderProperties(siteContext, parentDocumentType.children);
     const orderByQb = orderByAsString ? makeOrderByAsStringQB() : query;
     if (orderBy === "manual") {
-        query.leftJoin("PaOrderedLeaf", "o", "o.leafId = l.id");
+        query.leftJoin("PaOrderedNode", "o", "o.nodeId = l.id");
         orderByQb.orderBy("o.orderNum", "ASC").addOrderBy("l.id", "ASC");
     }
     else {
@@ -21,7 +21,7 @@ function applyOrderChildrenByOnQuery(siteContext, options) {
         for (const { fieldName, direction } of orderBy) {
             if (fieldName === "title") {
                 if (leftJoinDocument) {
-                    query.leftJoin("PaDocument", "d", "d.leafId = s.leafId and d.lang = s.lang");
+                    query.leftJoin("PaDocument", "d", "d.nodeId = s.nodeId and d.language = s.language");
                 }
                 orderByQb.addOrderBy("d.title", formatTypeOrmDirection(direction));
             }
@@ -43,9 +43,11 @@ function applyOrderChildrenByOnQuery(siteContext, options) {
                 else {
                     throw new Error(`invalid data type '${dataType}'`);
                 }
-                const languageJoinCrit = storedOn === "section" ? `f${index}.lang = s.lang` : `f${index}.lang = :dbAnyLanguage`;
-                const critParams = storedOn === "section" ? { fieldName } : { fieldName, dbAnyLanguage: context_1.dbAnyLanguage };
-                query.leftJoin("PaFieldVarchar", `f${index}`, `f${index}.field = :fieldName and f${index}.leafId = s.leafId and ${languageJoinCrit}`, critParams);
+                const languageJoinCrit = storedOn === "nodel"
+                    ? `f${index}.language = s.language`
+                    : `f${index}.language = :dbAnyLanguage`;
+                const critParams = storedOn === "nodel" ? { fieldName } : { fieldName, dbAnyLanguage: context_1.dbAnyLanguage };
+                query.leftJoin("PaFieldVarchar", `f${index}`, `f${index}.field = :fieldName and f${index}.nodeId = s.nodeId and ${languageJoinCrit}`, critParams);
                 orderByQb.addOrderBy(orderByField, formatTypeOrmDirection(direction));
             }
             ++index;

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/common/data-format.d.ts

@@ -1,12 +1,12 @@
 import type { Obj } from "@paroi/data-formatters-lib";
 import type { AccountRow, DocumentRow } from "@paroicms/connector";
 import type { Account, AccountPreferences, AuthenticatedAccount } from "../modules/core/account/account.queries";
-import type { Labeling } from "../modules/core/labeling/labeling.queries";
-import type { Leaf } from "../modules/core/leaf/leaf.queries";
+import type { LabelingSeed } from "../modules/core/labeling/labeling.queries";
+import type { NodeSeed } from "../modules/core/node/node.queries";
 import type { SiteContext } from "../site-context/site-context.types";
 export interface Document {
-    sectionId: string;
-    leafId: string;
+    nodelId: string;
+    nodeId: string;
     language: string;
     title?: string;
     slug?: string;
@@ -14,9 +14,9 @@ export interface Document {
     metaKeywords?: string;
     featuredImageHandle: string;
 }
-export declare function toLeafObjectType(leaf: Obj): Leaf;
+export declare function toNodeObjectType(node: Obj): NodeSeed;
 export declare function documentToObjectType(document: DocumentRow): Document;
-export declare function formatLabelingObjectType(data: any): Labeling;
+export declare function formatLabelingObjectType(data: any): LabelingSeed;
 export declare function formatAccountPreferences(data: string): AccountPreferences;
 export declare function formatToAuthenticatedAccountObjectType(data: AccountRow): AuthenticatedAccount;
 export declare function formatToAccountObjectType(data: AccountRow): Account;

package/dist/common/data-format.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLeafObjectType = toLeafObjectType;
+exports.toNodeObjectType = toNodeObjectType;
 exports.documentToObjectType = documentToObjectType;
 exports.formatLabelingObjectType = formatLabelingObjectType;
 exports.formatAccountPreferences = formatAccountPreferences;
@@ -11,35 +11,36 @@ const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
 const context_1 = require("../context");
 const media_handles_helpers_1 = require("./media-handles.helpers");
-function toLeafObjectType(leaf) {
+function toNodeObjectType(node) {
     return {
-        id: (0, data_formatters_lib_1.strVal)(leaf.id),
-        parentId: (0, data_formatters_lib_1.strVal)(leaf.parentId),
-        typeName: (0, data_formatters_lib_1.strVal)(leaf.typeName),
-        relativeId: (0, data_formatters_lib_1.strVal)(leaf.relativeId),
-        publishDate: (0, data_formatters_lib_1.dateVal)(leaf.publishDate),
+        id: (0, data_formatters_lib_1.strVal)(node.id),
+        parentId: (0, data_formatters_lib_1.strVal)(node.parentId),
+        typeName: (0, data_formatters_lib_1.strVal)(node.typeName),
+        relativeId: (0, data_formatters_lib_1.strVal)(node.relativeId),
+        publishDate: (0, data_formatters_lib_1.dateVal)(node.publishDate),
     };
 }
 function documentToObjectType(document) {
     return {
-        sectionId: (0, public_anywhere_lib_1.encodeSectionId)({
-            language: document.lang,
-            leafId: document.leafId,
+        nodelId: (0, public_anywhere_lib_1.encodeNodelId)({
+            language: document.language,
+            nodeId: document.nodeId,
         }),
-        language: document.lang,
-        leafId: document.leafId,
+        language: document.language,
+        nodeId: document.nodeId,
         metaDescription: document.metaDescription,
         title: document.title,
         slug: document.slug,
         metaKeywords: document.metaKeywords,
-        featuredImageHandle: (0, media_handles_helpers_1.getHandleOfFeaturedImage)(document.leafId),
+        featuredImageHandle: (0, media_handles_helpers_1.getHandleOfFeaturedImage)(document.nodeId),
     };
 }
 function formatLabelingObjectType(data) {
+    const obj = (0, data_formatters_lib_1.objVal)(data);
     return {
-        isLead: (0, data_formatters_lib_1.boolVal)(data.lead),
-        taxonomyTypeName: (0, data_formatters_lib_1.strVal)(data.parentTypeName),
-        termId: (0, data_formatters_lib_1.strVal)(data.termId),
+        isLead: (0, data_formatters_lib_1.boolVal)(obj.lead),
+        taxonomyTypeName: (0, data_formatters_lib_1.strVal)(obj.parentTypeName),
+        termId: (0, data_formatters_lib_1.strVal)(obj.termId),
     };
 }
 function formatAccountPreferences(data) {

package/dist/common/data-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":";;AA2BA,4CAQC;AAED,oDAcC;AAED,4DAMC;AAED,4DAKC;AAED,wFAKC;AAED,8DAKC;AAED,4CAEC;AAnFD,oEAAqF;AAErF,uEAAgE;AAChE,wCAAwC;AAUxC,mEAAmE;AAanE,SAAgB,gBAAgB,CAAC,IAAS;IACxC,OAAO;QACL,EAAE,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,QAAQ,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,QAAQ,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,UAAU,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,UAAU,CAAC;QACnC,WAAW,EAAE,IAAA,6BAAO,EAAC,IAAI,CAAC,WAAW,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAqB;IACxD,OAAO;QACL,SAAS,EAAE,IAAA,qCAAe,EAAC;YACzB,QAAQ,EAAE,QAAQ,CAAC,IAAI;YACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,IAAA,gDAAwB,EAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CAAC,IAAS;IAChD,OAAO;QACL,MAAM,EAAE,IAAA,6BAAO,EAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,gBAAgB,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,cAAc,CAAC;QAC7C,MAAM,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,MAAM,CAAC;KAC5B,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,IAAA,mCAAa,EAAC,UAAU,CAAC,QAAQ,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,SAAgB,sCAAsC,CAAC,IAAgB;IACrE,OAAO;QACL,GAAG,yBAAyB,CAAC,IAAI,CAAC;QAClC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACvF,CAAC;AACJ,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAgB;IACxD,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,oBAAU,EAAE,CAAC;AACxD,CAAC"}
+{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":";;AA2BA,4CAQC;AAED,oDAcC;AAED,4DAOC;AAED,4DAKC;AAED,wFAKC;AAED,8DAKC;AAED,4CAEC;AApFD,oEAA6F;AAE7F,uEAA8D;AAC9D,wCAAwC;AAUxC,mEAAmE;AAanE,SAAgB,gBAAgB,CAAC,IAAS;IACxC,OAAO;QACL,EAAE,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,QAAQ,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,QAAQ,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,UAAU,EAAE,IAAA,4BAAM,EAAC,IAAI,CAAC,UAAU,CAAC;QACnC,WAAW,EAAE,IAAA,6BAAO,EAAC,IAAI,CAAC,WAAW,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAqB;IACxD,OAAO;QACL,OAAO,EAAE,IAAA,mCAAa,EAAC;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,IAAA,gDAAwB,EAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CAAC,IAAS;IAChD,MAAM,GAAG,GAAG,IAAA,4BAAM,EAAC,IAAI,CAAC,CAAC;IACzB,OAAO;QACL,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,IAAI,CAAC;QACzB,gBAAgB,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,cAAc,CAAC;QAC5C,MAAM,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,IAAA,mCAAa,EAAC,UAAU,CAAC,QAAQ,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,SAAgB,sCAAsC,CAAC,IAAgB;IACrE,OAAO;QACL,GAAG,yBAAyB,CAAC,IAAI,CAAC;QAClC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACvF,CAAC;AACJ,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAgB;IACxD,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,oBAAU,EAAE,CAAC;AACxD,CAAC"}

package/dist/common/media-handles.helpers.d.ts

@@ -1,19 +1,19 @@
 import type { ScFieldType } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../site-context/site-context.types";
-export declare function getHandleOfFeaturedImage(leafId: string): string;
+export declare function getHandleOfFeaturedImage(nodeId: string): string;
 export declare function getHandleOfSiteBoFavicon(): string;
 export declare function getHandleOfSiteFavicon(): string;
 export declare function getHandleOfField(siteContext: Pick<SiteContext, "siteIds">, options: {
     fieldType: ScFieldType;
-    leafId: string;
+    nodeId: string;
     language?: string;
 }): string;
-export declare function getHandleOfFieldOnLeaf(siteContext: Pick<SiteContext, "siteIds">, options: {
+export declare function getHandleOfFieldOnNode(siteContext: Pick<SiteContext, "siteIds">, options: {
     fieldType: ScFieldType;
-    leafId: string;
+    nodeId: string;
 }): string;
 export declare function getHandleOfSiteField(siteContext: Pick<SiteContext, "siteIds" | "siteSchema">, options: {
     fieldName: string;
     language?: string;
 }): string;
-export declare function extractLeafIdFromHandle(handle: string): string | undefined;
+export declare function extractNodeIdFromHandle(handle: string): string | undefined;

package/dist/common/media-handles.helpers.js

@@ -4,11 +4,11 @@ exports.getHandleOfFeaturedImage = getHandleOfFeaturedImage;
 exports.getHandleOfSiteBoFavicon = getHandleOfSiteBoFavicon;
 exports.getHandleOfSiteFavicon = getHandleOfSiteFavicon;
 exports.getHandleOfField = getHandleOfField;
-exports.getHandleOfFieldOnLeaf = getHandleOfFieldOnLeaf;
+exports.getHandleOfFieldOnNode = getHandleOfFieldOnNode;
 exports.getHandleOfSiteField = getHandleOfSiteField;
-exports.extractLeafIdFromHandle = extractLeafIdFromHandle;
-function getHandleOfFeaturedImage(leafId) {
-    return `leaf:${leafId}:featuredImage`;
+exports.extractNodeIdFromHandle = extractNodeIdFromHandle;
+function getHandleOfFeaturedImage(nodeId) {
+    return `node:${nodeId}:featuredImage`;
 }
 function getHandleOfSiteBoFavicon() {
     return "site:boFavicon";
@@ -17,37 +17,37 @@ function getHandleOfSiteFavicon() {
     return "site:favicon";
 }
 function getHandleOfField(siteContext, options) {
-    const { fieldType, leafId, language } = options;
-    if (fieldType.storedOn === "section" &&
+    const { fieldType, nodeId, language } = options;
+    if (fieldType.storedOn === "nodel" &&
         fieldType.dataType !== "quillDelta" &&
         fieldType.dataType !== "html") {
         if (language === undefined)
-            throw new Error("Missing language for section field");
-        if (leafId === siteContext.siteIds.siteLeafId)
+            throw new Error("Missing language for nodel field");
+        if (nodeId === siteContext.siteIds.siteNodeId)
             return `site:${fieldType.name}:${language}`;
-        return `sect:${leafId}:${fieldType.name}:${language}`;
+        return `sect:${nodeId}:${fieldType.name}:${language}`;
     }
-    return getHandleOfFieldOnLeaf(siteContext, { fieldType, leafId });
+    return getHandleOfFieldOnNode(siteContext, { fieldType, nodeId });
 }
-function getHandleOfFieldOnLeaf(siteContext, options) {
-    const { fieldType, leafId } = options;
-    if (leafId === siteContext.siteIds.siteLeafId)
+function getHandleOfFieldOnNode(siteContext, options) {
+    const { fieldType, nodeId } = options;
+    if (nodeId === siteContext.siteIds.siteNodeId)
         return `site:${fieldType.name}`;
-    return `leaf:${leafId}:${fieldType.name}`;
+    return `node:${nodeId}:${fieldType.name}`;
 }
 function getHandleOfSiteField(siteContext, options) {
     const { fieldName, language } = options;
-    const fieldType = siteContext.siteSchema.leafTypes._site.fields.find((f) => f.name === fieldName);
+    const fieldType = siteContext.siteSchema.nodeTypes._site.fields.find((f) => f.name === fieldName);
     if (!fieldType)
         throw new Error(`Unknown site field '${fieldName}'`);
     return getHandleOfField(siteContext, {
         fieldType,
-        leafId: siteContext.siteIds.siteLeafId,
+        nodeId: siteContext.siteIds.siteNodeId,
         language,
     });
 }
-function extractLeafIdFromHandle(handle) {
-    const match = handle.match(/^leaf:(.+?):/);
+function extractNodeIdFromHandle(handle) {
+    const match = handle.match(/^node:(.+?):/);
     return match?.[1];
 }
 //# sourceMappingURL=media-handles.helpers.js.map

package/dist/common/media-handles.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":";;AAMA,4DAEC;AAED,4DAEC;AAED,wDAEC;AAED,4CAmBC;AAED,wDAUC;AAED,oDAeC;AAED,0DAGC;AAjED,SAAgB,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,SAAgB,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAgB,gBAAgB,CAC9B,WAAyC,EACzC,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,IACE,SAAS,CAAC,QAAQ,KAAK,SAAS;QAChC,SAAS,CAAC,QAAQ,KAAK,YAAY;QACnC,SAAS,CAAC,QAAQ,KAAK,MAAM,EAC7B,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAClF,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;YAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC3F,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,sBAAsB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,sBAAsB,CACpC,WAAyC,EACzC,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;QAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/E,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,oBAAoB,CAClC,WAAwD,EACxD,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClG,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO,gBAAgB,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;QACtC,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CAAC,MAAc;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}
+{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":";;AAMA,4DAEC;AAED,4DAEC;AAED,wDAEC;AAED,4CAmBC;AAED,wDAUC;AAED,oDAeC;AAED,0DAGC;AAjED,SAAgB,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,SAAgB,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAgB,gBAAgB,CAC9B,WAAyC,EACzC,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,IACE,SAAS,CAAC,QAAQ,KAAK,OAAO;QAC9B,SAAS,CAAC,QAAQ,KAAK,YAAY;QACnC,SAAS,CAAC,QAAQ,KAAK,MAAM,EAC7B,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAChF,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;YAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC3F,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,sBAAsB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,sBAAsB,CACpC,WAAyC,EACzC,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;QAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/E,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,oBAAoB,CAClC,WAAwD,EACxD,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClG,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO,gBAAgB,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;QACtC,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CAAC,MAAc;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}

package/dist/common/text-cache.d.ts

@@ -1,21 +1,21 @@
-import { type ParsedSectionId } from "@paroicms/public-anywhere-lib";
+import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import type { AppLog } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../site-context/site-context.types";
 export declare function makeCacheDependencyKey(options: {
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
     perimeter?: "slug";
 } | {
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
     relation: "children";
 } | {
-    leafId: string;
+    nodeId: string;
     relation: "labeled";
     taxonomyTypeName: string;
 } | {
-    leafId: string;
+    nodeId: string;
     relation: "updated";
 } | {
-    leafId: string;
+    nodeId: string;
 } | {
     global: "all";
 }): string;
@@ -25,7 +25,7 @@ export declare function makeCacheKey(logger: AppLog, options: {
 }): string;
 export declare function makeCacheKey(logger: AppLog, options: {
     kind: "url";
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
 }): string;
 export declare function makeCacheKey(logger: AppLog, options: {
     kind: "html";
@@ -40,38 +40,38 @@ export declare function makeCacheKey(logger: AppLog, options: {
     url: string;
 }): string;
 export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
-    parentOf: ParsedSectionId;
+    parentOf: ParsedNodelId;
 } | {
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
     perimeter?: "slug";
 } | {
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
     fully: true;
-    parentId: ParsedSectionId | undefined;
+    parentId: ParsedNodelId | undefined;
 }): Promise<void>;
-export declare function invalidateLeafInCache(siteContext: Pick<SiteContext, "textCache" | "cn" | "siteSchema">, { leafId }: {
-    leafId: string;
+export declare function invalidateNodeInCache(siteContext: Pick<SiteContext, "textCache" | "cn" | "siteSchema">, { nodeId }: {
+    nodeId: string;
 }): Promise<void>;
 export declare function invalidateDocumentRelationCache(siteContext: Pick<SiteContext, "textCache">, options: {
-    documentId: ParsedSectionId;
+    documentId: ParsedNodelId;
     relation: "children";
 } | {
-    leafId: string;
+    nodeId: string;
     relation: "labeled";
     taxonomyTypeName: string;
 }): Promise<void>;
-export declare function depKeysOfLeafRelationCache(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
-    parentOfLeafId: string;
+export declare function depKeysOfNodeRelationCache(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
+    parentOfNodeId: string;
     relation: "children";
 }): Promise<string[]>;
 export declare function invalidateMultipleDocumentsInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
-    leafId: string;
-    parentIds?: ParsedSectionId[];
+    nodeId: string;
+    parentIds?: ParsedNodelId[];
     fully?: boolean;
 } | {
-    parentOfLeafId: string;
+    parentOfNodeId: string;
     fully?: boolean;
 }): Promise<void>;
-export declare function makeDependencyKeysForDocuments(siteContext: Pick<SiteContext, "siteSchema">, leafId: string, options?: {
+export declare function makeDependencyKeysForDocuments(siteContext: Pick<SiteContext, "siteSchema">, nodeId: string, options?: {
     fully?: boolean;
 }): string[];

package/dist/common/text-cache.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCacheDependencyKey = makeCacheDependencyKey;
 exports.makeCacheKey = makeCacheKey;
 exports.invalidateDocumentInCache = invalidateDocumentInCache;
-exports.invalidateLeafInCache = invalidateLeafInCache;
+exports.invalidateNodeInCache = invalidateNodeInCache;
 exports.invalidateDocumentRelationCache = invalidateDocumentRelationCache;
-exports.depKeysOfLeafRelationCache = depKeysOfLeafRelationCache;
+exports.depKeysOfNodeRelationCache = depKeysOfNodeRelationCache;
 exports.invalidateMultipleDocumentsInCache = invalidateMultipleDocumentsInCache;
 exports.makeDependencyKeysForDocuments = makeDependencyKeysForDocuments;
 const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
@@ -15,18 +15,18 @@ const url_helpers_1 = require("./url-helpers");
 function makeCacheDependencyKey(options) {
     if ("global" in options)
         return server_text_cache_system_1.allDependencyKey;
-    if ("leafId" in options) {
+    if ("nodeId" in options) {
         if ("relation" in options) {
             if (options.relation === "updated") {
-                const { leafId } = options;
-                return `*:${leafId}:updated`;
+                const { nodeId } = options;
+                return `*:${nodeId}:updated`;
             }
-            const { leafId, taxonomyTypeName } = options;
-            return `*:${leafId}:labeled:${taxonomyTypeName}`;
+            const { nodeId, taxonomyTypeName } = options;
+            return `*:${nodeId}:labeled:${taxonomyTypeName}`;
         }
-        return `*:${options.leafId}`;
+        return `*:${options.nodeId}`;
     }
-    const encodedId = (0, public_anywhere_lib_1.encodeSectionId)(options.documentId);
+    const encodedId = (0, public_anywhere_lib_1.encodeNodelId)(options.documentId);
     if ("relation" in options)
         return `${encodedId}:${options.relation}`;
     if (options.perimeter)
@@ -44,20 +44,20 @@ function makeCacheKey(logger, options) {
     if (kind === "redirect")
         return `${kind}:${urlKey}`;
     if (documentId)
-        return `${kind}:${(0, public_anywhere_lib_1.encodeSectionId)(documentId)}`;
+        return `${kind}:${(0, public_anywhere_lib_1.encodeNodelId)(documentId)}`;
     throw new Error("invalid parameter");
 }
 async function invalidateDocumentInCache(siteContext, options) {
     const documentId = "documentId" in options
         ? options.documentId
-        : await (0, load_documents_queries_1.getParentSectionIdOf)(siteContext, options.parentOf);
+        : await (0, load_documents_queries_1.getParentNodelIdOf)(siteContext, options.parentOf);
     if (!documentId)
         return;
     const fully = "fully" in options && options.fully;
     const withSlug = ("perimeter" in options && options.perimeter === "slug") || fully;
     const dependencyKeys = [
         makeCacheDependencyKey({ documentId }),
-        makeCacheDependencyKey({ leafId: documentId.leafId }),
+        makeCacheDependencyKey({ nodeId: documentId.nodeId }),
     ];
     if (withSlug) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId, perimeter: "slug" }));
@@ -65,22 +65,22 @@ async function invalidateDocumentInCache(siteContext, options) {
     if (fully) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId, relation: "children" }));
     }
-    const parentId = "parentId" in options ? options.parentId : await (0, load_documents_queries_1.getParentSectionIdOf)(siteContext, documentId);
+    const parentId = "parentId" in options ? options.parentId : await (0, load_documents_queries_1.getParentNodelIdOf)(siteContext, documentId);
     if (parentId) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
     }
     await siteContext.textCache.invalidate(dependencyKeys);
 }
-async function invalidateLeafInCache(siteContext, { leafId }) {
+async function invalidateNodeInCache(siteContext, { nodeId }) {
     const languages = siteContext.siteSchema.languages;
-    const documentIds = languages.map((language) => ({ language, leafId }));
+    const documentIds = languages.map((language) => ({ language, nodeId }));
     const dependencyKeys = documentIds.map((documentId) => makeCacheDependencyKey({ documentId }));
-    dependencyKeys.push(...documentIds.map((documentId) => makeCacheDependencyKey({ leafId: documentId.leafId })));
-    const parentLeafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, leafId);
-    if (parentLeafId) {
+    dependencyKeys.push(...documentIds.map((documentId) => makeCacheDependencyKey({ nodeId: documentId.nodeId })));
+    const parentNodeId = await (0, load_documents_queries_1.getParentNodeIdOf)(siteContext, nodeId);
+    if (parentNodeId) {
         const parentDocumentIds = siteContext.siteSchema.languages.map((language) => ({
             language,
-            leafId,
+            nodeId,
         }));
         dependencyKeys.push(...parentDocumentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" })));
     }
@@ -89,34 +89,34 @@ async function invalidateLeafInCache(siteContext, { leafId }) {
 async function invalidateDocumentRelationCache(siteContext, options) {
     await siteContext.textCache.invalidate([makeCacheDependencyKey(options)]);
 }
-async function depKeysOfLeafRelationCache(siteContext, options) {
-    const leafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, options.parentOfLeafId);
-    if (leafId === undefined)
+async function depKeysOfNodeRelationCache(siteContext, options) {
+    const nodeId = await (0, load_documents_queries_1.getParentNodeIdOf)(siteContext, options.parentOfNodeId);
+    if (nodeId === undefined)
         return [];
-    const documentIds = siteContext.siteSchema.languages.map((language) => ({ language, leafId }));
+    const documentIds = siteContext.siteSchema.languages.map((language) => ({ language, nodeId }));
     return documentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" }));
 }
 async function invalidateMultipleDocumentsInCache(siteContext, options) {
     const languages = siteContext.siteSchema.languages;
-    const leafId = "leafId" in options
-        ? options.leafId
-        : await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, options.parentOfLeafId);
-    if (leafId === undefined)
+    const nodeId = "nodeId" in options
+        ? options.nodeId
+        : await (0, load_documents_queries_1.getParentNodeIdOf)(siteContext, options.parentOfNodeId);
+    if (nodeId === undefined)
         return;
-    const dependencyKeys = makeDependencyKeysForDocuments(siteContext, leafId, options);
+    const dependencyKeys = makeDependencyKeysForDocuments(siteContext, nodeId, options);
     const parentIds = "parentIds" in options && options.parentIds !== undefined
         ? options.parentIds
         : await (0, load_documents_queries_1.getParentDocumentIdsOf)(siteContext, {
             languages,
-            leafId,
+            nodeId,
         });
     dependencyKeys.push(...parentIds.map((parentId) => makeCacheDependencyKey({ documentId: parentId, relation: "children" })));
     await siteContext.textCache.invalidate(dependencyKeys);
 }
-function makeDependencyKeysForDocuments(siteContext, leafId, options = {}) {
+function makeDependencyKeysForDocuments(siteContext, nodeId, options = {}) {
     const languages = siteContext.siteSchema.languages;
-    const documentIds = languages.map((language) => ({ language, leafId }));
-    const dependencyKeys = [makeCacheDependencyKey({ leafId })];
+    const documentIds = languages.map((language) => ({ language, nodeId }));
+    const dependencyKeys = [makeCacheDependencyKey({ nodeId })];
     for (const documentId of documentIds) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId }));
         if (options.fully) {

package/dist/common/text-cache.js.map

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

package/dist/graphql/apollo-server-init.js

@@ -11,13 +11,13 @@ const document_resolver_1 = require("../modules/core/document/document.resolver"
 const document_resolver_extend_1 = require("../modules/core/document/document.resolver.extend");
 const fields_resolver_1 = require("../modules/core/fields/fields.resolver");
 const labeling_resolver_1 = require("../modules/core/labeling/labeling.resolver");
-const leaf_resolver_1 = require("../modules/core/leaf/leaf.resolver");
-const leaf_resolver_extend_1 = require("../modules/core/leaf/leaf.resolver.extend");
 const media_resolver_1 = require("../modules/core/media/media.resolver");
 const media_resolver_extend_1 = require("../modules/core/media/media.resolver.extend");
+const node_resolver_1 = require("../modules/core/node/node.resolver");
+const node_resolver_extend_1 = require("../modules/core/node/node.resolver.extend");
+const nodel_wrap_resolver_1 = require("../modules/core/nodel/nodel-wrap.resolver");
 const part_resolver_1 = require("../modules/core/part/part.resolver");
 const part_resolver_extend_1 = require("../modules/core/part/part.resolver.extend");
-const section_wrap_resolver_1 = require("../modules/core/section/section-wrap.resolver");
 const site_constants_resolver_1 = require("../modules/core/site-constants/site-constants.resolver");
 const unprotected_resolver_1 = require("../modules/core/unprotected/unprotected.resolver");
 const custom_scalar_resolver_1 = require("./custom-scalar/custom-scalar.resolver");
@@ -29,15 +29,15 @@ function federateResolvers() {
         document_resolver_1.documentResolvers,
         document_resolver_extend_1.extendWithDocumentResolver,
         fields_resolver_1.fieldResolvers,
-        fields_resolver_1.extendSectionWrapWithFieldValuesResolvers,
+        fields_resolver_1.extendNodelWrapWithFieldValuesResolvers,
         fields_resolver_1.extendPartWithFieldValuesResolver,
         labeling_resolver_1.labelingResolvers,
-        leaf_resolver_1.leafResolvers,
-        leaf_resolver_extend_1.extendSectionWrapWithLeafResolver,
+        node_resolver_1.nodeResolvers,
+        node_resolver_extend_1.extendNodelWrapWithNodeResolver,
         media_resolver_1.mediaResolvers,
         part_resolver_1.partResolvers,
-        part_resolver_extend_1.extendSectionWrapWithPartResolvers,
-        section_wrap_resolver_1.sectionWrapResolvers,
+        part_resolver_extend_1.extendNodelWrapWithPartResolvers,
+        nodel_wrap_resolver_1.nodelWrapResolvers,
         site_constants_resolver_1.siteConstantsResolvers,
         unprotected_resolver_1.unprotectedResolvers,
         custom_scalar_resolver_1.scalarTypeResolvers,

package/dist/graphql/apollo-server-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"apollo-server-init.js","sourceRoot":"","sources":["../../src/graphql/apollo-server-init.ts"],"names":[],"mappings":";;;AA4BA,8CAqBC;AAjDD,qCAAuC;AACvC,yCAAiC;AACjC,wCAAwC;AACxC,+EAA4E;AAC5E,4EAAyE;AACzE,kFAA+E;AAC/E,gGAA+F;AAC/F,4EAIgD;AAChD,kFAA+E;AAC/E,sEAAmE;AACnE,oFAA8F;AAC9F,yEAAsE;AACtE,uFAA8F;AAC9F,sEAAmE;AACnE,oFAA+F;AAC/F,yFAAqF;AACrF,oGAAgG;AAChG,2FAAwF;AAExF,mFAA6E;AAGhE,QAAA,QAAQ,GAAG,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,oBAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,SAAgB,iBAAiB;IAC/B,OAAO;QACL,mCAAgB;QAChB,iCAAe;QACf,qCAAiB;QACjB,qDAA0B;QAC1B,gCAAc;QACd,2DAAyC;QACzC,mDAAiC;QACjC,qCAAiB;QACjB,6BAAa;QACb,wDAAiC;QACjC,+BAAc;QACd,6BAAa;QACb,yDAAkC;QAClC,4CAAoB;QACpB,gDAAsB;QACtB,2CAAoB;QACpB,4CAAmB;QACnB,uDAA+B;KAChC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"apollo-server-init.js","sourceRoot":"","sources":["../../src/graphql/apollo-server-init.ts"],"names":[],"mappings":";;;AA4BA,8CAqBC;AAjDD,qCAAuC;AACvC,yCAAiC;AACjC,wCAAwC;AACxC,+EAA4E;AAC5E,4EAAyE;AACzE,kFAA+E;AAC/E,gGAA+F;AAC/F,4EAIgD;AAChD,kFAA+E;AAC/E,yEAAsE;AACtE,uFAA8F;AAC9F,sEAAmE;AACnE,oFAA4F;AAC5F,mFAA+E;AAC/E,sEAAmE;AACnE,oFAA6F;AAC7F,oGAAgG;AAChG,2FAAwF;AAExF,mFAA6E;AAGhE,QAAA,QAAQ,GAAG,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,oBAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,SAAgB,iBAAiB;IAC/B,OAAO;QACL,mCAAgB;QAChB,iCAAe;QACf,qCAAiB;QACjB,qDAA0B;QAC1B,gCAAc;QACd,yDAAuC;QACvC,mDAAiC;QACjC,qCAAiB;QACjB,6BAAa;QACb,sDAA+B;QAC/B,+BAAc;QACd,6BAAa;QACb,uDAAgC;QAChC,wCAAkB;QAClB,gDAAsB;QACtB,2CAAoB;QACpB,4CAAmB;QACnB,uDAA+B;KAChC,CAAC;AACJ,CAAC"}

package/dist/helpers/label-translator.helper.d.ts

@@ -1,5 +1,5 @@
 import type { ScSiteSchema } from "@paroicms/public-anywhere-lib";
-export declare function getLeafTypeLabel(siteSchema: ScSiteSchema, options: {
+export declare function getNodeTypeLabel(siteSchema: ScSiteSchema, options: {
     typeName: string;
     language: string;
 }): string;

package/dist/helpers/label-translator.helper.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLeafTypeLabel = getLeafTypeLabel;
+exports.getNodeTypeLabel = getNodeTypeLabel;
 exports.getFieldLabel = getFieldLabel;
-function getLeafTypeLabel(siteSchema, options) {
-    const label = siteSchema.l10n[options.language]?.leafTypes[options.typeName]?.label;
+function getNodeTypeLabel(siteSchema, options) {
+    const label = siteSchema.l10n[options.language]?.nodeTypes[options.typeName]?.label;
     return typeof label === "string" ? label : options.typeName;
 }
 function getFieldLabel(siteSchema, options) {
-    const fields = siteSchema.l10n[options.language]?.leafTypes?.[options.typeName]?.fields;
+    const fields = siteSchema.l10n[options.language]?.nodeTypes?.[options.typeName]?.fields;
     if (typeof fields === "string" || !fields)
         return options.fieldName;
     const translations = fields[options.typeName];

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

@@ -72,7 +72,7 @@ function createUseImageFn(siteContext, renderingContext) {
     };
 }
 async function getDocument(siteContext, renderingContext, rawDocumentId) {
-    const documentId = (0, public_anywhere_lib_1.parseSectionId)(rawDocumentId);
+    const documentId = (0, public_anywhere_lib_1.parseNodelId)(rawDocumentId);
     renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId }));
     const docPayload = await (0, doc_values_queries_1.getDocItem)(siteContext, renderingContext.tracker, documentId, {
         allowUndef: true,
@@ -87,7 +87,7 @@ async function getDocument(siteContext, renderingContext, rawDocumentId) {
             return options?.absoluteUrl ? (0, public_server_lib_1.toAbsoluteUrl)(siteContext, url) : url;
         },
         typeName: docPayload.type,
-        leafId: docPayload.leafId,
+        nodeId: docPayload.nodeId,
         language: docPayload.language,
         relativeId: docPayload.relativeId,
         title: docPayload.title,