@paroicms/server 1.96.0 → 1.98.0

package/dist/rendered-site/helpers/format-date.helper.js

@@ -1,28 +1,63 @@
-import dayjs from "dayjs";
-import "dayjs/locale/de.js";
-import "dayjs/locale/en.js";
-import "dayjs/locale/es.js";
-import "dayjs/locale/fr.js";
-import "dayjs/locale/it.js";
-import "dayjs/locale/pt.js";
-import localizedFormat from "dayjs/plugin/localizedFormat.js";
-dayjs.extend(localizedFormat);
-export function formatDate(date, language, format = "short") {
-    const dayjsDate = dayjs(date);
+import { format, parseISO } from "date-fns";
+import { de, enUS, es, fr, it, pt } from "date-fns/locale";
+const locales = { de, en: enUS, es, fr, it, pt };
+export function formatDate(date, language, formatType = "short") {
+    const dateObj = typeof date === "string" ? parseISO(date) : new Date(date);
+    const locale = locales[language] || locales.en;
     let formattedDate;
-    if (format === "long") {
-        formattedDate = dayjsDate.locale(language).format("LL");
+    if (formatType === "long") {
+        if (language === "fr") {
+            formattedDate = format(dateObj, "d MMMM yyyy", { locale });
+        }
+        else if (language === "de") {
+            formattedDate = format(dateObj, "d. MMMM yyyy", { locale });
+        }
+        else if (language === "es") {
+            formattedDate = format(dateObj, "d 'de' MMMM 'de' yyyy", { locale });
+        }
+        else if (language === "it") {
+            formattedDate = format(dateObj, "d MMMM yyyy", { locale });
+        }
+        else if (language === "pt") {
+            formattedDate = format(dateObj, "d 'de' MMMM 'de' yyyy", { locale });
+        }
+        else {
+            formattedDate = format(dateObj, "MMMM d, yyyy", { locale });
+        }
     }
-    else if (format === "long2") {
+    else if (formatType === "long2") {
         if (language === "fr") {
-            formattedDate = dayjsDate.locale(language).format("dddd LL");
+            formattedDate = format(dateObj, "EEEE d MMMM yyyy", { locale });
+        }
+        else if (language === "de") {
+            formattedDate = format(dateObj, "EEEE, d. MMMM yyyy", { locale });
+        }
+        else if (language === "es") {
+            formattedDate = format(dateObj, "EEEE, d 'de' MMMM 'de' yyyy", { locale });
+        }
+        else if (language === "it") {
+            formattedDate = format(dateObj, "EEEE, d MMMM yyyy", { locale });
+        }
+        else if (language === "pt") {
+            formattedDate = format(dateObj, "EEEE, d 'de' MMMM 'de' yyyy", { locale });
         }
         else {
-            formattedDate = dayjsDate.locale(language).format("dddd, LL");
+            formattedDate = format(dateObj, "EEEE, MMMM d, yyyy", { locale });
         }
     }
-    else if (format === "short") {
-        formattedDate = dayjsDate.locale(language).format("l");
+    else if (formatType === "short") {
+        if (language === "fr" || language === "it") {
+            formattedDate = format(dateObj, "d/M/yyyy", { locale });
+        }
+        else if (language === "de") {
+            formattedDate = format(dateObj, "d.M.yyyy", { locale });
+        }
+        else if (language === "es" || language === "pt") {
+            formattedDate = format(dateObj, "d/M/yyyy", { locale });
+        }
+        else {
+            formattedDate = format(dateObj, "M/d/yy", { locale });
+        }
     }
     else {
         throw new Error("unknown format");

package/dist/rendered-site/helpers/format-date.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-date.helper.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/format-date.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAE9D,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;AAE9B,MAAM,UAAU,UAAU,CACxB,IAAiC,EACjC,QAAgB,EAChB,MAAM,GAAG,OAAO;IAEhB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAE9B,IAAI,aAAqB,CAAC;IAE1B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;SAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"format-date.helper.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/format-date.helper.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-filters/format-date.js

@@ -2,6 +2,8 @@ import { formatDate } from "../helpers/format-date.helper.js";
 export function formatDateLiquidFilter(value, { renderingContext, args }) {
     const format = typeof args[0] === "string" ? args[0] : undefined;
     const dt = typeof value === "string" || value instanceof Date ? value : undefined;
+    if (!dt)
+        return "";
     return formatDate(dt, renderingContext.language, format);
 }
 //# sourceMappingURL=format-date.js.map

package/dist/rendered-site/liquidjs-filters/format-date.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-date.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/format-date.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,MAAM,UAAU,sBAAsB,CACpC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,MAAM,EAAE,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,OAAO,UAAU,CAAC,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"format-date.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/format-date.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,MAAM,UAAU,sBAAsB,CACpC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,MAAM,EAAE,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IACnB,OAAO,UAAU,CAAC,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC"}

package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js

@@ -1,18 +1,18 @@
-import { encodeNodelId, parseNodelId } from "@paroicms/public-anywhere-lib";
-import { getBreadcrumb } from "../../admin-backend/nodel/nodel.queries.js";
+import { encodeLNodeId, parseLNodeId } from "@paroicms/public-anywhere-lib";
+import { getBreadcrumb } from "../../admin-backend/lnode/lnode.queries.js";
 export async function injectMenuItemsData(value, { renderingContext }) {
     const str = typeof value === "string" ? value : typeof value === "number" ? String(value) : undefined;
     if (!str)
         return "";
     const { siteContext } = renderingContext;
-    const documentId = parseNodelId(str);
+    const documentId = parseLNodeId(str);
     const breadcrumb = await getBreadcrumb(siteContext, renderingContext.tracker, documentId, {
         ensurePublished: false,
     });
     breadcrumb.shift();
     const content = {
-        id: encodeNodelId(documentId),
-        parents: breadcrumb.map((item) => encodeNodelId(item.documentId)),
+        id: encodeLNodeId(documentId),
+        parents: breadcrumb.map((item) => encodeLNodeId(item.documentId)),
     };
     return JSON.stringify(content);
 }

package/dist/rendered-site/liquidjs-tags/get-doc-tag.js

@@ -1,4 +1,4 @@
-import { isNumeric, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { isNumeric, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
 import { type } from "arktype";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
@@ -24,7 +24,7 @@ export function createGetDocLiquidTag({ deprecated } = {}) {
             };
         }
         else {
-            documentId = parseNodelId(options.id);
+            documentId = parseLNodeId(options.id);
         }
         renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
         const cacheVal = renderingContext.getValueFromCache(cacheKey);

package/dist/rendered-site/liquidjs-tags/get-docs-tag.js

@@ -1,5 +1,5 @@
 import { parseSorting } from "@paroicms/connector";
-import { isDef, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
 import { type } from "arktype";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { toNodeId } from "../../helpers/utils-helper.js";
@@ -26,7 +26,7 @@ export function createGetDocsLiquidTag({ deprecated } = {}) {
         const options = validateParameters(parameters, siteContext, { variableName });
         if (options.parentId === undefined)
             return;
-        const parentId = parseNodelId(options.parentId);
+        const parentId = parseLNodeId(options.parentId);
         const cacheKey = makeTagCacheKeyForRendering("getDocs", { tagParameters: options });
         renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
         const cacheVal = renderingContext.getValueFromCache(cacheKey);

package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.d.ts

@@ -1,4 +1,4 @@
-import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { DropInst } from "../../liquidjs-tools/liquidjs-drop.js";
 import { type RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { type PaginatedResult } from "../../rendering-payload/doc-values.queries.js";
@@ -23,5 +23,5 @@ interface GetPaginatedDocsRawParameters {
     pageIndex?: number;
     pageSize: number;
 }
-export declare function loadPaginatedDocs(renderingContext: RenderingContext, parentId: ParsedNodelId, options: GetPaginatedDocsRawParameters): Promise<PaginatedResult<DropInst<TpDocPayload>>>;
+export declare function loadPaginatedDocs(renderingContext: RenderingContext, parentId: ParsedLNodeId, options: GetPaginatedDocsRawParameters): Promise<PaginatedResult<DropInst<TpDocPayload>>>;
 export {};

package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js

@@ -1,5 +1,5 @@
 import { parseSorting } from "@paroicms/connector";
-import { isDef, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
 import { type } from "arktype";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { toNodeId } from "../../helpers/utils-helper.js";
@@ -22,7 +22,7 @@ export function createGetPaginatedDocsLiquidTag() {
         const options = validateParameters(parameters, siteContext, { variableName });
         if (options.parentId === undefined)
             return;
-        const parentId = parseNodelId(options.parentId);
+        const parentId = parseLNodeId(options.parentId);
         const cacheKey = makeTagCacheKeyForRendering("getPaginatedDocs", { tagParameters: options });
         renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
         const cacheVal = renderingContext.getValueFromCache(cacheKey);

package/dist/rendered-site/page-route/make-url.d.ts

@@ -1,8 +1,8 @@
 import { type Tracker } from "@paroicms/internal-server-lib";
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import type { ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<string>;
-export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId, options: {
+export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId): Promise<string>;
+export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId, options: {
     returnUrlDependencyKeys: true;
 }): Promise<{
     url: string;

package/dist/rendered-site/page-route/make-url.js

@@ -46,9 +46,9 @@ export async function getUrlOfDocument(siteContext, tracker, documentId, options
     }, tracker);
     return options.returnUrlDependencyKeys ? { url, dependencyKeys } : url;
 }
-function buildUrlQuery(siteContext, nodelId, depth) {
+function buildUrlQuery(siteContext, lNodeId, depth) {
     const { cn } = siteContext;
-    const { nodeId, language } = nodelId;
+    const { nodeId, language } = lNodeId;
     let cur = depth;
     let query = cn(`PaNode as l${cur}`)
         .select([
@@ -58,7 +58,7 @@ function buildUrlQuery(siteContext, nodelId, depth) {
         `l${cur}.publishDate as publishDate${cur}`,
         `d${cur}.slug as slug${cur}`,
     ])
-        .innerJoin(`PaNodel as s${cur}`, {
+        .innerJoin(`PaLNode as s${cur}`, {
         [`s${cur}.nodeId`]: `l${cur}.id`,
         [`s${cur}.language`]: cn.raw("?", [language]),
     })
@@ -85,7 +85,7 @@ function buildUrlQuery(siteContext, nodelId, depth) {
         ]);
         query = query
             .innerJoin(`PaNode as l${cur}`, `l${cur}.id`, `l${prev}.parentId`)
-            .innerJoin(`PaNodel as s${cur}`, {
+            .innerJoin(`PaLNode as s${cur}`, {
             [`s${cur}.nodeId`]: `l${cur}.id`,
             [`s${cur}.language`]: cn.raw("?", [language]),
         })

package/dist/rendered-site/page-route/raw-document-payload.js

@@ -11,7 +11,7 @@ export async function fetchRawDocPayload(siteContext, parsedRoute) {
 function buildRawDocPayloadQuery(siteContext, parsedRoute) {
     const { cn } = siteContext;
     let query = cn("PaNode as l0")
-        .innerJoin("PaNodel as s0", {
+        .innerJoin("PaLNode as s0", {
         "l0.id": "s0.nodeId",
         "s0.language": cn.raw("?", [parsedRoute.language]),
     })
@@ -28,7 +28,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
             [`l${prev}.id`]: `l${cur}.parentId`,
             [`l${cur}.typeName`]: cn.raw("?", [typeNameParam]),
         })
-            .innerJoin(`PaNodel as s${cur}`, {
+            .innerJoin(`PaLNode as s${cur}`, {
             [`l${cur}.id`]: `s${cur}.nodeId`,
             [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
         })
@@ -44,7 +44,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
             [`l${prev}.id`]: `l${cur}.parentId`,
             [`l${cur}.relativeId`]: cn.raw("?", [relativeId]),
         })
-            .innerJoin(`PaNodel as s${cur}`, {
+            .innerJoin(`PaLNode as s${cur}`, {
             [`l${cur}.id`]: `s${cur}.nodeId`,
             [`s${cur}.language`]: cn.raw("?", [parsedRoute.language]),
         })

package/dist/rendering-payload/breadcrumb.queries.d.ts

@@ -1,4 +1,4 @@
-import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { TpBreadcrumbItem } from "./rendering-payload.types.js";
-export declare function getPublicBreadcrumb(renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpBreadcrumbItem[]>;
+export declare function getPublicBreadcrumb(renderingContext: RenderingContext, documentId: ParsedLNodeId): Promise<TpBreadcrumbItem[]>;

package/dist/rendering-payload/breadcrumb.queries.js

@@ -1,5 +1,5 @@
-import { encodeNodelId } from "@paroicms/public-anywhere-lib";
-import { getBreadcrumb } from "../admin-backend/nodel/nodel.queries.js";
+import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
+import { getBreadcrumb } from "../admin-backend/lnode/lnode.queries.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
 export async function getPublicBreadcrumb(renderingContext, documentId) {
@@ -12,7 +12,7 @@ export async function getPublicBreadcrumb(renderingContext, documentId) {
     for (const item of items) {
         const url = await getUrlOfDocument(siteContext, renderingContext.tracker, item.documentId);
         result.push({
-            id: encodeNodelId(item.documentId),
+            id: encodeLNodeId(item.documentId),
             url,
             title: item.title,
         });

package/dist/rendering-payload/create-doc-drop.js

@@ -1,6 +1,6 @@
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
-import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId, } from "@paroicms/public-anywhere-lib";
 import { type } from "arktype";
 import { getSiteFieldValue } from "../admin-backend/fields/load-fields.queries.js";
 import { getHandleOfSiteField } from "../common/media-handles.helpers.js";
@@ -18,7 +18,7 @@ import { getSiblingDocuments } from "./get-siblings.queries.js";
 import { loadDefaultImage } from "./load-default-image.js";
 import { makeImageAvailable } from "./make-image-available.js";
 import { countPartsOf, formatListOfPartValues, keyOfParentPartData, loadPartsOf, } from "./parts.queries.js";
-import { toPublicRoutingDocumentNodelIds } from "./site-payload.js";
+import { toPublicRoutingDocumentLNodeIds } from "./site-payload.js";
 import { loadTranslationsAsDrops } from "./translations.queries.js";
 const StringOrUndefinedAT = type("string|undefined");
 export function createDocPayloadDrop(renderingContext, docValues, options = {}) {
@@ -30,7 +30,7 @@ export function createDocPayloadDrop(renderingContext, docValues, options = {})
     });
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `doc:${encodeNodelId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
+        renderingCacheKey: `doc:${encodeLNodeId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: {
             kind: options.kind ??
                 (documentType.documentKind === "routing" ? "routingDocument" : "regularDocument"),
@@ -42,7 +42,7 @@ export function createDocPayloadDrop(renderingContext, docValues, options = {})
                 siteContext.logger.warn("'leafId' is deprecated, use 'nodeId' instead");
                 return docValues.nodeId;
             },
-            id: encodeNodelId(docValues),
+            id: encodeLNodeId(docValues),
             get routingIds() {
                 return getChildRoutingIds(siteContext.siteIds.homeIds, documentType, docValues);
             },
@@ -54,7 +54,7 @@ export function createDocPayloadDrop(renderingContext, docValues, options = {})
             languageLabel: siteContext.siteSchema.languageLabels[docValues.language],
             url: options.url ?? (() => loadUrlOfDocument(renderingContext, docValues)),
             excerpt: () => loadExcerpt(siteContext, renderingContext.tracker, {
-                nodelId: docValues,
+                lNodeId: docValues,
                 fieldTypes: documentType.fields ?? [],
             }),
             list: createPartsDrop(renderingContext, docValues, documentType),
@@ -93,14 +93,14 @@ export function createDocPayloadDrop(renderingContext, docValues, options = {})
             },
             field: () => loadPublicFieldValues(renderingContext, {
                 typeName: docValues.type,
-                nodelId: docValues,
+                lNodeId: docValues,
                 fieldNames: options.fieldNames,
             }),
             fields: () => {
                 siteContext.logger.warn("'fields' is deprecated, use 'field' instead");
                 return loadPublicFieldValues(renderingContext, {
                     typeName: docValues.type,
-                    nodelId: docValues,
+                    lNodeId: docValues,
                     fieldNames: options.fieldNames,
                 });
             },
@@ -130,7 +130,7 @@ function createPartsDrop(renderingContext, documentId, documentType) {
     const { siteContext } = renderingContext;
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `partsOf:${encodeNodelId(documentId)}`,
+        renderingCacheKey: `partsOf:${encodeLNodeId(documentId)}`,
         values: Object.fromEntries((documentType.lists ?? []).map((listType) => [
             listType.listName,
             async () => {
@@ -148,7 +148,7 @@ function createPartCountDrop(renderingContext, documentId, documentType) {
     const { siteContext } = renderingContext;
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `partCountersOf:${encodeNodelId(documentId)}`,
+        renderingCacheKey: `partCountersOf:${encodeLNodeId(documentId)}`,
         values: Object.fromEntries((documentType.lists ?? []).map((listType) => [
             listType.listName,
             () => countPartsOf(siteContext, renderingContext.tracker, documentId, listType),
@@ -165,13 +165,13 @@ async function loadUrlOfDocument(renderingContext, documentId) {
 }
 async function makeOgValuesPayload(renderingContext, documentType, docValues, options) {
     const { siteContext } = renderingContext;
-    const excerpt = await loadOrFromRenderingCache(renderingContext, `excerpt:${encodeNodelId(docValues)}:full`, () => loadExcerpt(siteContext, renderingContext.tracker, {
-        nodelId: docValues,
+    const excerpt = await loadOrFromRenderingCache(renderingContext, `excerpt:${encodeLNodeId(docValues)}:full`, () => loadExcerpt(siteContext, renderingContext.tracker, {
+        lNodeId: docValues,
         fieldTypes: documentType.fields ?? [],
     }));
     const url = options.url ??
-        (await loadOrFromRenderingCache(renderingContext, `url:${encodeNodelId(docValues)}`, () => loadUrlOfDocument(renderingContext, docValues)));
-    const featuredImageId = await loadOrFromRenderingCache(renderingContext, `featuredImage:${encodeNodelId(docValues)}`, async () => (await getFeaturedImageOf(renderingContext, {
+        (await loadOrFromRenderingCache(renderingContext, `url:${encodeLNodeId(docValues)}`, () => loadUrlOfDocument(renderingContext, docValues)));
+    const featuredImageId = await loadOrFromRenderingCache(renderingContext, `featuredImage:${encodeLNodeId(docValues)}`, async () => (await getFeaturedImageOf(renderingContext, {
         nodeId: docValues.nodeId,
         documentType,
     }))?.id);
@@ -217,7 +217,7 @@ function getChildRoutingIds(ids, documentType, parentDocument) {
         if (documentType.typeName !== ids.typeName) {
             throw new Error(`Routing identifier type mismatch: "${documentType.typeName}" ≠ "${ids.typeName}"`);
         }
-        const { id, ...rest } = toPublicRoutingDocumentNodelIds(ids, language);
+        const { id, ...rest } = toPublicRoutingDocumentLNodeIds(ids, language);
         return Object.keys(rest).length > 0 ? rest : undefined;
     }
     for (const childIds of Object.values(ids.children ?? {})) {

package/dist/rendering-payload/create-part-drop.js

@@ -1,5 +1,5 @@
 import { getPartTypeByName } from "@paroicms/internal-anywhere-lib";
-import { encodeNodelId } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
 import { toTpSourceMedia } from "../common/medias/to-media-values.js";
 import { getNodeTypeLabel } from "../helpers/label-translator.helper.js";
 import { createLiquidDrop } from "../liquidjs-tools/liquidjs-drop.js";
@@ -15,7 +15,7 @@ export function createPartDrop(renderingContext, docValues, options) {
     });
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `part:${encodeNodelId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
+        renderingCacheKey: `part:${encodeLNodeId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: {
             kind: "part",
             leafType: async () => {
@@ -26,7 +26,7 @@ export function createPartDrop(renderingContext, docValues, options) {
                 siteContext.logger.warn("'leafId' is deprecated, use 'nodeId' instead");
                 return docValues.nodeId;
             },
-            id: encodeNodelId(docValues),
+            id: encodeLNodeId(docValues),
             ...docValues,
             typeLabel: typeLabel,
             num: () => {
@@ -52,14 +52,14 @@ export function createPartDrop(renderingContext, docValues, options) {
             },
             field: () => loadPublicFieldValues(renderingContext, {
                 typeName: docValues.type,
-                nodelId: docValues,
+                lNodeId: docValues,
                 fieldNames: options.fieldNames,
             }),
             fields: () => {
                 siteContext.logger.warn("'part.fields' is deprecated, use 'part.field' instead");
                 return loadPublicFieldValues(renderingContext, {
                     typeName: docValues.type,
-                    nodelId: docValues,
+                    lNodeId: docValues,
                     fieldNames: options.fieldNames,
                 });
             },

package/dist/rendering-payload/doc-values.queries.d.ts

@@ -1,12 +1,12 @@
 import { type Tracker } from "@paroicms/internal-server-lib";
-import type { Obj, ParsedNodelId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
+import type { Obj, ParsedLNodeId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
 import type { LabeledBy } from "@paroicms/public-server-lib";
 import type { Knex } from "knex";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
 import type { TpDocValues } from "./rendering-payload.types.js";
-export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<TpDocValues>;
-export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId, options: {
+export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId): Promise<TpDocValues>;
+export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedLNodeId, options: {
     allowUndef: true;
 }): Promise<TpDocValues | undefined>;
 export interface PaginatedResult<T> {
@@ -17,7 +17,7 @@ export interface PaginatedResult<T> {
     pageSize: number;
 }
 export interface GetPaginatedDocsOptions {
-    parentId: ParsedNodelId;
+    parentId: ParsedLNodeId;
     documentKind: ScDocumentKind;
     orderBy?: ScSorting;
     labeledBy?: LabeledBy;
@@ -26,7 +26,7 @@ export interface GetPaginatedDocsOptions {
 }
 export declare function getPaginatedListOfDocValues(renderingContext: RenderingContext, options: GetPaginatedDocsOptions): Promise<PaginatedResult<TpDocValues>>;
 export interface GetDocsOptions {
-    parentId: ParsedNodelId;
+    parentId: ParsedLNodeId;
     documentKind: ScDocumentKind;
     orderBy?: ScSorting;
     offset?: number;

package/dist/rendering-payload/doc-values.queries.js

@@ -9,7 +9,7 @@ export async function getDocItem(siteContext, tracker, documentId, options = {})
     const query = siteContext.cn("PaDocument as d");
     querySelectDocValues(query, { omitId: true });
     query
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "d.nodeId",
         "s.language": "d.language",
     })
@@ -113,7 +113,7 @@ export function querySelectDocValues(query, { omitId } = {}) {
 function createBaseDocItemsQueryBuilder(siteContext, { parentId }) {
     const { cn } = siteContext;
     return cn("PaNode as l")
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "l.id",
         "s.language": cn.raw("?", [parentId.language]),
     })

package/dist/rendering-payload/excerpt.queries.d.ts

@@ -1,8 +1,8 @@
 import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ScFieldType } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../site-context/site-context.types.js";
-export declare function loadExcerpt(siteContext: SiteContext, tracker: Tracker, { nodelId, fieldTypes, maxLength, }: {
-    nodelId: {
+export declare function loadExcerpt(siteContext: SiteContext, tracker: Tracker, { lNodeId, fieldTypes, maxLength, }: {
+    lNodeId: {
         nodeId: string;
         language: string;
     };

package/dist/rendering-payload/excerpt.queries.js

@@ -8,7 +8,7 @@ const ExcerptRowAT = type({
 }).pipe((data) => ({
     excerpt: data.excerpt ?? undefined,
 }));
-export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, maxLength, }) {
+export async function loadExcerpt(siteContext, tracker, { lNodeId, fieldTypes, maxLength, }) {
     const excerptFieldTypes = [];
     for (const field of fieldTypes ?? []) {
         if (field.storedAs === "text" &&
@@ -23,13 +23,13 @@ export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, m
     }
     const orderedFieldTypes = excerptFieldTypes.sort((a, b) => a.useAsExcerpt - b.useAsExcerpt);
     for (const field of orderedFieldTypes) {
-        const dbLanguage = field.localized ? nodelId.language : dbAnyLanguage;
+        const dbLanguage = field.localized ? lNodeId.language : dbAnyLanguage;
         const row = await siteContext
             .cn("PaFieldText as f")
             .select("f.excerpt")
             .where({
             "f.field": field.name,
-            "f.nodeId": nodelId.nodeId,
+            "f.nodeId": lNodeId.nodeId,
             "f.language": dbLanguage,
         })
             .first();

package/dist/rendering-payload/field-values.d.ts

@@ -1,4 +1,4 @@
-import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import { type DropInst } from "../liquidjs-tools/liquidjs-drop.js";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { TpFieldValues } from "./rendering-payload.types.js";
@@ -9,6 +9,6 @@ export declare function getPublicSiteFieldValues(renderingContext: RenderingCont
 }>;
 export declare function loadPublicFieldValues(renderingContext: RenderingContext, options: {
     typeName: string;
-    nodelId: ParsedNodelId;
+    lNodeId: ParsedLNodeId;
     fieldNames?: string[];
 }): Promise<TpFieldValues>;

package/dist/rendering-payload/field-values.js

@@ -1,6 +1,6 @@
 import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
-import { encodeNodelId, isJsonFieldValue, isMediaHandleValue, isReadLabelingFieldValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
-import { languageIfNodel } from "../admin-backend/fields/_fields.helpers.js";
+import { encodeLNodeId, isJsonFieldValue, isMediaHandleValue, isReadLabelingFieldValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
+import { languageIfLNode } from "../admin-backend/fields/_fields.helpers.js";
 import { loadFieldValues } from "../admin-backend/fields/load-fields.queries.js";
 import { preprocessFields } from "../admin-backend/fields/preprocess-fields.js";
 import { getHandleOfFieldOnNode } from "../common/media-handles.helpers.js";
@@ -23,7 +23,7 @@ export function getPublicSiteFieldValues(renderingContext, language, { deprecate
             const rawFValues = await loadFieldValues(siteContext, {
                 fieldTypes,
                 nodeId: siteNodeId,
-                language: languageIfNodel(language, fType),
+                language: languageIfLNode(language, fType),
                 publishedOnly: true,
             });
             const fValues = await preprocessFields(renderingContext, rawFValues, fieldTypes, {
@@ -53,8 +53,8 @@ export async function loadPublicFieldValues(renderingContext, options) {
     }
     const rawValues = await loadFieldValues(siteContext, {
         fieldTypes,
-        nodeId: options.nodelId.nodeId,
-        language: options.nodelId.language,
+        nodeId: options.lNodeId.nodeId,
+        language: options.lNodeId.language,
         publishedOnly: true,
     });
     const values = await preprocessFields(renderingContext, rawValues, fieldTypes, {
@@ -66,14 +66,14 @@ export async function loadPublicFieldValues(renderingContext, options) {
         const fType = map.get(fieldName);
         if (!fType || !(fType.name in values))
             throw new Error(`missing field type for '${fieldName}'`);
-        result[fieldName] = makeFieldValueOrLoader(renderingContext, fType, value, options.nodelId.language);
+        result[fieldName] = makeFieldValueOrLoader(renderingContext, fType, value, options.lNodeId.language);
         if (fType.withGallery) {
-            result[`${fieldName}_gallery`] = createWithGalleryFieldLoader(renderingContext, fType, options.nodelId.nodeId);
+            result[`${fieldName}_gallery`] = createWithGalleryFieldLoader(renderingContext, fType, options.lNodeId.nodeId);
         }
     }
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `fields:${encodeNodelId(options.nodelId)}:${options.fieldNames?.join(",") ?? "full"}`,
+        renderingCacheKey: `fields:${encodeLNodeId(options.lNodeId)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: result,
     });
 }
@@ -113,7 +113,7 @@ function createTpTerm(renderingContext, term, rightLanguage) {
     renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: termId }));
     return createLiquidDrop({
         renderingContext,
-        renderingCacheKey: `term:${encodeNodelId(termId)}`,
+        renderingCacheKey: `term:${encodeLNodeId(termId)}`,
         values: {
             nodeId: term.nodeId,
             title,

package/dist/rendering-payload/get-siblings.queries.d.ts

@@ -1,4 +1,4 @@
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import type { ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { TpSiblingDocuments } from "./rendering-payload.types.js";
-export declare function getSiblingDocuments(renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpSiblingDocuments>;
+export declare function getSiblingDocuments(renderingContext: RenderingContext, documentId: ParsedLNodeId): Promise<TpSiblingDocuments>;

package/dist/rendering-payload/get-siblings.queries.js

@@ -66,7 +66,7 @@ async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentN
     const { language } = documentId;
     const { cn } = siteContext;
     const subQuery = cn("PaNode as l")
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "l.id",
         "s.language": cn.raw("?", [language]),
     })