npm - @paroicms/server - Versions diffs - 1.117.3 → 1.118.0 - Mend

@paroicms/server 1.117.3 → 1.118.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

package/README.md CHANGED Viewed

@@ -28,7 +28,7 @@ Here are some tips:
 ## Technologies
-Themes for ParoiCMS are written in [LiquidJS](https://liquidjs.com/) (the syntax from Shopify). Data is stored in SQLite databases.
+Themes for ParoiCMS are written in [LiquidJS](https://liquidjs.com/) (the template syntax from Shopify). Data is stored in SQLite databases.
 ## License

package/dist/admin-backend/document/document-moving.queries.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import type { SiteContext } from "../../site-context/site-context.types.js";
+export declare function moveDocument(siteContext: SiteContext, { documentNodeId, newParentNodeId, }: {
+    documentNodeId: string;
+    newParentNodeId: string;
+}): Promise<void>;

package/dist/admin-backend/document/document-moving.queries.js ADDED Viewed

@@ -0,0 +1,166 @@
+import { getDocumentTypeByName, getNodeTypeByName, isRootOfSubRoutingCluster, } from "@paroicms/internal-anywhere-lib";
+import { ApiError } from "@paroicms/public-server-lib";
+import { type } from "arktype";
+import { invalidateNodeInCache } from "../../common/text-cache.js";
+import { findAvailableRelativeId } from "../../connector/db-init/init-node-queries.js";
+import { countNodeChildrenOf, getLanguagesOfNode } from "../node/node.queries.js";
+export async function moveDocument(siteContext, { documentNodeId, newParentNodeId, }) {
+    const docInfo = await getDocumentInfoForMove(siteContext, documentNodeId);
+    validateNotSubRoutingClusterRoot(siteContext, docInfo.typeName);
+    const parentInfo = await getNewParentInfo(siteContext, newParentNodeId);
+    validateTypeCompatibility(siteContext, docInfo.typeName, parentInfo.typeName);
+    await validateChildLimit(siteContext, newParentNodeId, parentInfo.typeName);
+    await validateLanguageCompatibility(siteContext, documentNodeId, newParentNodeId);
+    await validateNoCircularReference(siteContext, documentNodeId, newParentNodeId);
+    const newRelativeId = await checkRelativeIdCollision(siteContext, documentNodeId, newParentNodeId, docInfo.relativeId);
+    await executeMoveDocument(siteContext, documentNodeId, docInfo.parentId, newParentNodeId, parentInfo.typeName, newRelativeId);
+}
+const DocumentInfoForMoveAT = type({
+    typeName: "string",
+    parentId: "number|null",
+    relativeId: "string",
+    "+": "reject",
+}).pipe((r) => ({
+    typeName: r.typeName,
+    parentId: r.parentId === null ? undefined : String(r.parentId),
+    relativeId: r.relativeId,
+}));
+async function getDocumentInfoForMove(siteContext, documentNodeId) {
+    const { cn } = siteContext;
+    const row = await cn("PaNode as n")
+        .select("n.typeName", "n.parentId", "n.relativeId")
+        .where("n.id", documentNodeId)
+        .first();
+    if (!row)
+        throw new ApiError(`cannot find document node '${documentNodeId}'`, 404);
+    return DocumentInfoForMoveAT.assert(row);
+}
+function validateNotSubRoutingClusterRoot(siteContext, typeName) {
+    const nodeType = getNodeTypeByName(siteContext.siteSchema, typeName);
+    if (nodeType.kind !== "document" || nodeType.documentKind !== "regular") {
+        throw new ApiError("only regular documents can be moved", 400);
+    }
+    if (isRootOfSubRoutingCluster(nodeType)) {
+        throw new ApiError("cannot move a sub-routing-cluster root document", 400);
+    }
+}
+const NewParentInfoAT = type({
+    typeName: "string",
+    "+": "reject",
+});
+async function getNewParentInfo(siteContext, newParentNodeId) {
+    const { cn } = siteContext;
+    const row = await cn("PaNode as n")
+        .select("n.typeName")
+        .where("n.id", newParentNodeId)
+        .first();
+    if (!row)
+        throw new ApiError(`cannot find new parent node '${newParentNodeId}'`, 404);
+    return NewParentInfoAT.assert(row);
+}
+function validateTypeCompatibility(siteContext, documentTypeName, parentTypeName) {
+    const parentDocType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
+    if (!parentDocType.regularChildren?.includes(documentTypeName)) {
+        throw new ApiError(`document type '${documentTypeName}' is not a valid regular child of '${parentTypeName}'`, 400);
+    }
+}
+async function validateChildLimit(siteContext, newParentNodeId, parentTypeName) {
+    const parentDocType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
+    if (parentDocType.childLimit !== undefined) {
+        const count = await countNodeChildrenOf(siteContext, newParentNodeId);
+        if (count >= parentDocType.childLimit) {
+            throw new ApiError("maximum children reached on new parent", 400);
+        }
+    }
+}
+async function validateLanguageCompatibility(siteContext, documentNodeId, newParentNodeId) {
+    const docLanguages = await getLanguagesOfNode(siteContext, documentNodeId);
+    const parentLanguages = await getLanguagesOfNode(siteContext, newParentNodeId);
+    const parentLangSet = new Set(parentLanguages);
+    for (const lang of docLanguages) {
+        if (!parentLangSet.has(lang)) {
+            throw new ApiError(`document has language '${lang}' which does not exist on the new parent`, 400);
+        }
+    }
+}
+const AncestorRowAT = type({
+    parentId: "number|null",
+    "+": "reject",
+});
+async function validateNoCircularReference(siteContext, documentNodeId, newParentNodeId) {
+    const { cn } = siteContext;
+    let currentId = newParentNodeId;
+    while (currentId) {
+        if (currentId === documentNodeId) {
+            throw new ApiError("cannot move document into its own descendant", 400);
+        }
+        const row = await cn("PaNode as n")
+            .select("n.parentId")
+            .where("n.id", currentId)
+            .first();
+        if (!row)
+            break;
+        const validated = AncestorRowAT.assert(row);
+        currentId = validated.parentId === null ? undefined : String(validated.parentId);
+    }
+}
+async function checkRelativeIdCollision(siteContext, documentNodeId, newParentNodeId, currentRelativeId) {
+    const { cn, siteSchema } = siteContext;
+    const existing = await cn("PaNode as n")
+        .select("n.id")
+        .where("n.parentId", newParentNodeId)
+        .andWhere("n.relativeId", currentRelativeId)
+        .andWhereNot("n.id", documentNodeId)
+        .first();
+    if (!existing)
+        return undefined;
+    const docInfo = await getDocumentInfoForMove(siteContext, documentNodeId);
+    return await findAvailableRelativeId(siteSchema, cn, {
+        parentId: newParentNodeId,
+        typeName: docInfo.typeName,
+    });
+}
+async function executeMoveDocument(siteContext, documentNodeId, oldParentNodeId, newParentNodeId, newParentTypeName, newRelativeId) {
+    const { cn, siteSchema } = siteContext;
+    const parentDocType = getDocumentTypeByName(siteSchema, newParentTypeName);
+    await cn.transaction(async (tx) => {
+        const updateData = { parentId: newParentNodeId };
+        if (newRelativeId) {
+            updateData.relativeId = newRelativeId;
+        }
+        await tx("PaNode").where("id", documentNodeId).update(updateData);
+        if (parentDocType.regularChildrenSorting === "manual") {
+            await updateDocumentOrdering(tx, documentNodeId, newParentNodeId);
+        }
+    });
+    if (oldParentNodeId) {
+        await invalidateNodeInCache(siteContext, { nodeId: oldParentNodeId });
+    }
+    await invalidateNodeInCache(siteContext, { nodeId: newParentNodeId });
+    await invalidateNodeInCache(siteContext, { nodeId: documentNodeId });
+}
+async function updateDocumentOrdering(tx, documentNodeId, newParentNodeId) {
+    const orderRow = await tx("PaNode as n")
+        .select(tx.raw("max(o.orderNum) as orderNum"))
+        .innerJoin("PaOrderedNode as o", "o.nodeId", "n.id")
+        .where("n.parentId", newParentNodeId)
+        .andWhereNot("n.id", documentNodeId)
+        .first();
+    const maxOrderNum = Number(orderRow?.orderNum) || 0;
+    const existingOrder = await tx("PaOrderedNode")
+        .select("nodeId")
+        .where("nodeId", documentNodeId)
+        .first();
+    if (existingOrder) {
+        await tx("PaOrderedNode")
+            .where("nodeId", documentNodeId)
+            .update({ orderNum: maxOrderNum + 1 });
+    }
+    else {
+        await tx("PaOrderedNode").insert({
+            nodeId: documentNodeId,
+            orderNum: maxOrderNum + 1,
+        });
+    }
+}
+//# sourceMappingURL=document-moving.queries.js.map

package/dist/admin-backend/document/document-moving.queries.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"document-moving.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document-moving.queries.ts"],"names":[],"mappings":"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"}

package/dist/admin-backend/document/document.resolver.js CHANGED Viewed

@@ -5,15 +5,17 @@ import { siteReadyGuard } from "../../graphql/graphql.types.js";
 import { getUrlOfDocument } from "../../rendered-site/page-route/make-url.js";
 import { permissionGuard } from "../auth/authorization.helper.js";
 import { recordEvent } from "../event-log/event-log.service.js";
-import { getTypeNameOf } from "../node/node.queries.js";
+import { findOneDocumentSeed } from "../lnode/lnode.queries.js";
+import { findOneNode, getTypeNameOf } from "../node/node.queries.js";
+import { moveDocument as moveDocumentQuery } from "./document-moving.queries.js";
 import { getOneDocument } from "./load-documents.queries.js";
 import { createDocumentOnNode, createNodeWithDocument, deleteDocument, deleteNodeAndDocuments, parseDocumentMetadataValues, updateDocument, } from "./save-documents.queries.js";
 export const documentResolvers = {
     Query: {
-        document: async (_parent, { id }, { siteContext, httpContext }) => {
+        document: async (_parent, { documentId }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             await permissionGuard(siteContext, httpContext, "document.edit");
-            return toDocumentSeed(await getOneDocument(siteContext, parseLNodeId(id)));
+            return await findOneDocumentSeed(siteContext, parseLNodeId(documentId));
         },
     },
     Mutation: {
@@ -45,10 +47,10 @@ export const documentResolvers = {
             }
             return toDocumentSeed(doc);
         },
-        deleteDocument: async (_parent, { lNodeId }, { siteContext, httpContext }) => {
+        deleteDocument: async (_parent, { documentId }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             const authorizedAccount = await permissionGuard(siteContext, httpContext, "document.edit");
-            const parsedId = parseLNodeId(lNodeId);
+            const parsedId = parseLNodeId(documentId);
             const doc = await getOneDocument(siteContext, parsedId);
             const typeName = await getTypeNameOf(siteContext, doc.nodeId);
             await deleteDocument(siteContext, parsedId);
@@ -56,7 +58,7 @@ export const documentResolvers = {
                 eventType: "document.delete",
                 actorId: authorizedAccount.accountId,
                 targetType: "document",
-                targetId: lNodeId,
+                targetId: documentId,
                 eventData: {
                     nodeId: doc.nodeId,
                     typeName,
@@ -66,17 +68,42 @@ export const documentResolvers = {
             });
             return true;
         },
-        deleteNodeAndDocuments: async (_parent, { lNodeId }, { siteContext, httpContext }) => {
+        moveDocument: async (_parent, { documentNodeId, newParentNodeId }, { siteContext, httpContext }) => {
+            siteReadyGuard(siteContext);
+            const authorizedAccount = await permissionGuard(siteContext, httpContext, "document.edit");
+            const node = await findOneNode(siteContext, documentNodeId);
+            const doc = await getOneDocument(siteContext, {
+                nodeId: documentNodeId,
+                language: siteContext.siteSchema.languages[0],
+            });
+            await moveDocumentQuery(siteContext, { documentNodeId, newParentNodeId });
+            recordEvent(siteContext, {
+                eventType: "document.move",
+                actorId: authorizedAccount.accountId,
+                targetType: "document",
+                targetId: encodeLNodeId({ nodeId: documentNodeId, language: doc.language }),
+                eventData: {
+                    documentNodeId,
+                    typeName: node.typeName,
+                    title: doc.title,
+                    language: doc.language,
+                    oldParentNodeId: node.parentId ?? "",
+                    newParentNodeId,
+                },
+            });
+            return true;
+        },
+        deleteNodeAndDocuments: async (_parent, { documentId }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             await permissionGuard(siteContext, httpContext, "document.edit");
-            await deleteNodeAndDocuments(siteContext, parseLNodeId(lNodeId).nodeId);
+            await deleteNodeAndDocuments(siteContext, parseLNodeId(documentId).nodeId);
             return true;
         },
-        createNodeWithDocument: async (_parent, { values, parentLNodeId }, { siteContext, httpContext }) => {
+        createNodeWithDocument: async (_parent, { values, parentDocumentId }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             const authorizedAccount = await permissionGuard(siteContext, httpContext, "document.edit");
             const documentId = await createNodeWithDocument(siteContext, {
-                parentId: parseLNodeId(parentLNodeId),
+                parentId: parseLNodeId(parentDocumentId),
                 values: {
                     title: values.title ?? undefined,
                     slug: values.slug ?? undefined,

package/dist/admin-backend/document/document.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,cAAc,~~EAAE~~,MAAM,6BAA6B,CAAC;~~AAE7D~~,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;~~AAMhE~~,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;~~AACxD~~,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,2BAA2B,EAC3B,cAAc,GACf,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,KAAK,EAAE;QACL,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,~~EAAE~~,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;~~YAChE~~,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,OAAO,~~cAAc,CAAC,~~MAAM,~~cAAc~~,CAAC,WAAW,EAAE,YAAY,CAAC,~~EAAE~~,CAAC,CAAC,CAAC~~,CAAC~~;~~QAC7E~~,CAAC;KACF;IAED,QAAQ,EAAE;QACR,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC1F,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;YAGvD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE1C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAEvD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9D,WAAW,CAAC,WAAW,EAAE;oBACvB,SAAS,EAAE,iBAAiB;oBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;oBACpC,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;oBAChC,SAAS,EAAE;wBACT,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,QAAQ;wBACR,KAAK,EAAE,GAAG,CAAC,KAAK;wBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,aAAa;qBACqB;iBACrC,CAAC,CAAC;YACL,CAAC;YAED,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,~~OAAO~~,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;~~YAC3E~~,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,YAAY,CAAC,~~OAAO~~,CAAC,CAAC;~~YAEvC~~,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAE9D,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAE5C,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,~~OAAO~~;~~gBACjB~~,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,~~sBAAsB~~,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;~~YACnF~~,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,MAAM,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC,~~OAAO~~,CAAC,CAAC,MAAM,CAAC,CAAC;~~YACxE~~,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB,EAAE,KAAK,EAC3B,OAAO,EACP,EAAE,MAAM,EAAE,~~aAAa~~,EAAE,~~EACzB~~,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;gBAC3D,QAAQ,EAAE,YAAY,CAAC,~~aAAa~~,CAAC;~~gBACrC~~,MAAM,EAAE;oBACN,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS;oBAChC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS;oBAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,oBAAoB,EAAE,KAAK,EACzB,OAAO,EACP,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAC5B,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;gBACzD,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,MAAM;oBACZ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS,EAAE;oBACtE,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KACF;IAED,QAAQ,EAAE;QACR,KAAK,CAAC,GAAG,CAAC,~~MAA4C~~,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE;~~YAC9E~~,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,WAAW,EACX,eAAe,EAAE,EACjB;gBACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;YACF,OAAO,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,CAAC;KACF;CACF,CAAC"}
1	+ {"version":3,"file":"document.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAqB,MAAM,6BAA6B,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAOhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,2BAA2B,EAC3B,cAAc,GACf,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,KAAK,EAAE;QACL,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACxE,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,OAAO,MAAM,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1E,CAAC;KACF;IAED,QAAQ,EAAE;QACR,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC1F,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;YAGvD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE1C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAEvD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9D,WAAW,CAAC,WAAW,EAAE;oBACvB,SAAS,EAAE,iBAAiB;oBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;oBACpC,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;oBAChC,SAAS,EAAE;wBACT,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,QAAQ;wBACR,KAAK,EAAE,GAAG,CAAC,KAAK;wBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,aAAa;qBACqB;iBACrC,CAAC,CAAC;YACL,CAAC;YAED,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9E,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;YAE1C,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAE9D,MAAM,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAE5C,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,UAAU;gBACpB,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,YAAY,EAAE,KAAK,EACjB,OAAO,EACP,EAAE,cAAc,EAAE,eAAe,EAAE,EACnC,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAE3F,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;gBAC5C,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;aAC9C,CAAC,CAAC;YAEH,MAAM,iBAAiB,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAC;YAE1E,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,eAAe;gBAC1B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC3E,SAAS,EAAE;oBACT,cAAc;oBACd,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,eAAe,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;oBACpC,eAAe;iBACiB;aACnC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACtF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACjE,MAAM,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB,EAAE,KAAK,EAC3B,OAAO,EACP,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC5B,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;gBAC3D,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC;gBACxC,MAAM,EAAE;oBACN,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS;oBAChC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS;oBAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,oBAAoB,EAAE,KAAK,EACzB,OAAO,EACP,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAC5B,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;gBACzD,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,MAAM;oBACZ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS,EAAE;oBACtE,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,SAAS;gBACpC,UAAU,EAAE,UAAU;gBACtB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ;oBACR,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACY;aACrC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KACF;IAED,QAAQ,EAAE;QACR,KAAK,CAAC,GAAG,CAAC,MAAoB,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE;YACtD,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,WAAW,EACX,eAAe,EAAE,EACjB;gBACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;YACF,OAAO,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,CAAC;KACF;CACF,CAAC"}

package/dist/admin-backend/document/load-documents.queries.js CHANGED Viewed

@@ -1,9 +1,11 @@
+import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
 import { ApiError } from "@paroicms/public-server-lib";
 import { type } from "arktype";
 const DocumentRowAT = type({
     nodeId: "number",
     language: "string",
     ready: "number",
+    updatedAt: "string|number|Date",
     title: "string|null",
     slug: "string|null",
     metaDescription: "string|null",
@@ -13,6 +15,7 @@ const DocumentRowAT = type({
     nodeId: String(data.nodeId),
     language: data.language,
     ready: Boolean(data.ready),
+    updatedAt: parseSqliteDateTime(data.updatedAt),
     title: data.title ?? undefined,
     slug: data.slug ?? undefined,
     metaDescription: data.metaDescription ?? undefined,
@@ -24,7 +27,7 @@ export async function document({ cn }, documentId) {
         "l.nodeId": "d.nodeId",
         "l.language": "d.language",
     })
-        .select("d.nodeId", "d.language", "l.ready", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords")
+        .select("d.nodeId", "d.language", "l.ready", "l.updatedAt", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords")
         .where({
         "d.nodeId": documentId.nodeId,
         "d.language": documentId.language,

package/dist/admin-backend/document/load-documents.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/load-documents.queries.ts"],"names":[],"mappings":"~~AACA~~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"}
1	+ {"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/load-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAS/B,MAAM,aAAa,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,oBAAoB;IAC/B,KAAK,EAAE,aAAa;IACpB,IAAI,EAAE,aAAa;IACnB,eAAe,EAAE,aAAa;IAC9B,YAAY,EAAE,aAAa;IAC3B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;IAC1B,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC;IAC9C,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;IAC9B,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,SAAS;IAC5B,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,SAAS;IAClD,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,SAAS;CAC7C,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,EAAE,EAAE,EAAe,EACnB,UAAyB;IAEzB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC;SACzC,SAAS,CAAC,cAAc,EAAE;QACzB,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,YAAY;KAC3B,CAAC;SACD,MAAM,CACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,aAAa,EACb,SAAS,EACT,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,CACjB;SACA,KAAK,CAAC;QACL,UAAU,EAAE,UAAU,CAAC,MAAM;QAC7B,YAAY,EAAE,UAAU,CAAC,QAAQ;KAClC,CAAC;SACD,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,OAAO,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,EAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAwB,EAAE,EAAiB;IAC/E,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/B,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,aAAa;IACpB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;CAC/B,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAE,EAAE,EAAe,EACnB,EAAE,QAAQ,EAAE,MAAM,EAAiB;IAEnC,MAAM,IAAI,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC;SACxC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC;SAC/B,QAAQ,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAC/C,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;CAC7B,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAoC,EACpC,EAAE,QAAQ,EAAE,MAAM,EAAiB;IAEnC,MAAM,GAAG,GAAoB,MAAM,WAAW;SAC3C,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC,mBAAmB,CAAC;SAC3B,SAAS,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC;SAC7C,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,YAAY,CAAC;SAChD,SAAS,CAAC,eAAe,EAAE,WAAW,EAAE,OAAO,CAAC;SAChD,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC;SACrB,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;SAChC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;SACjC,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,aAAa;IACjB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,WAAoC,EACpC,MAAc;IAEd,MAAM,GAAG,GAAoB,MAAM,WAAW;SAC3C,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC,kBAAkB,CAAC;SAC1B,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC;SACrB,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,GAAG,CAAC,CAAC;IAEpE,OAAO,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,SAAS,CAAC;AACrD,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,QAAQ;IACpB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;CAC7B,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmD,EACnD,OAAiD;IAEjD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;IACxE,MAAM,IAAI,GAAU,MAAM,WAAW;SAClC,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC;SAClC,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;SAC7B,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;SAChC,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO;YACL,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,MAAM,EAAE,SAAS,CAAC,QAAQ;SAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/admin-backend/event-log/event-log.types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { InteractiveLoginMethod } from "../auth/auth.types.js";
-export type EventLogEntry = DocumentCreatedEventLogEntry | DocumentUpdatedEventLogEntry | DocumentDeletedEventLogEntry | PartMovedEventLogEntry | AccountCreatedEventLogEntry | AccountUpdatedEventLogEntry | AccountDeletedEventLogEntry | AccountLoginEventLogEntry | AccountLoginMethodChangedEventLogEntry | AccountDeactivatedEventLogEntry | MediaCreatedEventLogEntry | MediaUpdatedEventLogEntry | MediaDeletedEventLogEntry;
+export type EventLogEntry = DocumentCreatedEventLogEntry | DocumentUpdatedEventLogEntry | DocumentDeletedEventLogEntry | DocumentMovedEventLogEntry | PartMovedEventLogEntry | AccountCreatedEventLogEntry | AccountUpdatedEventLogEntry | AccountDeletedEventLogEntry | AccountLoginEventLogEntry | AccountLoginMethodChangedEventLogEntry | AccountDeactivatedEventLogEntry | MediaCreatedEventLogEntry | MediaUpdatedEventLogEntry | MediaDeletedEventLogEntry;
 export interface EventLogEntryBase {
     actorId?: string;
     targetId: string;
@@ -38,6 +38,19 @@ export interface DocumentDeletedEventData {
     title?: string;
     language: string;
 }
+export interface DocumentMovedEventLogEntry extends EventLogEntryBase {
+    eventType: "document.move";
+    targetType: "document";
+    eventData: DocumentMovedEventData;
+}
+export interface DocumentMovedEventData {
+    documentNodeId: string;
+    typeName: string;
+    title?: string;
+    language: string;
+    oldParentNodeId: string;
+    newParentNodeId: string;
+}
 export interface PartMovedEventLogEntry extends EventLogEntryBase {
     eventType: "part.move";
     targetType: "documentNode";

package/dist/admin-backend/fields/fields.resolver.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { GqlResolvers } from "../../graphql/generated-graphql-types.d.ts";
 import { type GraphqlContext } from "../../graphql/graphql.types.js";
 export declare const fieldResolvers: GqlResolvers<GraphqlContext>;
-export declare const extendLNodeWrapWithFieldValuesResolvers: GqlResolvers<GraphqlContext>;
+export declare const extendDocumentWithFieldValuesResolvers: GqlResolvers<GraphqlContext>;
 export declare const extendPartWithFieldValuesResolver: GqlResolvers<GraphqlContext>;

package/dist/admin-backend/fields/fields.resolver.js CHANGED Viewed

@@ -71,8 +71,8 @@ export const fieldResolvers = {
         },
     },
 };
-export const extendLNodeWrapWithFieldValuesResolvers = {
-    LNodeWrap: {
+export const extendDocumentWithFieldValuesResolvers = {
+    Document: {
         fieldValues: async ({ nodeId, language }, { preprocess, fieldNames }, { siteContext }) => {
             siteReadyGuard(siteContext);
             const typeName = await getTypeNameOf(siteContext, nodeId);

package/dist/admin-backend/fields/fields.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/fields.resolver.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AAErF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;~~AAElE~~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~~uCAAuC~~,GAAiC;~~IACnF~~,~~SAAS~~,EAAE;~~QACT~~,WAAW,EAAE,KAAK,EAChB,EAAE,MAAM,EAAE,QAAQ,~~EAAiB~~,~~EACnC~~,EAAE,UAAU,EAAE,UAAU,EAAE,EAC1B,EAAE,WAAW,EAAE,EACf,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,MAAM,kBAAkB,CAAC,WAAW,EAAE;gBAC3C,QAAQ;gBACR,MAAM;gBACN,QAAQ;gBACR,UAAU,EAAE,UAAU,IAAI,SAAS;gBACnC,UAAU,EAAE,wBAAwB,CAAC,UAAU,CAAC;aACjD,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAiC;IAC7E,IAAI,EAAE;QACJ,WAAW,EAAE,KAAK,EAChB,EAAE,MAAM,EAAE,QAAQ,EAAY,EAC9B,EAAE,UAAU,EAAE,UAAU,EAAE,EAC1B,EAAE,WAAW,EAAE,EACf,EAAE;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,MAAM,kBAAkB,CAAC,WAAW,EAAE;gBAC3C,QAAQ;gBACR,MAAM;gBACN,QAAQ;gBACR,UAAU,EAAE,UAAU,IAAI,SAAS;gBACnC,UAAU,EAAE,wBAAwB,CAAC,UAAU,CAAC;aACjD,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC;AAEF,KAAK,UAAU,kBAAkB,CAC/B,WAAwB,EACxB,OAMC;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACvE,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,EAAE;QACnD,QAAQ;QACR,UAAU;KACX,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;QAChD,MAAM;QACN,QAAQ;QACR,UAAU;QACV,aAAa,EAAE,KAAK;QACpB,UAAU;KACX,CAAC,CAAC;IACH,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,0BAA0B,CAAC,MAAe;IACjD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,wBAAwB,CAC/B,UAAkD;IAElD,OAAO,UAAU;QACf,CAAC,CAAC,EAAE,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,IAAI,SAAS,EAAE;QACpE,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/fields.resolver.ts"],"names":[],"mappings":"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"}

package/dist/admin-backend/lnode/{lnode-wrap.resolver.d.ts → document-list.resolver.d.ts} RENAMED Viewed

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

package/dist/admin-backend/lnode/{lnode-wrap.resolver.js → document-list.resolver.js} RENAMED Viewed

@@ -4,23 +4,18 @@ import { type } from "arktype";
 import { siteReadyGuard } from "../../graphql/graphql.types.js";
 import { permissionGuard } from "../auth/authorization.helper.js";
 import { formatGqlOrderBy } from "./lnode-wrap.formatters.js";
-import { findOneLNode, getBreadcrumb, getChildDocuments, getLNodeWraps, getParentLanguages, searchDocuments, setLNodeReady, } from "./lnode.queries.js";
+import { getBreadcrumb, getChildDocuments, getDocuments, getParentLanguages, searchDocuments, setLNodeReady, } from "./lnode.queries.js";
+import { searchRedirectLNodes } from "./redirect-lnode.queries.js";
 const LNodeLanguageRowAT = type({
     language: "string",
     "+": "reject",
 });
-export const lNodeWrapResolvers = {
+export const documentListResolvers = {
     Query: {
-        lNodeWrap: async (_parent, { lNodeId }, { siteContext, httpContext }) => {
+        pagedChildDocuments: async (_parent, { parentDocumentId, offset, limit, sorting, missingInLanguage }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             await permissionGuard(siteContext, httpContext, "document.edit");
-            const parsedLNodeId = parseLNodeId(lNodeId);
-            return await findOneLNode(siteContext, parsedLNodeId);
-        },
-        pagedChildDocuments: async (_parent, { parentLNodeId, offset, limit, sorting, missingInLanguage }, { siteContext, httpContext }) => {
-            siteReadyGuard(siteContext);
-            await permissionGuard(siteContext, httpContext, "document.edit");
-            const parentId = parseLNodeId(parentLNodeId);
+            const parentId = parseLNodeId(parentDocumentId);
             const result = await getChildDocuments(siteContext, {
                 parentNodeId: parentId.nodeId,
                 language: parentId.language,
@@ -45,13 +40,16 @@ export const lNodeWrapResolvers = {
                 sorting: sorting ? formatGqlOrderBy(sorting) : undefined,
             });
         },
-        lNodeWraps: async (_parent, { parentLNodeId }, { siteContext, httpContext }) => {
+        searchRedirectLNodes: async (_parent, { language, queryString, offset, limit }, { siteContext, httpContext }) => {
+            siteReadyGuard(siteContext);
+            await permissionGuard(siteContext, httpContext, "document.edit");
+            return await searchRedirectLNodes(siteContext, { language, queryString, offset, limit });
+        },
+        documents: async (_parent, { parentDocumentId }, { siteContext, httpContext }) => {
             siteReadyGuard(siteContext);
             await permissionGuard(siteContext, httpContext, "document.edit");
-            const parentId = parseLNodeId(parentLNodeId);
-            return (await getLNodeWraps(siteContext, {
-                parentId,
-            })).lNodeWraps;
+            const parentId = parseLNodeId(parentDocumentId);
+            return (await getDocuments(siteContext, { parentId })).documents;
         },
     },
     Mutation: {
@@ -66,7 +64,7 @@ export const lNodeWrapResolvers = {
             return true;
         },
     },
-    LNodeWrap: {
+    Document: {
         translatedInto: async ({ nodeId }, _args, { siteContext }) => {
             siteReadyGuard(siteContext);
             const lNodes = await siteContext
@@ -102,10 +100,10 @@ export const lNodeWrapResolvers = {
                 language: item.documentId.language,
                 nodeId: item.documentId.nodeId,
                 typeName: item.typeName,
-                lNodeId: encodeLNodeId(item.documentId),
+                documentId: encodeLNodeId(item.documentId),
                 title: item.title,
             }));
         },
     },
 };
-//# sourceMappingURL=lnode-wrap.resolver.js.map
+//# sourceMappingURL=document-list.resolver.js.map

package/dist/admin-backend/lnode/document-list.resolver.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"document-list.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/lnode/document-list.resolver.ts"],"names":[],"mappings":"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"}

package/dist/admin-backend/lnode/lnode.queries.d.ts CHANGED Viewed

@@ -1,22 +1,15 @@
 import type { Tracker } from "@paroicms/internal-server-lib";
-import type { ScSortRule } from "@paroicms/public-anywhere-lib";
-import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
+import type { ParsedLNodeId, ScSortRule } from "@paroicms/public-anywhere-lib";
 import type { Knex } from "knex";
+import { type DocumentSeed } from "../../common/data-format.js";
 import type { SiteContext } from "../../site-context/site-context.types.js";
-export interface LNodeWrapSeed {
-    lNodeId: string;
-    nodeId: string;
-    language: string;
-    ready: boolean;
-    updatedAt: Date;
-}
 export interface PagedDocumentsSeed {
-    items: LNodeWrapSeed[];
+    items: DocumentSeed[];
     offset: number;
     total: number;
 }
-export declare function findOneLNode({ cn }: SiteContext, lNodeId: ParsedLNodeId): Promise<LNodeWrapSeed>;
-export declare function getLNodeWraps(siteContext: Pick<SiteContext, "cn" | "siteSchema">, { parentId, pagination, sorting, }: {
+export declare function findOneDocumentSeed({ cn }: SiteContext, lNodeId: ParsedLNodeId): Promise<DocumentSeed>;
+export declare function getDocuments(siteContext: Pick<SiteContext, "cn" | "siteSchema">, { parentId, pagination, sorting, }: {
     parentId: ParsedLNodeId;
     pagination?: {
         offset: number;
@@ -25,7 +18,7 @@ export declare function getLNodeWraps(siteContext: Pick<SiteContext, "cn" | "sit
     sorting?: ScSortRule[];
 }): Promise<{
     total?: number;
-    lNodeWraps: LNodeWrapSeed[];
+    documents: DocumentSeed[];
 }>;
 export interface PaginationOptions {
     offset: number;
@@ -66,5 +59,5 @@ export declare function getChildDocuments(siteContext: Pick<SiteContext, "cn" |
     sorting?: ScSortRule[];
 }): Promise<{
     total: number;
-    items: LNodeWrapSeed[];
+    items: DocumentSeed[];
 }>;