@paroicms/server 1.97.0 → 1.98.0

package/dist/admin-backend/part/part.queries.js

@@ -1,15 +1,15 @@
 import { createNode } from "@paroicms/connector";
 import { getDocumentTypeByName, getPartTypeByName } from "@paroicms/internal-anywhere-lib";
 import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
-import { encodeNodelId, isDef, } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId, isDef, } from "@paroicms/public-anywhere-lib";
 import { ApiError } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 import { getHandleOfFeaturedImage } from "../../common/media-handles.helpers.js";
 import { invalidateDocumentInCache } from "../../common/text-cache.js";
-import { isOrphanNode } from "../nodel/nodel.queries.js";
+import { isOrphanNode } from "../lnode/lnode.queries.js";
 import { createPartNode, shiftPartNodeOrdersAfterDeletion } from "./part-node.queries.js";
 export async function createPartOnNode(siteContext, newId) {
-    await siteContext.cn("PaNodel").insert({
+    await siteContext.cn("PaLNode").insert({
         language: newId.language,
         nodeId: newId.nodeId,
         ready: true,
@@ -31,8 +31,8 @@ const OrderNumAT = type({
 }).pipe((r) => ({
     orderNum: r.orderNum ?? undefined,
 }));
-export async function createNodeWithPart(siteContext, { parentNodelId, listName, typeName, }) {
-    const { language, nodeId: parentNodeId } = parentNodelId;
+export async function createNodeWithPart(siteContext, { parentLNodeId, listName, typeName, }) {
+    const { language, nodeId: parentNodeId } = parentLNodeId;
     const { cn, siteSchema } = siteContext;
     const row = await cn("PaNode as l")
         .select(["l.typeName as typeName", "p.documentNodeId as documentNodeId"])
@@ -64,7 +64,7 @@ export async function createNodeWithPart(siteContext, { parentNodelId, listName,
             throw new ApiError("maximum parts reached", 400);
     }
     if (!listType.parts.includes(typeName)) {
-        throw new ApiError(`Invalid nodelType typeName: '${typeName}' for listName '${listName}'`, 400);
+        throw new ApiError(`Invalid lNodeType typeName: '${typeName}' for listName '${listName}'`, 400);
     }
     let lastOrderNum;
     if (listType.sorting) {
@@ -87,14 +87,14 @@ export async function createNodeWithPart(siteContext, { parentNodelId, listName,
             isOrdered: !!listType.sorting,
             lastOrderNum,
         });
-        await tx("PaNodel").insert({
+        await tx("PaLNode").insert({
             language,
             nodeId,
             ready: true,
         });
         return { language, nodeId };
     });
-    await invalidateDocumentInCache(siteContext, { documentId: parentNodelId });
+    await invalidateDocumentInCache(siteContext, { documentId: parentLNodeId });
     return newId;
 }
 const PartSeedRowAT = type({
@@ -115,7 +115,7 @@ const PartSeedRowAT = type({
     orderNum: r.orderNum ?? undefined,
     ready: Boolean(r.ready),
 }));
-export async function loadPartSeed(siteContext, nodelId) {
+export async function loadPartSeed(siteContext, lNodeId) {
     const { cn } = siteContext;
     const row = await cn("PaNode as l")
         .select([
@@ -128,44 +128,44 @@ export async function loadPartSeed(siteContext, nodelId) {
         "s.ready",
     ])
         .innerJoin("PaPartNode as p", "p.nodeId", "l.id")
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "l.id",
-        "s.language": cn.raw("?", [nodelId.language]),
+        "s.language": cn.raw("?", [lNodeId.language]),
     })
         .leftJoin("PaOrderedNode as o", "o.nodeId", "l.id")
-        .where("l.id", nodelId.nodeId)
+        .where("l.id", lNodeId.nodeId)
         .whereNotExists(function () {
         this.select(1).from("PaDocument as d").where("d.nodeId", "l.id");
     })
         .first();
     if (!row) {
-        throw new ApiError(`cannot find part '${nodelId.language}:${nodelId.nodeId}'`, 404);
+        throw new ApiError(`cannot find part '${lNodeId.language}:${lNodeId.nodeId}'`, 404);
     }
     const { typeName, publishDate, parentId, listName, documentNodeId, orderNum, ready } = PartSeedRowAT.assert(row);
     return {
         typeName,
-        partId: encodeNodelId(nodelId),
-        nodeId: nodelId.nodeId,
+        partId: encodeLNodeId(lNodeId),
+        nodeId: lNodeId.nodeId,
         listName,
         parentNodeId: parentId,
-        documentId: encodeNodelId({ language: nodelId.language, nodeId: documentNodeId }),
+        documentId: encodeLNodeId({ language: lNodeId.language, nodeId: documentNodeId }),
         orderNum,
         ready,
         publishDate,
-        language: nodelId.language,
+        language: lNodeId.language,
         scheduled: publishDate ? publishDate.getTime() > Date.now() : false,
     };
 }
-export async function deletePart(siteContext, nodelId) {
-    const nodeId = nodelId.nodeId;
+export async function deletePart(siteContext, lNodeId) {
+    const nodeId = lNodeId.nodeId;
     const documentNodeId = await getDocumentNodeIdOfPart(siteContext, nodeId);
     const { shouldDeleteNode } = await siteContext.cn.transaction(async (tx) => {
         await tx("PaFieldVarchar")
             .where("nodeId", nodeId)
-            .where("language", nodelId.language)
+            .where("language", lNodeId.language)
             .delete();
-        await tx("PaFieldText").where("nodeId", nodeId).where("language", nodelId.language).delete();
-        await tx("PaNodel").where("nodeId", nodeId).where("language", nodelId.language).delete();
+        await tx("PaFieldText").where("nodeId", nodeId).where("language", lNodeId.language).delete();
+        await tx("PaLNode").where("nodeId", nodeId).where("language", lNodeId.language).delete();
         const shouldDeleteNode = await isOrphanNode(tx, nodeId);
         if (shouldDeleteNode) {
             await shiftPartNodeOrdersAfterDeletion(tx, nodeId);
@@ -177,12 +177,12 @@ export async function deletePart(siteContext, nodelId) {
     await invalidateDocumentInCache(siteContext, {
         documentId: {
             nodeId: documentNodeId,
-            language: nodelId.language,
+            language: lNodeId.language,
         },
     });
     if (shouldDeleteNode) {
         const deletedIds = await siteContext.mediaStorage.deleteMedia({
-            handle: getHandleOfFeaturedImage(nodelId.nodeId),
+            handle: getHandleOfFeaturedImage(lNodeId.nodeId),
         });
         await siteContext.imageCache.invalidate({ mediaIds: deletedIds });
     }
@@ -195,7 +195,7 @@ const PartRowAT = type({
     listName: "string",
     orderNum: "number|null",
     language: "string|null",
-    nodelNodeId: "number|null",
+    lNodeNodeId: "number|null",
     ready: "number",
     "+": "reject",
 }).pipe((r) => ({
@@ -206,7 +206,7 @@ const PartRowAT = type({
     listName: r.listName,
     orderNum: r.orderNum ?? undefined,
     language: r.language ?? undefined,
-    nodelNodeId: isDef(r.nodelNodeId) ? String(r.nodelNodeId) : undefined,
+    lNodeNodeId: isDef(r.lNodeNodeId) ? String(r.lNodeNodeId) : undefined,
     ready: Boolean(r.ready),
 }));
 export async function readPartSeedsOf({ cn }, { documentNodeId, language, }) {
@@ -219,26 +219,26 @@ export async function readPartSeedsOf({ cn }, { documentNodeId, language, }) {
         "p.listName",
         "o.orderNum",
         "s.language",
-        "s.nodeId as nodelNodeId",
+        "s.nodeId as lNodeNodeId",
         "s.ready",
     ])
         .innerJoin("PaPartNode as p", "p.nodeId", "l.id")
-        .leftJoin("PaNodel as s", {
+        .leftJoin("PaLNode as s", {
         "s.nodeId": "l.id",
         "s.language": cn.raw("?", [language]),
     })
         .leftJoin("PaOrderedNode as o", "o.nodeId", "l.id")
         .where("p.documentNodeId", documentNodeId);
     return parts.map((item) => {
-        const { nodeId, publishDate, typeName, parentId, listName, orderNum, nodelNodeId, ready } = PartRowAT.assert(item);
-        const isPlaceholder = nodelNodeId === undefined;
+        const { nodeId, publishDate, typeName, parentId, listName, orderNum, lNodeNodeId, ready } = PartRowAT.assert(item);
+        const isPlaceholder = lNodeNodeId === undefined;
         if (isPlaceholder) {
             const seed = {
                 typeName,
                 nodeId,
                 listName,
                 parentNodeId: parentId,
-                documentId: encodeNodelId({ language, nodeId: documentNodeId }),
+                documentId: encodeLNodeId({ language, nodeId: documentNodeId }),
                 orderNum,
                 publishDate,
             };
@@ -246,11 +246,11 @@ export async function readPartSeedsOf({ cn }, { documentNodeId, language, }) {
         }
         const seed = {
             typeName,
-            partId: encodeNodelId({ language, nodeId }),
+            partId: encodeLNodeId({ language, nodeId }),
             nodeId,
             listName,
             parentNodeId: parentId,
-            documentId: encodeNodelId({ language, nodeId: documentNodeId }),
+            documentId: encodeLNodeId({ language, nodeId: documentNodeId }),
             orderNum,
             publishDate,
             language,

package/dist/admin-backend/part/part.resolver.extend.d.ts

@@ -1,3 +1,3 @@
 import type { GqlResolvers } from "../../graphql/generated-graphql-types.d.ts";
 import type { GraphqlContext } from "../../graphql/graphql.types.js";
-export declare const extendNodelWrapWithPartResolvers: GqlResolvers<GraphqlContext>;
+export declare const extendLNodeWrapWithPartResolvers: GqlResolvers<GraphqlContext>;

package/dist/admin-backend/part/part.resolver.extend.js

@@ -2,8 +2,8 @@ import { getDocumentTypeByName, getPartTypeByName } from "@paroicms/internal-any
 import { authGuard } from "../auth/auth.helper.js";
 import { getTypeNameOf } from "../node/node.queries.js";
 import { readPartSeedsOf } from "./part.queries.js";
-export const extendNodelWrapWithPartResolvers = {
-    NodelWrap: {
+export const extendLNodeWrapWithPartResolvers = {
+    LNodeWrap: {
         parts: async ({ nodeId, language }, _args, { siteContext, httpContext }) => {
             authGuard(httpContext);
             const typeName = await getTypeNameOf(siteContext, nodeId);

package/dist/admin-backend/part/part.resolver.extend.js.map

@@ -1 +1 @@
-{"version":3,"file":"part.resolver.extend.js","sourceRoot":"","sources":["../../../src/admin-backend/part/part.resolver.extend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAiB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,MAAM,gCAAgC,GAAiC;IAC5E,SAAS,EAAE;QACT,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAiB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACxF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAE7E,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAExC,OAAO,MAAM,eAAe,CAAC,WAAW,EAAE;gBACxC,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;KACF;IAED,IAAI,EAAE;QACJ,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAY,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACnF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEhC,OAAO,MAAM,eAAe,CAAC,WAAW,EAAE;gBACxC,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;KACF;IAED,iBAAiB,EAAE;QACjB,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC;KAC3E;CACF,CAAC"}
+{"version":3,"file":"part.resolver.extend.js","sourceRoot":"","sources":["../../../src/admin-backend/part/part.resolver.extend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAiB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,MAAM,gCAAgC,GAAiC;IAC5E,SAAS,EAAE;QACT,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAiB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACxF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAE7E,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAExC,OAAO,MAAM,eAAe,CAAC,WAAW,EAAE;gBACxC,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;KACF;IAED,IAAI,EAAE;QACJ,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAY,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACnF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEhC,OAAO,MAAM,eAAe,CAAC,WAAW,EAAE;gBACxC,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;KACF;IAED,iBAAiB,EAAE;QACjB,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC;KAC3E;CACF,CAAC"}

package/dist/admin-backend/part/part.resolver.js

@@ -1,18 +1,18 @@
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
-import { parseNodelId } from "@paroicms/public-anywhere-lib";
+import { parseLNodeId } from "@paroicms/public-anywhere-lib";
 import { authGuard } from "../auth/auth.helper.js";
 import { getTypeNameOf } from "../node/node.queries.js";
 import { movePart } from "./part-moving.queries.js";
 import { createNodeWithPart, createPartOnNode, deletePart, loadPartSeed, readPartSeedsOf, } from "./part.queries.js";
 export const partResolvers = {
     Query: {
-        part: async (_parent, { nodelId }, { siteContext, httpContext }) => {
+        part: async (_parent, { lNodeId }, { siteContext, httpContext }) => {
             authGuard(httpContext);
-            return await loadPartSeed(siteContext, parseNodelId(nodelId));
+            return await loadPartSeed(siteContext, parseLNodeId(lNodeId));
         },
         partsOf: async (_parent, { documentId }, { siteContext, httpContext }) => {
             authGuard(httpContext);
-            const { nodeId, language } = parseNodelId(documentId);
+            const { nodeId, language } = parseLNodeId(documentId);
             const typeName = await getTypeNameOf(siteContext, nodeId);
             const documentType = getDocumentTypeByName(siteContext.siteSchema, typeName);
             if (!documentType.lists || documentType.lists.length === 0)
@@ -32,18 +32,18 @@ export const partResolvers = {
             });
             return await loadPartSeed(siteContext, newId);
         },
-        createNodeWithPart: async (_parent, { parentNodelId, listName, typeName }, { siteContext, httpContext }) => {
+        createNodeWithPart: async (_parent, { parentLNodeId, listName, typeName }, { siteContext, httpContext }) => {
             authGuard(httpContext);
             const newId = await createNodeWithPart(siteContext, {
                 listName,
-                parentNodelId: parseNodelId(parentNodelId),
+                parentLNodeId: parseLNodeId(parentLNodeId),
                 typeName,
             });
             return await loadPartSeed(siteContext, newId);
         },
-        deletePart: async (_parent, { nodelId }, { siteContext, httpContext }) => {
+        deletePart: async (_parent, { lNodeId }, { siteContext, httpContext }) => {
             authGuard(httpContext);
-            await deletePart(siteContext, parseNodelId(nodelId));
+            await deletePart(siteContext, parseLNodeId(lNodeId));
             return true;
         },
         movePart: async (_parent, { partNodeId, newParentNodeId, newListName }, { siteContext, httpContext }) => {

package/dist/common/data-format.d.ts

@@ -19,7 +19,7 @@ export declare const AccountPreferencesAT: import("arktype/internal/methods/obje
 export declare function formatAuthenticatedAccount(data: AccountRow): AuthenticatedAccount;
 export declare function formatAccount(data: AccountRow): Account;
 export interface DocumentSeed {
-    nodelId: string;
+    lNodeId: string;
     nodeId: string;
     language: string;
     title?: string;

package/dist/common/data-format.js

@@ -1,4 +1,4 @@
-import { encodeNodelId } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
 import { type } from "arktype";
 import { cmsVersion } from "../context.js";
 import { getHandleOfFeaturedImage } from "./media-handles.helpers.js";
@@ -20,7 +20,7 @@ export function formatAccount(data) {
 }
 export function toDocumentSeed(document) {
     return {
-        nodelId: encodeNodelId({
+        lNodeId: encodeLNodeId({
             language: document.language,
             nodeId: document.nodeId,
         }),

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

@@ -11,7 +11,7 @@ export function getHandleOfField(siteContext, options) {
     const { fieldType, nodeId, language } = options;
     if (fieldType.localized && !fieldType.withGallery) {
         if (language === undefined)
-            throw new Error("Missing language for nodel field");
+            throw new Error("Missing language for lNode field");
         if (nodeId === siteContext.siteIds.siteNodeId)
             return `site:${fieldType.name}:${language}`;
         return `sect:${nodeId}:${fieldType.name}:${language}`;

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

@@ -1,11 +1,11 @@
-import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { AppLogger } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export declare function makeCacheDependencyKey(options: {
-    documentId: ParsedNodelId;
+    documentId: ParsedLNodeId;
     perimeter?: "slug";
 } | {
-    documentId: ParsedNodelId;
+    documentId: ParsedLNodeId;
     relation: "children";
 } | {
     relation: "labeled";
@@ -26,7 +26,7 @@ export declare function makeCacheKey(logger: AppLogger, options: {
 }): string;
 export declare function makeCacheKey(logger: AppLogger, options: {
     kind: "url";
-    documentId: ParsedNodelId;
+    documentId: ParsedLNodeId;
 }): string;
 export declare function makeCacheKey(logger: AppLogger, options: {
     kind: "html";
@@ -45,20 +45,20 @@ export declare function makePluginCacheKey(logger: AppLogger, options: {
     urlLike: string;
 }): string;
 export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
-    parentOf: ParsedNodelId;
+    parentOf: ParsedLNodeId;
 } | {
-    documentId: ParsedNodelId;
+    documentId: ParsedLNodeId;
     perimeter?: "slug";
 } | {
-    documentId: ParsedNodelId;
+    documentId: ParsedLNodeId;
     fully: true;
-    parentId: ParsedNodelId | undefined;
+    parentId: ParsedLNodeId | undefined;
 }): Promise<void>;
 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: ParsedNodelId;
+    documentId: ParsedLNodeId;
     relation: "children";
 } | {
     relation: "labeled";
@@ -71,7 +71,7 @@ export declare function depKeysOfNodeRelationCache(siteContext: Pick<SiteContext
 }): Promise<string[]>;
 export declare function invalidateMultipleDocumentsInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
     nodeId: string;
-    parentIds?: ParsedNodelId[];
+    parentIds?: ParsedLNodeId[];
     fully?: boolean;
 } | {
     parentOfNodeId: string;

package/dist/common/text-cache.js

@@ -1,6 +1,6 @@
-import { encodeNodelId } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
 import { allDependencyKey } from "@paroicms/server-text-cache-system";
-import { getParentDocumentIdsOf, getParentNodeIdOf, getParentNodelIdOf, } from "../admin-backend/document/load-documents.queries.js";
+import { getParentDocumentIdsOf, getParentLNodeIdOf, getParentNodeIdOf, } from "../admin-backend/document/load-documents.queries.js";
 import { normalizeUrlForCache } from "./url-helpers.js";
 export function makeCacheDependencyKey(options) {
     if ("global" in options)
@@ -18,7 +18,7 @@ export function makeCacheDependencyKey(options) {
     if ("nodeId" in options) {
         return `*:${options.nodeId}`;
     }
-    const encodedId = encodeNodelId(options.documentId);
+    const encodedId = encodeLNodeId(options.documentId);
     if ("relation" in options)
         return `${encodedId}:${options.relation}`;
     if (options.perimeter)
@@ -39,7 +39,7 @@ export function makeCacheKey(logger, options) {
     if (kind === "redirect")
         return `${kind}:${urlKey}`;
     if (documentId)
-        return `${kind}:${encodeNodelId(documentId)}`;
+        return `${kind}:${encodeLNodeId(documentId)}`;
     throw new Error("invalid parameter");
 }
 export function makePluginCacheKey(logger, options) {
@@ -48,7 +48,7 @@ export function makePluginCacheKey(logger, options) {
 export async function invalidateDocumentInCache(siteContext, options) {
     const documentId = "documentId" in options
         ? options.documentId
-        : await getParentNodelIdOf(siteContext, options.parentOf);
+        : await getParentLNodeIdOf(siteContext, options.parentOf);
     if (!documentId)
         return;
     const fully = "fully" in options && options.fully;
@@ -63,7 +63,7 @@ export async function invalidateDocumentInCache(siteContext, options) {
     if (fully) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId, relation: "children" }));
     }
-    const parentId = "parentId" in options ? options.parentId : await getParentNodelIdOf(siteContext, documentId);
+    const parentId = "parentId" in options ? options.parentId : await getParentLNodeIdOf(siteContext, documentId);
     if (parentId) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
     }

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

@@ -4,13 +4,13 @@ import { accountResolvers } from "../admin-backend/account/account.resolver.js";
 import { backupResolvers } from "../admin-backend/backup/backup.resolver.js";
 import { extendWithDocumentResolver } from "../admin-backend/document/document.resolver.extend.js";
 import { documentResolvers } from "../admin-backend/document/document.resolver.js";
-import { extendNodelWrapWithFieldValuesResolvers, extendPartWithFieldValuesResolver, fieldResolvers, } from "../admin-backend/fields/fields.resolver.js";
+import { extendLNodeWrapWithFieldValuesResolvers, extendPartWithFieldValuesResolver, fieldResolvers, } from "../admin-backend/fields/fields.resolver.js";
+import { lNodeWrapResolvers } from "../admin-backend/lnode/lnode-wrap.resolver.js";
 import { extendDocumentWithMediaResolver } from "../admin-backend/media/media.resolver.extend.js";
 import { mediaResolvers } from "../admin-backend/media/media.resolver.js";
-import { extendNodelWrapWithNodeResolver } from "../admin-backend/node/node.resolver.extend.js";
+import { extendLNodeWrapWithNodeResolver } from "../admin-backend/node/node.resolver.extend.js";
 import { nodeResolvers } from "../admin-backend/node/node.resolver.js";
-import { nodelWrapResolvers } from "../admin-backend/nodel/nodel-wrap.resolver.js";
-import { extendNodelWrapWithPartResolvers } from "../admin-backend/part/part.resolver.extend.js";
+import { extendLNodeWrapWithPartResolvers } from "../admin-backend/part/part.resolver.extend.js";
 import { partResolvers } from "../admin-backend/part/part.resolver.js";
 import { siteConstantsResolvers } from "../admin-backend/site-constants/site-constants.resolver.js";
 import { unprotectedResolvers } from "../admin-backend/unprotected/unprotected.resolver.js";
@@ -24,14 +24,14 @@ export function federateResolvers() {
         documentResolvers,
         extendWithDocumentResolver,
         fieldResolvers,
-        extendNodelWrapWithFieldValuesResolvers,
+        extendLNodeWrapWithFieldValuesResolvers,
         extendPartWithFieldValuesResolver,
         nodeResolvers,
-        extendNodelWrapWithNodeResolver,
+        extendLNodeWrapWithNodeResolver,
         mediaResolvers,
         partResolvers,
-        extendNodelWrapWithPartResolvers,
-        nodelWrapResolvers,
+        extendLNodeWrapWithPartResolvers,
+        lNodeWrapResolvers,
         siteConstantsResolvers,
         unprotectedResolvers,
         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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EACL,uCAAuC,EACvC,iCAAiC,EACjC,cAAc,GACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAIhF,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,gBAAgB;QAChB,eAAe;QACf,iBAAiB;QACjB,0BAA0B;QAC1B,cAAc;QACd,uCAAuC;QACvC,iCAAiC;QACjC,aAAa;QACb,+BAA+B;QAC/B,cAAc;QACd,aAAa;QACb,gCAAgC;QAChC,kBAAkB;QAClB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,+BAA+B;KAChC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"apollo-server-init.js","sourceRoot":"","sources":["../../src/graphql/apollo-server-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EACL,uCAAuC,EACvC,iCAAiC,EACjC,cAAc,GACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAIhF,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,gBAAgB;QAChB,eAAe;QACf,iBAAiB;QACjB,0BAA0B;QAC1B,cAAc;QACd,uCAAuC;QACvC,iCAAiC;QACjC,aAAa;QACb,+BAA+B;QAC/B,cAAc;QACd,aAAa;QACb,gCAAgC;QAChC,kBAAkB;QAClB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,+BAA+B;KAChC,CAAC;AACJ,CAAC"}

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

@@ -1,6 +1,6 @@
 import { getPluginAssetsUrl } from "@paroicms/connector";
 import { createTracker, toAbsoluteUrl } from "@paroicms/internal-server-lib";
-import { messageOf, parseNodelId, unwrapReadFieldValue } from "@paroicms/public-anywhere-lib";
+import { messageOf, parseLNodeId, unwrapReadFieldValue } from "@paroicms/public-anywhere-lib";
 import { generateImageSlug, } from "@paroicms/public-server-lib";
 import { getSiteFieldValue } from "../admin-backend/fields/load-fields.queries.js";
 import { sendMail } from "../common/mail/sendMail.helpers.js";
@@ -170,7 +170,7 @@ function createUseImageFn(renderingContext) {
 }
 async function getDocument(renderingContext, rawDocumentId) {
     const { siteContext } = renderingContext;
-    const documentId = parseNodelId(rawDocumentId);
+    const documentId = parseLNodeId(rawDocumentId);
     renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
     const docPayload = await getDocItem(siteContext, renderingContext.tracker, documentId, {
         allowUndef: true,

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

@@ -201,7 +201,7 @@ async function addMultiplePartContents(fqdn, options) {
         for (const [language, values] of Object.entries(multilingualFieldValues)) {
             if (nodeId === undefined) {
                 const created = await createNodeWithPart(siteContext, {
-                    parentNodelId: {
+                    parentLNodeId: {
                         nodeId: parentNodeId,
                         language,
                     },

package/dist/helpers/utils-helper.d.ts

@@ -1,2 +1,2 @@
-export declare function toNodeId(nodeOrNodelId: string): string;
+export declare function toNodeId(nodeOrLNodeId: string): string;
 export declare function removeExtensionFromFileName(filename: string): string;

package/dist/helpers/utils-helper.js

@@ -1,6 +1,6 @@
-import { parseNodelId } from "@paroicms/public-anywhere-lib";
-export function toNodeId(nodeOrNodelId) {
-    return nodeOrNodelId.indexOf(":") !== -1 ? parseNodelId(nodeOrNodelId).nodeId : nodeOrNodelId;
+import { parseLNodeId } from "@paroicms/public-anywhere-lib";
+export function toNodeId(nodeOrLNodeId) {
+    return nodeOrLNodeId.indexOf(":") !== -1 ? parseLNodeId(nodeOrLNodeId).nodeId : nodeOrLNodeId;
 }
 export function removeExtensionFromFileName(filename) {
     const i = filename.lastIndexOf(".");

package/dist/public-api/public-api-rendering.d.ts

@@ -1,9 +1,9 @@
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import type { ParsedLNodeId } from "@paroicms/public-anywhere-lib";
 import type { LabeledBy, PaHttpContext, PartialsParamsInput } from "@paroicms/public-server-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 export declare function renderChildPartials(renderingContext: RenderingContext, httpContext: PaHttpContext, options: {
     params: PartialsParamsInput;
-    parentDocumentId: ParsedNodelId;
+    parentDocumentId: ParsedLNodeId;
     labeledBy?: LabeledBy;
 }): Promise<void>;
 export declare function renderSearchPartials(renderingContext: RenderingContext, httpContext: PaHttpContext, options: {

package/dist/public-api/search-text/search-text.queries.d.ts

@@ -1,4 +1,4 @@
-import type { OrderByItem } from "../../admin-backend/nodel/nodel.queries.js";
+import type { OrderByItem } from "../../admin-backend/lnode/lnode.queries.js";
 import type { TpDocValues } from "../../rendering-payload/rendering-payload.types.js";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface SearchTextOptions {

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

@@ -44,7 +44,7 @@ export async function searchText(siteContext, options) {
 function createBaseSearchTextQueryBuilder(siteContext, { language, words, onlyPublished, }) {
     const { cn } = siteContext;
     const query = cn("PaDocument as d")
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "d.nodeId",
         "s.language": "d.language",
     })
@@ -73,7 +73,7 @@ function createBaseSearchTextQueryBuilder(siteContext, { language, words, onlyPu
           select 1
           from PaNode l2
           inner join PaPartNode p2 on p2.nodeId = l2.id
-          inner join PaNodel s2 on s2.nodeId = l2.id and s2.language = ?
+          inner join PaLNode s2 on s2.nodeId = l2.id and s2.language = ?
           left join PaFieldVarchar fv2 on fv2.nodeId = s2.nodeId and (fv2.language = s2.language or fv2.language = ?)
           left join PaFieldText ft2 on ft2.nodeId = s2.nodeId and (ft2.language = s2.language or ft2.language = ?)
           where p2.documentNodeId = l.id ${onlyPublished ? "and s2.ready = 1 and l2.publishDate <= current_timestamp" : ""} and (fv2.val like ? or ft2.val like ?)

package/dist/rendered-site/feed/feed-generator.js

@@ -1,7 +1,7 @@
 import { mainDbSchemaName } from "@paroicms/connector";
 import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
 import { parseSqliteDateTime, toAbsoluteUrl } from "@paroicms/internal-server-lib";
-import { encodeNodelId, ensureString, isMediaHandleValue, isReadLabelingFieldValue, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { encodeLNodeId, ensureString, isMediaHandleValue, isReadLabelingFieldValue, parseLNodeId, } from "@paroicms/public-anywhere-lib";
 import { escapeHtml } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 import { Feed } from "feed";
@@ -92,11 +92,11 @@ async function buildFeedEntries(renderingContext, options) {
         }
         const content = await loadFeedItemContent(renderingContext, item, language);
         const excerpt = await loadExcerpt(siteContext, renderingContext.tracker, {
-            nodelId: item,
+            lNodeId: item,
             fieldTypes: nodeType.fields ?? [],
             maxLength: 300,
         });
-        const link = toAbsoluteUrl(siteContext, await getUrlOfDocument(siteContext, renderingContext.tracker, parseNodelId(`${item.nodeId}:${item.language}`)));
+        const link = toAbsoluteUrl(siteContext, await getUrlOfDocument(siteContext, renderingContext.tracker, parseLNodeId(`${item.nodeId}:${item.language}`)));
         const defaultImage = await loadDefaultImage(renderingContext, {
             nodeId: item.nodeId,
             language,
@@ -106,7 +106,7 @@ async function buildFeedEntries(renderingContext, options) {
             ? undefined
             : await makeImageAvailableById(renderingContext, { mediaId: defaultImage.id }, { resizeRule: "x720x", pixelRatio: 1, mediaType: "image/jpeg" });
         feedEntries.push({
-            guid: `${siteContext.fqdn}:${encodeNodelId(item)}`,
+            guid: `${siteContext.fqdn}:${encodeLNodeId(item)}`,
             link,
             title: item.title ?? simpleI18n.translate({ key: "feed.missingTitle", language }),
             description: excerpt,
@@ -193,7 +193,7 @@ function createFeedItemsQueryBuilder(siteContext, language) {
         "d.title as title",
         "l.publishDate as publishDate",
     ])
-        .innerJoin("PaNodel as s", {
+        .innerJoin("PaLNode as s", {
         "s.nodeId": "l.id",
         "s.language": cn.raw("?", [language]),
     })