@payloadcms/plugin-nested-docs 3.19.0 → 3.20.0-canary.260f830

package/dist/hooks/resaveChildren.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resaveChildren.d.ts","sourceRoot":"","sources":["../../src/hooks/resaveChildren.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,gBAAgB,EAIjB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AA4EzD,eAAO,MAAM,cAAc,iBACV,sBAAsB,cAAc,gBAAgB,KAAG,yBAqBrE,CAAA"}
+{"version":3,"file":"resaveChildren.d.ts","sourceRoot":"","sources":["../../src/hooks/resaveChildren.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,gBAAgB,EAIjB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAuGzD,eAAO,MAAM,cAAc,iBACV,sBAAsB,cAAc,gBAAgB,KAAG,yBAWrE,CAAA"}

package/dist/hooks/resaveChildren.js

@@ -2,46 +2,78 @@ import { APIError } from 'payload';
 import { populateBreadcrumbs } from '../utilities/populateBreadcrumbs.js';
 const resave = async ({ collection, doc, draft, pluginConfig, req })=>{
     const parentSlug = pluginConfig?.parentFieldSlug || 'parent';
-    const parentDocIsPublished = doc._status === 'published';
-    const children = await req.payload.find({
-        collection: collection.slug,
-        depth: 0,
-        draft: true,
-        limit: 0,
-        locale: req.locale,
-        req,
-        where: {
-            [parentSlug]: {
-                equals: doc.id
-            }
-        }
-    });
     const breadcrumbSlug = pluginConfig.breadcrumbsFieldSlug || 'breadcrumbs';
-    try {
-        for (const child of children.docs){
-            const childIsPublished = typeof collection.versions === 'object' && collection.versions.drafts && child._status === 'published';
-            if (!parentDocIsPublished && childIsPublished) {
-                continue;
+    if (draft) {
+        // If the parent is a draft, don't resave children
+        return;
+    } else {
+        const initialDraftChildren = await req.payload.find({
+            collection: collection.slug,
+            depth: 0,
+            draft: true,
+            limit: 0,
+            locale: req.locale,
+            req,
+            where: {
+                [parentSlug]: {
+                    equals: doc.id
+                }
             }
-            await req.payload.update({
-                id: child.id,
-                collection: collection.slug,
-                data: {
-                    ...child,
-                    [breadcrumbSlug]: await populateBreadcrumbs(req, pluginConfig, collection, child)
-                },
-                depth: 0,
-                draft: !childIsPublished,
-                locale: req.locale,
-                req
+        });
+        const draftChildren = initialDraftChildren.docs.filter((child)=>child._status === 'draft');
+        const publishedChildren = await req.payload.find({
+            collection: collection.slug,
+            depth: 0,
+            draft: false,
+            limit: 0,
+            locale: req.locale,
+            req,
+            where: {
+                [parentSlug]: {
+                    equals: doc.id
+                }
+            }
+        });
+        const childrenById = [
+            ...draftChildren,
+            ...publishedChildren.docs
+        ].reduce((acc, child)=>{
+            acc[child.id] = acc[child.id] || [];
+            acc[child.id].push(child);
+            return acc;
+        }, {});
+        const sortedChildren = Object.values(childrenById).flatMap((group)=>{
+            return group.sort((a, b)=>{
+                if (a.updatedAt !== b.updatedAt) {
+                    return a.updatedAt > b.updatedAt ? 1 : -1;
+                }
+                return a._status === 'published' ? 1 : -1;
             });
-        }
-    } catch (err) {
-        req.payload.logger.error(`Nested Docs plugin has had an error while re-saving a child document${draft ? ' as draft' : ' as published'}.`);
-        req.payload.logger.error(err);
-        // Use type assertion until we can use instanceof reliably with our Error types
-        if (err?.name === 'ValidationError' && err?.data?.errors?.length) {
-            throw new APIError('Could not publish or save changes: One or more children are invalid.', 400);
+        });
+        if (sortedChildren) {
+            try {
+                for (const child of sortedChildren){
+                    const isDraft = child._status !== 'published';
+                    await req.payload.update({
+                        id: child.id,
+                        collection: collection.slug,
+                        data: {
+                            ...child,
+                            [breadcrumbSlug]: await populateBreadcrumbs(req, pluginConfig, collection, child)
+                        },
+                        depth: 0,
+                        draft: isDraft,
+                        locale: req.locale,
+                        req
+                    });
+                }
+            } catch (err) {
+                req.payload.logger.error(`Nested Docs plugin encountered an error while re-saving a child document.`);
+                req.payload.logger.error(err);
+                if (err?.name === 'ValidationError' && err?.data?.errors?.length) {
+                    throw new APIError('Could not publish or save changes: One or more children are invalid.', 400);
+                }
+            }
         }
     }
 };
@@ -49,19 +81,10 @@ export const resaveChildren = (pluginConfig, collection)=>async ({ doc, req })=>
         await resave({
             collection,
             doc,
-            draft: true,
+            draft: doc._status === 'published' ? false : true,
             pluginConfig,
             req
         });
-        if (doc._status === 'published') {
-            await resave({
-                collection,
-                doc,
-                draft: false,
-                pluginConfig,
-                req
-            });
-        }
         return undefined;
     };
 

package/dist/hooks/resaveChildren.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/resaveChildren.ts"],"sourcesContent":["import type {\n  CollectionAfterChangeHook,\n  CollectionConfig,\n  JsonObject,\n  PayloadRequest,\n  ValidationError,\n} from 'payload'\n\nimport { APIError } from 'payload'\n\nimport type { NestedDocsPluginConfig } from '../types.js'\n\nimport { populateBreadcrumbs } from '../utilities/populateBreadcrumbs.js'\n\ntype ResaveArgs = {\n  collection: CollectionConfig\n  doc: JsonObject\n  draft: boolean\n  pluginConfig: NestedDocsPluginConfig\n  req: PayloadRequest\n}\n\nconst resave = async ({ collection, doc, draft, pluginConfig, req }: ResaveArgs) => {\n  const parentSlug = pluginConfig?.parentFieldSlug || 'parent'\n  const parentDocIsPublished = doc._status === 'published'\n  const children = await req.payload.find({\n    collection: collection.slug,\n    depth: 0,\n    draft: true,\n    limit: 0,\n    locale: req.locale,\n    req,\n    where: {\n      [parentSlug]: {\n        equals: doc.id,\n      },\n    },\n  })\n\n  const breadcrumbSlug = pluginConfig.breadcrumbsFieldSlug || 'breadcrumbs'\n\n  try {\n    for (const child of children.docs) {\n      const childIsPublished =\n        typeof collection.versions === 'object' &&\n        collection.versions.drafts &&\n        child._status === 'published'\n\n      if (!parentDocIsPublished && childIsPublished) {\n        continue\n      }\n\n      await req.payload.update({\n        id: child.id,\n        collection: collection.slug,\n        data: {\n          ...child,\n          [breadcrumbSlug]: await populateBreadcrumbs(req, pluginConfig, collection, child),\n        },\n        depth: 0,\n        draft: !childIsPublished,\n        locale: req.locale,\n        req,\n      })\n    }\n  } catch (err: unknown) {\n    req.payload.logger.error(\n      `Nested Docs plugin has had an error while re-saving a child document${\n        draft ? ' as draft' : ' as published'\n      }.`,\n    )\n    req.payload.logger.error(err)\n\n    // Use type assertion until we can use instanceof reliably with our Error types\n    if (\n      (err as ValidationError)?.name === 'ValidationError' &&\n      (err as ValidationError)?.data?.errors?.length\n    ) {\n      throw new APIError(\n        'Could not publish or save changes: One or more children are invalid.',\n        400,\n      )\n    }\n  }\n}\n\nexport const resaveChildren =\n  (pluginConfig: NestedDocsPluginConfig, collection: CollectionConfig): CollectionAfterChangeHook =>\n  async ({ doc, req }) => {\n    await resave({\n      collection,\n      doc,\n      draft: true,\n      pluginConfig,\n      req,\n    })\n\n    if (doc._status === 'published') {\n      await resave({\n        collection,\n        doc,\n        draft: false,\n        pluginConfig,\n        req,\n      })\n    }\n\n    return undefined\n  }\n"],"names":["APIError","populateBreadcrumbs","resave","collection","doc","draft","pluginConfig","req","parentSlug","parentFieldSlug","parentDocIsPublished","_status","children","payload","find","slug","depth","limit","locale","where","equals","id","breadcrumbSlug","breadcrumbsFieldSlug","child","docs","childIsPublished","versions","drafts","update","data","err","logger","error","name","errors","length","resaveChildren","undefined"],"mappings":"AAQA,SAASA,QAAQ,QAAQ,UAAS;AAIlC,SAASC,mBAAmB,QAAQ,sCAAqC;AAUzE,MAAMC,SAAS,OAAO,EAAEC,UAAU,EAAEC,GAAG,EAAEC,KAAK,EAAEC,YAAY,EAAEC,GAAG,EAAc;IAC7E,MAAMC,aAAaF,cAAcG,mBAAmB;IACpD,MAAMC,uBAAuBN,IAAIO,OAAO,KAAK;IAC7C,MAAMC,WAAW,MAAML,IAAIM,OAAO,CAACC,IAAI,CAAC;QACtCX,YAAYA,WAAWY,IAAI;QAC3BC,OAAO;QACPX,OAAO;QACPY,OAAO;QACPC,QAAQX,IAAIW,MAAM;QAClBX;QACAY,OAAO;YACL,CAACX,WAAW,EAAE;gBACZY,QAAQhB,IAAIiB,EAAE;YAChB;QACF;IACF;IAEA,MAAMC,iBAAiBhB,aAAaiB,oBAAoB,IAAI;IAE5D,IAAI;QACF,KAAK,MAAMC,SAASZ,SAASa,IAAI,CAAE;YACjC,MAAMC,mBACJ,OAAOvB,WAAWwB,QAAQ,KAAK,YAC/BxB,WAAWwB,QAAQ,CAACC,MAAM,IAC1BJ,MAAMb,OAAO,KAAK;YAEpB,IAAI,CAACD,wBAAwBgB,kBAAkB;gBAC7C;YACF;YAEA,MAAMnB,IAAIM,OAAO,CAACgB,MAAM,CAAC;gBACvBR,IAAIG,MAAMH,EAAE;gBACZlB,YAAYA,WAAWY,IAAI;gBAC3Be,MAAM;oBACJ,GAAGN,KAAK;oBACR,CAACF,eAAe,EAAE,MAAMrB,oBAAoBM,KAAKD,cAAcH,YAAYqB;gBAC7E;gBACAR,OAAO;gBACPX,OAAO,CAACqB;gBACRR,QAAQX,IAAIW,MAAM;gBAClBX;YACF;QACF;IACF,EAAE,OAAOwB,KAAc;QACrBxB,IAAIM,OAAO,CAACmB,MAAM,CAACC,KAAK,CACtB,CAAC,oEAAoE,EACnE5B,QAAQ,cAAc,gBACvB,CAAC,CAAC;QAELE,IAAIM,OAAO,CAACmB,MAAM,CAACC,KAAK,CAACF;QAEzB,+EAA+E;QAC/E,IACE,AAACA,KAAyBG,SAAS,qBAClCH,KAAyBD,MAAMK,QAAQC,QACxC;YACA,MAAM,IAAIpC,SACR,wEACA;QAEJ;IACF;AACF;AAEA,OAAO,MAAMqC,iBACX,CAAC/B,cAAsCH,aACvC,OAAO,EAAEC,GAAG,EAAEG,GAAG,EAAE;QACjB,MAAML,OAAO;YACXC;YACAC;YACAC,OAAO;YACPC;YACAC;QACF;QAEA,IAAIH,IAAIO,OAAO,KAAK,aAAa;YAC/B,MAAMT,OAAO;gBACXC;gBACAC;gBACAC,OAAO;gBACPC;gBACAC;YACF;QACF;QAEA,OAAO+B;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/resaveChildren.ts"],"sourcesContent":["import type {\n  CollectionAfterChangeHook,\n  CollectionConfig,\n  JsonObject,\n  PayloadRequest,\n  ValidationError,\n} from 'payload'\n\nimport { APIError } from 'payload'\n\nimport type { NestedDocsPluginConfig } from '../types.js'\n\nimport { populateBreadcrumbs } from '../utilities/populateBreadcrumbs.js'\n\ntype ResaveArgs = {\n  collection: CollectionConfig\n  doc: JsonObject\n  draft: boolean\n  pluginConfig: NestedDocsPluginConfig\n  req: PayloadRequest\n}\n\nconst resave = async ({ collection, doc, draft, pluginConfig, req }: ResaveArgs) => {\n  const parentSlug = pluginConfig?.parentFieldSlug || 'parent'\n  const breadcrumbSlug = pluginConfig.breadcrumbsFieldSlug || 'breadcrumbs'\n\n  if (draft) {\n    // If the parent is a draft, don't resave children\n    return\n  } else {\n    const initialDraftChildren = await req.payload.find({\n      collection: collection.slug,\n      depth: 0,\n      draft: true,\n      limit: 0,\n      locale: req.locale,\n      req,\n      where: {\n        [parentSlug]: {\n          equals: doc.id,\n        },\n      },\n    })\n\n    const draftChildren = initialDraftChildren.docs.filter((child) => child._status === 'draft')\n\n    const publishedChildren = await req.payload.find({\n      collection: collection.slug,\n      depth: 0,\n      draft: false,\n      limit: 0,\n      locale: req.locale,\n      req,\n      where: {\n        [parentSlug]: {\n          equals: doc.id,\n        },\n      },\n    })\n\n    const childrenById = [...draftChildren, ...publishedChildren.docs].reduce((acc, child) => {\n      acc[child.id] = acc[child.id] || []\n      acc[child.id].push(child)\n      return acc\n    }, {})\n\n    const sortedChildren = Object.values(childrenById).flatMap((group: JsonObject[]) => {\n      return group.sort((a, b) => {\n        if (a.updatedAt !== b.updatedAt) {\n          return a.updatedAt > b.updatedAt ? 1 : -1\n        }\n        return a._status === 'published' ? 1 : -1\n      })\n    })\n\n    if (sortedChildren) {\n      try {\n        for (const child of sortedChildren) {\n          const isDraft = child._status !== 'published'\n\n          await req.payload.update({\n            id: child.id,\n            collection: collection.slug,\n            data: {\n              ...child,\n              [breadcrumbSlug]: await populateBreadcrumbs(req, pluginConfig, collection, child),\n            },\n            depth: 0,\n            draft: isDraft,\n            locale: req.locale,\n            req,\n          })\n        }\n      } catch (err: unknown) {\n        req.payload.logger.error(\n          `Nested Docs plugin encountered an error while re-saving a child document.`,\n        )\n        req.payload.logger.error(err)\n\n        if (\n          (err as ValidationError)?.name === 'ValidationError' &&\n          (err as ValidationError)?.data?.errors?.length\n        ) {\n          throw new APIError(\n            'Could not publish or save changes: One or more children are invalid.',\n            400,\n          )\n        }\n      }\n    }\n  }\n}\n\nexport const resaveChildren =\n  (pluginConfig: NestedDocsPluginConfig, collection: CollectionConfig): CollectionAfterChangeHook =>\n  async ({ doc, req }) => {\n    await resave({\n      collection,\n      doc,\n      draft: doc._status === 'published' ? false : true,\n      pluginConfig,\n      req,\n    })\n\n    return undefined\n  }\n"],"names":["APIError","populateBreadcrumbs","resave","collection","doc","draft","pluginConfig","req","parentSlug","parentFieldSlug","breadcrumbSlug","breadcrumbsFieldSlug","initialDraftChildren","payload","find","slug","depth","limit","locale","where","equals","id","draftChildren","docs","filter","child","_status","publishedChildren","childrenById","reduce","acc","push","sortedChildren","Object","values","flatMap","group","sort","a","b","updatedAt","isDraft","update","data","err","logger","error","name","errors","length","resaveChildren","undefined"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-nested-docs",
-  "version": "3.19.0",
+  "version": "3.20.0-canary.260f830",
   "description": "The official Nested Docs plugin for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,10 +37,10 @@
   ],
   "devDependencies": {
     "@payloadcms/eslint-config": "3.9.0",
-    "payload": "3.19.0"
+    "payload": "3.20.0-canary.260f830"
   },
   "peerDependencies": {
-    "payload": "3.19.0"
+    "payload": "3.20.0-canary.260f830"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"