perf: remove deepCopying in sanitizeJoinQuery, optimize flattenWhereToOperators (#10663)

Author: AlessioGr

packages/payload/src/database/flattenWhereToOperators.ts

@@ -1,18 +1,21 @@
 import type { Where, WhereField } from '../types/index.js'
 
-// Take a where query and flatten it to all top-level operators
-const flattenWhereToOperators = (query: Where): WhereField[] =>
-  Object.entries(query).reduce((flattenedConstraints, [key, val]) => {
-    if ((key === 'and' || key === 'or') && Array.isArray(val)) {
-      return [
-        ...flattenedConstraints,
-        ...val.reduce((subVals, subVal) => {
-          return [...subVals, ...flattenWhereToOperators(subVal)]
-        }, []),
-      ]
-    }
+/**
+ * Take a where query and flatten it to all top-level operators
+ */
+export function flattenWhereToOperators(query: Where): WhereField[] {
+  const result: WhereField[] = []
 
-    return [...flattenedConstraints, val]
-  }, [])
+  for (const [key, value] of Object.entries(query)) {
+    if ((key === 'and' || key === 'or') && Array.isArray(value)) {
+      for (const subQuery of value) {
+        const flattenedSub = flattenWhereToOperators(subQuery)
+        result.push(...flattenedSub)
+      }
+    } else {
+      result.push(value as WhereField)
+    }
+  }
 
-export default flattenWhereToOperators
+  return result
+}

packages/payload/src/database/queryValidation/validateQueryPaths.ts

@@ -26,18 +26,21 @@ type Args = {
     }
 )
 
-const flattenWhere = (query: Where): WhereField[] =>
-  Object.entries(query).reduce((flattenedConstraints, [key, val]) => {
+const flattenWhere = (query: Where): WhereField[] => {
+  const flattenedConstraints: WhereField[] = []
+
+  for (const [key, val] of Object.entries(query)) {
     if ((key === 'and' || key === 'or') && Array.isArray(val)) {
-      const subWhereConstraints: Where[] = val.reduce((acc, subVal) => {
-        const subWhere = flattenWhere(subVal)
-        return [...acc, ...subWhere]
-      }, [])
-      return [...flattenedConstraints, ...subWhereConstraints]
+      for (const subVal of val) {
+        flattenedConstraints.push(...flattenWhere(subVal))
+      }
+    } else {
+      flattenedConstraints.push({ [key]: val })
     }
+  }
 
-    return [...flattenedConstraints, { [key]: val }]
-  }, [])
+  return flattenedConstraints
+}
 
 export async function validateQueryPaths({
   collectionConfig,

packages/payload/src/database/sanitizeJoinQuery.ts

@@ -74,7 +74,7 @@ export const sanitizeJoinQuery = async ({
           overrideAccess,
           req,
           // incoming where input, but we shouldn't validate generated from the access control.
-          where: deepCopyObjectSimple(joinQuery.where),
+          where: joinQuery.where,
         }),
       )
 

packages/payload/src/index.ts

@@ -1038,7 +1038,7 @@ export type * from './config/types.js'
 export { combineQueries } from './database/combineQueries.js'
 export { createDatabaseAdapter } from './database/createDatabaseAdapter.js'
 export { defaultBeginTransaction } from './database/defaultBeginTransaction.js'
-export { default as flattenWhereToOperators } from './database/flattenWhereToOperators.js'
+export { flattenWhereToOperators } from './database/flattenWhereToOperators.js'
 export { getLocalizedPaths } from './database/getLocalizedPaths.js'
 export { createMigration } from './database/migrations/createMigration.js'
 export { getMigrations } from './database/migrations/getMigrations.js'