fix: potential solution for #756

Author: jmikrut

src/fields/hooks/beforeChange/index.ts

@@ -32,7 +32,7 @@ export const beforeChange = async ({
   const mergeLocaleActions = [];
   const errors: { message: string, field: string }[] = [];
 
-  traverseFields({
+  await traverseFields({
     data,
     doc,
     docWithLocales,
@@ -41,7 +41,6 @@ export const beforeChange = async ({
     operation,
     path: '',
     mergeLocaleActions,
-    promises,
     req,
     siblingData: data,
     siblingDoc: doc,

src/fields/hooks/beforeChange/promise.ts

@@ -17,7 +17,6 @@ type Args = {
   mergeLocaleActions: (() => void)[]
   operation: Operation
   path: string
-  promises: Promise<void>[]
   req: PayloadRequest
   siblingData: Record<string, unknown>
   siblingDoc: Record<string, unknown>
@@ -44,7 +43,6 @@ export const promise = async ({
   mergeLocaleActions,
   operation,
   path,
-  promises,
   req,
   siblingData,
   siblingDoc,
@@ -171,15 +169,11 @@ export const promise = async ({
     }
 
     case 'group': {
-      let groupData = siblingData[field.name] as Record<string, unknown>;
-      let groupDoc = siblingDoc[field.name] as Record<string, unknown>;
-      let groupDocWithLocales = siblingDocWithLocales[field.name] as Record<string, unknown>;
+      if (typeof siblingData[field.name] !== 'object') siblingData[field.name] = {};
+      if (typeof siblingDoc[field.name] !== 'object') siblingDoc[field.name] = {};
+      if (typeof siblingDocWithLocales[field.name] !== 'object') siblingDocWithLocales[field.name] = {};
 
-      if (typeof siblingData[field.name] !== 'object') groupData = {};
-      if (typeof siblingDoc[field.name] !== 'object') groupDoc = {};
-      if (typeof siblingDocWithLocales[field.name] !== 'object') groupDocWithLocales = {};
-
-      traverseFields({
+      await traverseFields({
         data,
         doc,
         docWithLocales,
@@ -189,11 +183,10 @@ export const promise = async ({
         mergeLocaleActions,
         operation,
         path: `${path}${field.name}.`,
-        promises,
         req,
-        siblingData: groupData,
-        siblingDoc: groupDoc,
-        siblingDocWithLocales: groupDocWithLocales,
+        siblingData: siblingData[field.name] as Record<string, unknown>,
+        siblingDoc: siblingDoc[field.name] as Record<string, unknown>,
+        siblingDocWithLocales: siblingDocWithLocales[field.name] as Record<string, unknown>,
         skipValidation: skipValidationFromHere,
       });
 
@@ -203,9 +196,11 @@ export const promise = async ({
     case 'array': {
       const rows = siblingData[field.name];
 
+      const promises = [];
+
       if (Array.isArray(rows)) {
         rows.forEach((row, i) => {
-          traverseFields({
+          promises.push(traverseFields({
             data,
             doc,
             docWithLocales,
@@ -215,27 +210,31 @@ export const promise = async ({
             mergeLocaleActions,
             operation,
             path: `${path}${field.name}.${i}.`,
-            promises,
             req,
             siblingData: row,
             siblingDoc: getExistingRowDoc(row, siblingDoc[field.name]?.[i]),
             siblingDocWithLocales: getExistingRowDoc(row, siblingDocWithLocales[field.name]?.[i]),
             skipValidation: skipValidationFromHere,
-          });
+          }));
         });
       }
+
+      await Promise.all(promises);
+
       break;
     }
 
     case 'blocks': {
       const rows = siblingData[field.name];
 
+      const promises = [];
+
       if (Array.isArray(rows)) {
         rows.forEach((row, i) => {
           const block = field.blocks.find((blockType) => blockType.slug === row.blockType);
 
           if (block) {
-            traverseFields({
+            promises.push(traverseFields({
               data,
               doc,
               docWithLocales,
@@ -245,23 +244,25 @@ export const promise = async ({
               mergeLocaleActions,
               operation,
               path: `${path}${field.name}.${i}.`,
-              promises,
               req,
               siblingData: row,
               siblingDoc: getExistingRowDoc(row, siblingDoc[field.name]?.[i]),
               siblingDocWithLocales: getExistingRowDoc(row, siblingDocWithLocales[field.name]?.[i]),
               skipValidation: skipValidationFromHere,
-            });
+            }));
           }
         });
       }
 
+      await Promise.all(promises);
+
       break;
     }
 
     case 'row':
     case 'collapsible': {
-      traverseFields({
+      const promises = [];
+      promises.push(traverseFields({
         data,
         doc,
         docWithLocales,
@@ -271,20 +272,22 @@ export const promise = async ({
         mergeLocaleActions,
         operation,
         path,
-        promises,
         req,
         siblingData,
         siblingDoc,
         siblingDocWithLocales,
         skipValidation: skipValidationFromHere,
-      });
+      }));
+
+      await Promise.all(promises);
 
       break;
     }
 
     case 'tabs': {
+      const promises = [];
       field.tabs.forEach((tab) => {
-        traverseFields({
+        promises.push(traverseFields({
           data,
           doc,
           docWithLocales,
@@ -294,14 +297,16 @@ export const promise = async ({
           mergeLocaleActions,
           operation,
           path,
-          promises,
           req,
           siblingData,
           siblingDoc,
           siblingDocWithLocales,
           skipValidation: skipValidationFromHere,
-        });
+        }));
       });
+
+      await Promise.all(promises);
+
       break;
     }
 

src/fields/hooks/beforeChange/traverseFields.ts

@@ -13,15 +13,14 @@ type Args = {
   mergeLocaleActions: (() => void)[]
   operation: Operation
   path: string
-  promises: Promise<void>[]
   req: PayloadRequest
   siblingData: Record<string, unknown>
   siblingDoc: Record<string, unknown>
   siblingDocWithLocales: Record<string, unknown>
   skipValidation?: boolean
 }
 
-export const traverseFields = ({
+export const traverseFields = async ({
   data,
   doc,
   docWithLocales,
@@ -31,13 +30,14 @@ export const traverseFields = ({
   mergeLocaleActions,
   operation,
   path,
-  promises,
   req,
   siblingData,
   siblingDoc,
   siblingDocWithLocales,
   skipValidation,
-}: Args): void => {
+}: Args): Promise<void> => {
+  const promises = [];
+
   fields.forEach((field) => {
     promises.push(promise({
       data,
@@ -49,12 +49,13 @@ export const traverseFields = ({
       mergeLocaleActions,
       operation,
       path,
-      promises,
       req,
       siblingData,
       siblingDoc,
       siblingDocWithLocales,
       skipValidation,
     }));
   });
+
+  await Promise.all(promises);
 };

test/fields/int.spec.ts

@@ -89,7 +89,7 @@ describe('Fields', () => {
       });
     });
 
-    it.skip('should create with ids and nested ids', async () => {
+    it('should create with ids and nested ids', async () => {
       const docWithIDs = await payload.create<GroupField>({
         collection: groupFieldsSlug,
         data: groupDoc,