chore: merge from 2.0

packages/db-postgres/src/transform/write/index.ts

@@ -1,7 +1,9 @@
 /* eslint-disable no-param-reassign */
-import { Field } from 'payload/types';
-import { traverseFields } from './traverseFields';
-import { RowToInsert } from './types';
+import type { Field } from 'payload/types'
+
+import type { RowToInsert } from './types'
+
+import { traverseFields } from './traverseFields'
 
 type Args = {
   data: Record<string, unknown>
@@ -22,9 +24,8 @@ export const transformForWrite = ({
     row: {},
     locales: {},
     relationships: [],
-    blocks: {},
-    arrays: {},
-  };
+    row: {},
+  }
 
   // This function is responsible for building up the
   // above rowToInsert
@@ -40,7 +41,7 @@ export const transformForWrite = ({
     path,
     relationships: rowToInsert.relationships,
     row: rowToInsert.row,
-  });
+  })
 
-  return rowToInsert;
-};
+  return rowToInsert
+}

packages/db-postgres/src/transform/write/traverseFields.ts

@@ -159,7 +159,7 @@ export const traverseFields = ({
             path: `${path || ''}${field.name}.`,
             relationships,
             row,
-          });
+          })
         }
       }
 
@@ -320,5 +320,5 @@ export const traverseFields = ({
         }
       });
     }
-  });
-};
+  })
+}

packages/db-postgres/src/transform/write/types.ts

@@ -7,6 +7,9 @@ export type ArrayRowToInsert = {
   arrays: {
     [tableName: string]: ArrayRowToInsert[]
   }
+  columnName: string
+  locale: Record<string, unknown>
+  row: Record<string, unknown>
 }
 
 export type BlockRowToInsert = {
@@ -17,6 +20,8 @@ export type BlockRowToInsert = {
   arrays: {
     [tableName: string]: ArrayRowToInsert[]
   }
+  locale: Record<string, unknown>
+  row: Record<string, unknown>
 }
 
 export type RowToInsert = {
@@ -31,4 +36,10 @@ export type RowToInsert = {
   arrays: {
     [tableName: string]: ArrayRowToInsert[]
   }
+  blocks: {
+    [blockType: string]: BlockRowToInsert[]
+  }
+  locale: Record<string, unknown>
+  relationships: Record<string, unknown>[]
+  row: Record<string, unknown>
 }