fix: await field hooks recursively

Author: DanRibbens

src/fields/hooks/afterChange/index.ts

@@ -19,22 +19,17 @@ export const afterChange = async ({
   operation,
   req,
 }: Args): Promise<Record<string, unknown>> => {
-  const promises = [];
-
   const doc = deepCopyObject(incomingDoc);
 
-  traverseFields({
+  await traverseFields({
     data,
     doc,
     fields: entityConfig.fields,
     operation,
-    promises,
     req,
     siblingDoc: doc,
     siblingData: data,
   });
 
-  await Promise.all(promises);
-
   return doc;
 };

src/fields/hooks/afterChange/promise.ts

@@ -8,7 +8,6 @@ type Args = {
   doc: Record<string, unknown>
   field: Field
   operation: 'create' | 'update'
-  promises: Promise<void>[]
   req: PayloadRequest
   siblingData: Record<string, unknown>
   siblingDoc: Record<string, unknown>
@@ -22,7 +21,6 @@ export const promise = async ({
   doc,
   field,
   operation,
-  promises,
   req,
   siblingData,
   siblingDoc,
@@ -52,12 +50,11 @@ export const promise = async ({
   // Traverse subfields
   switch (field.type) {
     case 'group': {
-      traverseFields({
+      await traverseFields({
         data,
         doc,
         fields: field.fields,
         operation,
-        promises,
         req,
         siblingData: siblingData[field.name] as Record<string, unknown> || {},
         siblingDoc: siblingDoc[field.name] as Record<string, unknown>,
@@ -70,18 +67,19 @@ export const promise = async ({
       const rows = siblingDoc[field.name];
 
       if (Array.isArray(rows)) {
+        const promises = [];
         rows.forEach((row, i) => {
-          traverseFields({
+          promises.push(traverseFields({
             data,
             doc,
             fields: field.fields,
             operation,
-            promises,
             req,
             siblingData: siblingData[field.name]?.[i] || {},
             siblingDoc: { ...row } || {},
-          });
+          }));
         });
+        await Promise.all(promises);
       }
       break;
     }
@@ -90,35 +88,35 @@ export const promise = async ({
       const rows = siblingDoc[field.name];
 
       if (Array.isArray(rows)) {
+        const promises = [];
         rows.forEach((row, i) => {
           const block = field.blocks.find((blockType) => blockType.slug === row.blockType);
 
           if (block) {
-            traverseFields({
+            promises.push(traverseFields({
               data,
               doc,
               fields: block.fields,
               operation,
-              promises,
               req,
               siblingData: siblingData[field.name]?.[i] || {},
               siblingDoc: { ...row } || {},
-            });
+            }));
           }
         });
+        await Promise.all(promises);
       }
 
       break;
     }
 
     case 'row':
     case 'collapsible': {
-      traverseFields({
+      await traverseFields({
         data,
         doc,
         fields: field.fields,
         operation,
-        promises,
         req,
         siblingData: siblingData || {},
         siblingDoc: { ...siblingDoc },
@@ -128,18 +126,19 @@ export const promise = async ({
     }
 
     case 'tabs': {
+      const promises = [];
       field.tabs.forEach((tab) => {
-        traverseFields({
+        promises.push(traverseFields({
           data,
           doc,
           fields: tab.fields,
           operation,
-          promises,
           req,
           siblingData: siblingData || {},
           siblingDoc: { ...siblingDoc },
-        });
+        }));
       });
+      await Promise.all(promises);
       break;
     }
 

src/fields/hooks/afterChange/traverseFields.ts

@@ -7,32 +7,33 @@ type Args = {
   doc: Record<string, unknown>
   fields: Field[]
   operation: 'create' | 'update'
-  promises: Promise<void>[]
   req: PayloadRequest
   siblingData: Record<string, unknown>
   siblingDoc: Record<string, unknown>
 }
 
-export const traverseFields = ({
+export const traverseFields = async ({
   data,
   doc,
   fields,
   operation,
-  promises,
   req,
   siblingData,
   siblingDoc,
-}: Args): void => {
+}: Args): Promise<void> => {
+  const promises = [];
+
   fields.forEach((field) => {
     promises.push(promise({
       data,
       doc,
       field,
       operation,
-      promises,
       req,
       siblingData,
       siblingDoc,
     }));
   });
+
+  await Promise.all(promises);
 };

src/fields/hooks/beforeChange/index.ts

@@ -28,7 +28,6 @@ export const beforeChange = async ({
   skipValidation,
 }: Args): Promise<Record<string, unknown>> => {
   const data = deepCopyObject(incomingData);
-  const promises = [];
   const mergeLocaleActions = [];
   const errors: { message: string, field: string }[] = [];
 
@@ -49,8 +48,6 @@ export const beforeChange = async ({
     skipValidation,
   });
 
-  await Promise.all(promises);
-
   if (errors.length > 0) {
     throw new ValidationError(errors);
   }

src/fields/hooks/beforeChange/promise.ts

@@ -196,9 +196,8 @@ export const promise = async ({
     case 'array': {
       const rows = siblingData[field.name];
 
-      const promises = [];
-
       if (Array.isArray(rows)) {
+        const promises = [];
         rows.forEach((row, i) => {
           promises.push(traverseFields({
             data,
@@ -217,19 +216,19 @@ export const promise = async ({
             skipValidation: skipValidationFromHere,
           }));
         });
+
+        await Promise.all(promises);
       }
 
-      await Promise.all(promises);
 
       break;
     }
 
     case 'blocks': {
       const rows = siblingData[field.name];
 
-      const promises = [];
-
       if (Array.isArray(rows)) {
+        const promises = [];
         rows.forEach((row, i) => {
           const block = field.blocks.find((blockType) => blockType.slug === row.blockType);
 
@@ -252,17 +251,17 @@ export const promise = async ({
             }));
           }
         });
+
+        await Promise.all(promises);
       }
 
-      await Promise.all(promises);
 
       break;
     }
 
     case 'row':
     case 'collapsible': {
-      const promises = [];
-      promises.push(traverseFields({
+      await traverseFields({
         data,
         doc,
         docWithLocales,
@@ -277,9 +276,7 @@ export const promise = async ({
         siblingDoc,
         siblingDocWithLocales,
         skipValidation: skipValidationFromHere,
-      }));
-
-      await Promise.all(promises);
+      });
 
       break;
     }

src/fields/hooks/beforeValidate/index.ts

@@ -23,23 +23,19 @@ export const beforeValidate = async ({
   overrideAccess,
   req,
 }: Args): Promise<Record<string, unknown>> => {
-  const promises = [];
   const data = deepCopyObject(incomingData);
 
-  traverseFields({
+  await traverseFields({
     data,
     doc,
     fields: entityConfig.fields,
     id,
     operation,
     overrideAccess,
-    promises,
     req,
     siblingData: data,
     siblingDoc: doc,
   });
 
-  await Promise.all(promises);
-
   return data;
 };