@payloadcms/drizzle 3.91.0-internal.c1569dc → 4.0.0-beta.1

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2025 Payload CMS, Inc. <info@payloadcms.com>
+Copyright (c) 2018-2026 Payload CMS, LLC <info@payloadcms.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/dist/exports/postgres.d.ts

@@ -9,7 +9,11 @@ export { dropDatabase } from '../postgres/dropDatabase.js';
 export { execute } from '../postgres/execute.js';
 export { init } from '../postgres/init.js';
 export { insert } from '../postgres/insert.js';
+export { migratePostgresLocalizeStatus } from '../postgres/predefinedMigrations/localize-status/index.js';
+export { migratePostgresSizesToVariants } from '../postgres/predefinedMigrations/sizes-to-variants/index.js';
 export { migratePostgresV2toV3 } from '../postgres/predefinedMigrations/v2-v3/index.js';
+export { assertOperatorHandlerExtensionsInstalled } from '../postgres/query/assertOperatorHandlerExtensionsInstalled.js';
+export { postgresUnaccent } from '../postgres/query/postgresUnaccent.js';
 export { requireDrizzleKit } from '../postgres/requireDrizzleKit.js';
 export { geometryColumn } from '../postgres/schema/geometryColumn.js';
 export * from '../postgres/types.js';

package/dist/exports/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/exports/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/exports/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,2DAA2D,CAAA;AACzG,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAA;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AACvF,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAA;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,cAAc,sBAAsB,CAAA"}

package/dist/exports/postgres.js

@@ -9,7 +9,11 @@ export { dropDatabase } from '../postgres/dropDatabase.js';
 export { execute } from '../postgres/execute.js';
 export { init } from '../postgres/init.js';
 export { insert } from '../postgres/insert.js';
+export { migratePostgresLocalizeStatus } from '../postgres/predefinedMigrations/localize-status/index.js';
+export { migratePostgresSizesToVariants } from '../postgres/predefinedMigrations/sizes-to-variants/index.js';
 export { migratePostgresV2toV3 } from '../postgres/predefinedMigrations/v2-v3/index.js';
+export { assertOperatorHandlerExtensionsInstalled } from '../postgres/query/assertOperatorHandlerExtensionsInstalled.js';
+export { postgresUnaccent } from '../postgres/query/postgresUnaccent.js';
 export { requireDrizzleKit } from '../postgres/requireDrizzleKit.js';
 export { geometryColumn } from '../postgres/schema/geometryColumn.js';
 export * from '../postgres/types.js';

package/dist/exports/postgres.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/postgres.ts"],"sourcesContent":["export { columnToCodeConverter } from '../postgres/columnToCodeConverter.js'\nexport { countDistinct } from '../postgres/countDistinct.js'\nexport { createDatabase } from '../postgres/createDatabase.js'\nexport { createExtensions } from '../postgres/createExtensions.js'\nexport { createJSONQuery } from '../postgres/createJSONQuery/index.js'\nexport { defaultDrizzleSnapshot } from '../postgres/defaultSnapshot.js'\nexport { deleteWhere } from '../postgres/deleteWhere.js'\nexport { dropDatabase } from '../postgres/dropDatabase.js'\nexport { execute } from '../postgres/execute.js'\nexport { init } from '../postgres/init.js'\nexport { insert } from '../postgres/insert.js'\nexport { migratePostgresV2toV3 } from '../postgres/predefinedMigrations/v2-v3/index.js'\nexport { requireDrizzleKit } from '../postgres/requireDrizzleKit.js'\nexport { geometryColumn } from '../postgres/schema/geometryColumn.js'\nexport * from '../postgres/types.js'\n"],"names":["columnToCodeConverter","countDistinct","createDatabase","createExtensions","createJSONQuery","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","init","insert","migratePostgresV2toV3","requireDrizzleKit","geometryColumn"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,uCAAsC;AAC5E,SAASC,aAAa,QAAQ,+BAA8B;AAC5D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,kCAAiC;AAClE,SAASC,eAAe,QAAQ,uCAAsC;AACtE,SAASC,sBAAsB,QAAQ,iCAAgC;AACvE,SAASC,WAAW,QAAQ,6BAA4B;AACxD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,OAAO,QAAQ,yBAAwB;AAChD,SAASC,IAAI,QAAQ,sBAAqB;AAC1C,SAASC,MAAM,QAAQ,wBAAuB;AAC9C,SAASC,qBAAqB,QAAQ,kDAAiD;AACvF,SAASC,iBAAiB,QAAQ,mCAAkC;AACpE,SAASC,cAAc,QAAQ,uCAAsC;AACrE,cAAc,uBAAsB"}
+{"version":3,"sources":["../../src/exports/postgres.ts"],"sourcesContent":["export { columnToCodeConverter } from '../postgres/columnToCodeConverter.js'\nexport { countDistinct } from '../postgres/countDistinct.js'\nexport { createDatabase } from '../postgres/createDatabase.js'\nexport { createExtensions } from '../postgres/createExtensions.js'\nexport { createJSONQuery } from '../postgres/createJSONQuery/index.js'\nexport { defaultDrizzleSnapshot } from '../postgres/defaultSnapshot.js'\nexport { deleteWhere } from '../postgres/deleteWhere.js'\nexport { dropDatabase } from '../postgres/dropDatabase.js'\nexport { execute } from '../postgres/execute.js'\nexport { init } from '../postgres/init.js'\nexport { insert } from '../postgres/insert.js'\nexport { migratePostgresLocalizeStatus } from '../postgres/predefinedMigrations/localize-status/index.js'\nexport { migratePostgresSizesToVariants } from '../postgres/predefinedMigrations/sizes-to-variants/index.js'\nexport { migratePostgresV2toV3 } from '../postgres/predefinedMigrations/v2-v3/index.js'\nexport { assertOperatorHandlerExtensionsInstalled } from '../postgres/query/assertOperatorHandlerExtensionsInstalled.js'\nexport { postgresUnaccent } from '../postgres/query/postgresUnaccent.js'\nexport { requireDrizzleKit } from '../postgres/requireDrizzleKit.js'\nexport { geometryColumn } from '../postgres/schema/geometryColumn.js'\nexport * from '../postgres/types.js'\n"],"names":["columnToCodeConverter","countDistinct","createDatabase","createExtensions","createJSONQuery","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","init","insert","migratePostgresLocalizeStatus","migratePostgresSizesToVariants","migratePostgresV2toV3","assertOperatorHandlerExtensionsInstalled","postgresUnaccent","requireDrizzleKit","geometryColumn"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,uCAAsC;AAC5E,SAASC,aAAa,QAAQ,+BAA8B;AAC5D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,kCAAiC;AAClE,SAASC,eAAe,QAAQ,uCAAsC;AACtE,SAASC,sBAAsB,QAAQ,iCAAgC;AACvE,SAASC,WAAW,QAAQ,6BAA4B;AACxD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,OAAO,QAAQ,yBAAwB;AAChD,SAASC,IAAI,QAAQ,sBAAqB;AAC1C,SAASC,MAAM,QAAQ,wBAAuB;AAC9C,SAASC,6BAA6B,QAAQ,4DAA2D;AACzG,SAASC,8BAA8B,QAAQ,8DAA6D;AAC5G,SAASC,qBAAqB,QAAQ,kDAAiD;AACvF,SAASC,wCAAwC,QAAQ,gEAA+D;AACxH,SAASC,gBAAgB,QAAQ,wCAAuC;AACxE,SAASC,iBAAiB,QAAQ,mCAAkC;AACpE,SAASC,cAAc,QAAQ,uCAAsC;AACrE,cAAc,uBAAsB"}

package/dist/exports/sqlite.d.ts

@@ -8,6 +8,8 @@ export { dropDatabase } from '../sqlite/dropDatabase.js';
 export { execute } from '../sqlite/execute.js';
 export { init } from '../sqlite/init.js';
 export { insert } from '../sqlite/insert.js';
+export { migrateSqliteLocalizeStatus } from '../sqlite/predefinedMigrations/localize-status/index.js';
+export { migrateSqliteSizesToVariants } from '../sqlite/predefinedMigrations/sizes-to-variants/index.js';
 export { requireDrizzleKit } from '../sqlite/requireDrizzleKit.js';
 export * from '../sqlite/types.js';
 //# sourceMappingURL=sqlite.d.ts.map

package/dist/exports/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/exports/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAA;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/exports/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAA;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,2BAA2B,EAAE,MAAM,yDAAyD,CAAA;AACrG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2DAA2D,CAAA;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,cAAc,oBAAoB,CAAA"}

package/dist/exports/sqlite.js

@@ -8,6 +8,8 @@ export { dropDatabase } from '../sqlite/dropDatabase.js';
 export { execute } from '../sqlite/execute.js';
 export { init } from '../sqlite/init.js';
 export { insert } from '../sqlite/insert.js';
+export { migrateSqliteLocalizeStatus } from '../sqlite/predefinedMigrations/localize-status/index.js';
+export { migrateSqliteSizesToVariants } from '../sqlite/predefinedMigrations/sizes-to-variants/index.js';
 export { requireDrizzleKit } from '../sqlite/requireDrizzleKit.js';
 export * from '../sqlite/types.js';
 

package/dist/exports/sqlite.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/sqlite.ts"],"sourcesContent":["export { columnToCodeConverter } from '../sqlite/columnToCodeConverter.js'\nexport { countDistinct } from '../sqlite/countDistinct.js'\nexport { convertPathToJSONTraversal } from '../sqlite/createJSONQuery/convertPathToJSONTraversal.js'\nexport { createJSONQuery } from '../sqlite/createJSONQuery/index.js'\nexport { defaultDrizzleSnapshot } from '../sqlite/defaultSnapshot.js'\nexport { deleteWhere } from '../sqlite/deleteWhere.js'\nexport { dropDatabase } from '../sqlite/dropDatabase.js'\nexport { execute } from '../sqlite/execute.js'\nexport { init } from '../sqlite/init.js'\nexport { insert } from '../sqlite/insert.js'\nexport { requireDrizzleKit } from '../sqlite/requireDrizzleKit.js'\nexport * from '../sqlite/types.js'\n"],"names":["columnToCodeConverter","countDistinct","convertPathToJSONTraversal","createJSONQuery","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","init","insert","requireDrizzleKit"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,qCAAoC;AAC1E,SAASC,aAAa,QAAQ,6BAA4B;AAC1D,SAASC,0BAA0B,QAAQ,0DAAyD;AACpG,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,sBAAsB,QAAQ,+BAA8B;AACrE,SAASC,WAAW,QAAQ,2BAA0B;AACtD,SAASC,YAAY,QAAQ,4BAA2B;AACxD,SAASC,OAAO,QAAQ,uBAAsB;AAC9C,SAASC,IAAI,QAAQ,oBAAmB;AACxC,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,iBAAiB,QAAQ,iCAAgC;AAClE,cAAc,qBAAoB"}
+{"version":3,"sources":["../../src/exports/sqlite.ts"],"sourcesContent":["export { columnToCodeConverter } from '../sqlite/columnToCodeConverter.js'\nexport { countDistinct } from '../sqlite/countDistinct.js'\nexport { convertPathToJSONTraversal } from '../sqlite/createJSONQuery/convertPathToJSONTraversal.js'\nexport { createJSONQuery } from '../sqlite/createJSONQuery/index.js'\nexport { defaultDrizzleSnapshot } from '../sqlite/defaultSnapshot.js'\nexport { deleteWhere } from '../sqlite/deleteWhere.js'\nexport { dropDatabase } from '../sqlite/dropDatabase.js'\nexport { execute } from '../sqlite/execute.js'\nexport { init } from '../sqlite/init.js'\nexport { insert } from '../sqlite/insert.js'\nexport { migrateSqliteLocalizeStatus } from '../sqlite/predefinedMigrations/localize-status/index.js'\nexport { migrateSqliteSizesToVariants } from '../sqlite/predefinedMigrations/sizes-to-variants/index.js'\nexport { requireDrizzleKit } from '../sqlite/requireDrizzleKit.js'\nexport * from '../sqlite/types.js'\n"],"names":["columnToCodeConverter","countDistinct","convertPathToJSONTraversal","createJSONQuery","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","init","insert","migrateSqliteLocalizeStatus","migrateSqliteSizesToVariants","requireDrizzleKit"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,qCAAoC;AAC1E,SAASC,aAAa,QAAQ,6BAA4B;AAC1D,SAASC,0BAA0B,QAAQ,0DAAyD;AACpG,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,sBAAsB,QAAQ,+BAA8B;AACrE,SAASC,WAAW,QAAQ,2BAA0B;AACtD,SAASC,YAAY,QAAQ,4BAA2B;AACxD,SAASC,OAAO,QAAQ,uBAAsB;AAC9C,SAASC,IAAI,QAAQ,oBAAmB;AACxC,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,2BAA2B,QAAQ,0DAAyD;AACrG,SAASC,4BAA4B,QAAQ,4DAA2D;AACxG,SAASC,iBAAiB,QAAQ,iCAAgC;AAClE,cAAc,qBAAoB"}

package/dist/find/buildPolymorphicJoinQuery.d.ts

@@ -6,6 +6,7 @@ type BuildPolymorphicJoinQueryArgs = {
     currentTableName: string;
     field: FlattenedJoinField;
     limit: number;
+    locale?: string;
     page?: number;
     path: string;
     shouldCount: boolean;
@@ -32,6 +33,6 @@ type PolymorphicJoinQuery = {
  * @throws If the join definition, target collection, mapped table, required columns, or sort shape
  * cannot be represented by the polymorphic query.
  */
-export declare const buildPolymorphicJoinQuery: ({ adapter, currentTableName, field, limit, page, path, shouldCount, sort, where, }: BuildPolymorphicJoinQueryArgs) => PolymorphicJoinQuery;
+export declare const buildPolymorphicJoinQuery: ({ adapter, currentTableName, field, limit, locale, page, path, shouldCount, sort, where, }: BuildPolymorphicJoinQueryArgs) => PolymorphicJoinQuery;
 export {};
 //# sourceMappingURL=buildPolymorphicJoinQuery.d.ts.map

package/dist/find/buildPolymorphicJoinQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPolymorphicJoinQuery.d.ts","sourceRoot":"","sources":["../../src/find/buildPolymorphicJoinQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAKtC,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAA;AAG7D,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAA;AAO/D,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,EAAE,kBAAkB,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACnB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAA;CACvB,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,yBAAyB,uFAUnC,6BAA6B,KAAG,oBA4HlC,CAAA"}
+{"version":3,"file":"buildPolymorphicJoinQuery.d.ts","sourceRoot":"","sources":["../../src/find/buildPolymorphicJoinQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAKtC,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAA;AAG7D,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAA;AAO/D,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,EAAE,kBAAkB,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACnB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAA;CACvB,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,yBAAyB,+FAWnC,6BAA6B,KAAG,oBA6HlC,CAAA"}

package/dist/find/buildPolymorphicJoinQuery.js

@@ -17,7 +17,7 @@ import { createPolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan
  * `shouldCount` is true.
  * @throws If the join definition, target collection, mapped table, required columns, or sort shape
  * cannot be represented by the polymorphic query.
- */ export const buildPolymorphicJoinQuery = ({ adapter, currentTableName, field, limit, page, path, shouldCount, sort, where })=>{
+ */ export const buildPolymorphicJoinQuery = ({ adapter, currentTableName, field, limit, locale, page, path, shouldCount, sort, where })=>{
     if (!Array.isArray(field.collection)) {
         throw new Error('A polymorphic join requires a collection array');
     }
@@ -75,6 +75,7 @@ import { createPolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan
         const collectionWhere = where && Object.keys(where).length > 0 ? buildPolymorphicJoinWhere({
             adapter,
             collection,
+            locale,
             table,
             where,
             wherePlan

package/dist/find/buildPolymorphicJoinQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/buildPolymorphicJoinQuery.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { SQLiteSelect } from 'drizzle-orm/sqlite-core'\n\nimport { asc, count, desc, eq, sql } from 'drizzle-orm'\nimport { type FlattenedJoinField, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\nimport type { PolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan.js'\n\nimport { jsonAggBuildObject } from '../utilities/json.js'\nimport { buildPolymorphicJoinWhere } from './buildPolymorphicJoinWhere.js'\nimport { createPolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan.js'\n\ntype BuildPolymorphicJoinQueryArgs = {\n  adapter: DrizzleAdapter\n  currentTableName: string\n  field: FlattenedJoinField\n  limit: number\n  page?: number\n  path: string\n  shouldCount: boolean\n  sort?: string | string[]\n  where?: Where\n}\n\ntype PolymorphicJoinQuery = {\n  columnName: string\n  count?: SQL.Aliased\n  documents: SQL.Aliased\n}\n\n/**\n * Builds the correlated document and optional count projections for a join that targets multiple\n * collections. Every collection branch exposes the same `id`, parent, `relationTo`, and sort\n * columns before the branches are combined. A missing sort field resolves to SQL NULL so targets\n * with different schemas can still share one ordered union.\n *\n * `field.collection` must contain at least one configured collection. Each mapped table must have\n * an `id` column and the column named by `field.on`. The supplied `limit` is used as-is; callers can\n * include an extra look-ahead row when they calculate pagination.\n *\n * @returns The stable projection name, the document projection, and the count projection when\n * `shouldCount` is true.\n * @throws If the join definition, target collection, mapped table, required columns, or sort shape\n * cannot be represented by the polymorphic query.\n */\nexport const buildPolymorphicJoinQuery = ({\n  adapter,\n  currentTableName,\n  field,\n  limit,\n  page,\n  path,\n  shouldCount,\n  sort,\n  where,\n}: BuildPolymorphicJoinQueryArgs): PolymorphicJoinQuery => {\n  if (!Array.isArray(field.collection)) {\n    throw new Error('A polymorphic join requires a collection array')\n  }\n\n  if (field.collection.length === 0) {\n    throw new Error('A polymorphic join requires at least one collection')\n  }\n\n  if (Array.isArray(sort)) {\n    throw new Error('Polymorphic joins do not support multiple sort fields')\n  }\n\n  const collections = field.collection\n  const columnName = `${path.replaceAll('.', '_')}${field.name}`\n  const db = adapter.drizzle as LibSQLDatabase\n  const onPath = field.on.split('.').join('_')\n  const collectionTables = collections.map((collection) => {\n    if (!adapter.payload.collections[collection]) {\n      throw new Error(`Unknown polymorphic join collection \"${collection}\"`)\n    }\n\n    const tableName = adapter.tableNameMap.get(toSnakeCase(collection))\n    const table = tableName ? (adapter.tables[tableName] as GenericTable | undefined) : undefined\n\n    if (!table) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no database table`)\n    }\n\n    if (!table['id']) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no \"id\" column`)\n    }\n\n    if (!table[onPath]) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no \"${onPath}\" column`)\n    }\n\n    return { collection, table }\n  })\n  const sortField = getSortField({ adapter, collections, sort })\n  const sortOrder = sortField.startsWith('-') ? desc : asc\n  const sortPath = sortField.replace('-', '').split('.').join('_')\n  const wherePlan: PolymorphicJoinWherePlan = where\n    ? createPolymorphicJoinWherePlan({ adapter, collections, where })\n    : new Map()\n  let unionQuery: null | SQLiteSelect = null\n\n  for (const { collection, table } of collectionTables) {\n    const sortColumn = table[sortPath]\n    const selectFields = {\n      id: table['id'],\n      parent: sql`${table[onPath]}`.as(onPath),\n      relationTo: sql`${collection}`.as('relationTo'),\n      sortPath: sql`${sortColumn ?? null}`.as('sortPath'),\n    }\n    const collectionWhere =\n      where && Object.keys(where).length > 0\n        ? buildPolymorphicJoinWhere({\n            adapter,\n            collection,\n            table,\n            where,\n            wherePlan,\n          })\n        : undefined\n    let collectionQuery = db.select(selectFields).from(table).$dynamic()\n\n    if (collectionWhere) {\n      collectionQuery = collectionQuery.where(collectionWhere)\n    }\n\n    if (unionQuery === null) {\n      unionQuery = collectionQuery as unknown as SQLiteSelect\n    } else {\n      unionQuery = unionQuery.unionAll(collectionQuery)\n    }\n  }\n\n  const subQueryAlias = `${columnName}_subquery`\n  const parentConstraint = eq(\n    sql.raw(`\"${currentTableName}\".\"id\"`),\n    sql.raw(`\"${subQueryAlias}\".\"${onPath}\"`),\n  )\n  const countExpression = shouldCount\n    ? sql`${db\n        .select({ count: count() })\n        .from(sql`${unionQuery.as(subQueryAlias)}`)\n        .where(parentConstraint)}`.as(`${columnName}_count`)\n    : undefined\n\n  unionQuery = unionQuery.orderBy(sortOrder(sql`\"sortPath\"`))\n\n  const sortedUnionAlias = `${columnName}_sorted`\n  let limitOffsetSQL = sql.empty()\n\n  if (limit) {\n    limitOffsetSQL = sql` LIMIT ${limit}`\n  }\n\n  if (page && limit !== 0) {\n    const offset = (page - 1) * limit\n\n    if (offset > 0) {\n      limitOffsetSQL = sql`${limitOffsetSQL} OFFSET ${offset}`\n    }\n  }\n\n  const parentWhere = sql.raw(`\"${sortedUnionAlias}\".\"${onPath}\" = \"${currentTableName}\".\"id\"`)\n  const documents = sql`(\n    SELECT ${jsonAggBuildObject(adapter, {\n      id: sql.raw(`\"${subQueryAlias}\".\"id\"`),\n      relationTo: sql.raw(`\"${subQueryAlias}\".\"relationTo\"`),\n    })}\n    FROM (\n      SELECT * FROM ${sql`${unionQuery.as(sortedUnionAlias)}`}\n      WHERE ${parentWhere}${limitOffsetSQL}\n    ) AS ${sql.raw(`\"${subQueryAlias}\"`)}\n  )`.as(columnName)\n\n  return {\n    columnName,\n    count: countExpression,\n    documents,\n  }\n}\n\nconst getSortField = ({\n  adapter,\n  collections,\n  sort,\n}: {\n  adapter: DrizzleAdapter\n  collections: string[]\n  sort?: string\n}): string => {\n  if (sort) {\n    return sort\n  }\n\n  const hasCreatedAt = collections.some((collection) =>\n    adapter.payload.collections[collection].config.fields.some(\n      (field) => field.type === 'date' && field.name === 'createdAt',\n    ),\n  )\n\n  return hasCreatedAt ? '-createdAt' : 'id'\n}\n"],"names":["asc","count","desc","eq","sql","toSnakeCase","jsonAggBuildObject","buildPolymorphicJoinWhere","createPolymorphicJoinWherePlan","buildPolymorphicJoinQuery","adapter","currentTableName","field","limit","page","path","shouldCount","sort","where","Array","isArray","collection","Error","length","collections","columnName","replaceAll","name","db","drizzle","onPath","on","split","join","collectionTables","map","payload","tableName","tableNameMap","get","table","tables","undefined","sortField","getSortField","sortOrder","startsWith","sortPath","replace","wherePlan","Map","unionQuery","sortColumn","selectFields","id","parent","as","relationTo","collectionWhere","Object","keys","collectionQuery","select","from","$dynamic","unionAll","subQueryAlias","parentConstraint","raw","countExpression","orderBy","sortedUnionAlias","limitOffsetSQL","empty","offset","parentWhere","documents","hasCreatedAt","some","config","fields","type"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/buildPolymorphicJoinQuery.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { SQLiteSelect } from 'drizzle-orm/sqlite-core'\n\nimport { asc, count, desc, eq, sql } from 'drizzle-orm'\nimport { type FlattenedJoinField, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\nimport type { PolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan.js'\n\nimport { jsonAggBuildObject } from '../utilities/json.js'\nimport { buildPolymorphicJoinWhere } from './buildPolymorphicJoinWhere.js'\nimport { createPolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan.js'\n\ntype BuildPolymorphicJoinQueryArgs = {\n  adapter: DrizzleAdapter\n  currentTableName: string\n  field: FlattenedJoinField\n  limit: number\n  locale?: string\n  page?: number\n  path: string\n  shouldCount: boolean\n  sort?: string | string[]\n  where?: Where\n}\n\ntype PolymorphicJoinQuery = {\n  columnName: string\n  count?: SQL.Aliased\n  documents: SQL.Aliased\n}\n\n/**\n * Builds the correlated document and optional count projections for a join that targets multiple\n * collections. Every collection branch exposes the same `id`, parent, `relationTo`, and sort\n * columns before the branches are combined. A missing sort field resolves to SQL NULL so targets\n * with different schemas can still share one ordered union.\n *\n * `field.collection` must contain at least one configured collection. Each mapped table must have\n * an `id` column and the column named by `field.on`. The supplied `limit` is used as-is; callers can\n * include an extra look-ahead row when they calculate pagination.\n *\n * @returns The stable projection name, the document projection, and the count projection when\n * `shouldCount` is true.\n * @throws If the join definition, target collection, mapped table, required columns, or sort shape\n * cannot be represented by the polymorphic query.\n */\nexport const buildPolymorphicJoinQuery = ({\n  adapter,\n  currentTableName,\n  field,\n  limit,\n  locale,\n  page,\n  path,\n  shouldCount,\n  sort,\n  where,\n}: BuildPolymorphicJoinQueryArgs): PolymorphicJoinQuery => {\n  if (!Array.isArray(field.collection)) {\n    throw new Error('A polymorphic join requires a collection array')\n  }\n\n  if (field.collection.length === 0) {\n    throw new Error('A polymorphic join requires at least one collection')\n  }\n\n  if (Array.isArray(sort)) {\n    throw new Error('Polymorphic joins do not support multiple sort fields')\n  }\n\n  const collections = field.collection\n  const columnName = `${path.replaceAll('.', '_')}${field.name}`\n  const db = adapter.drizzle as LibSQLDatabase\n  const onPath = field.on.split('.').join('_')\n  const collectionTables = collections.map((collection) => {\n    if (!adapter.payload.collections[collection]) {\n      throw new Error(`Unknown polymorphic join collection \"${collection}\"`)\n    }\n\n    const tableName = adapter.tableNameMap.get(toSnakeCase(collection))\n    const table = tableName ? (adapter.tables[tableName] as GenericTable | undefined) : undefined\n\n    if (!table) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no database table`)\n    }\n\n    if (!table['id']) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no \"id\" column`)\n    }\n\n    if (!table[onPath]) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no \"${onPath}\" column`)\n    }\n\n    return { collection, table }\n  })\n  const sortField = getSortField({ adapter, collections, sort })\n  const sortOrder = sortField.startsWith('-') ? desc : asc\n  const sortPath = sortField.replace('-', '').split('.').join('_')\n  const wherePlan: PolymorphicJoinWherePlan = where\n    ? createPolymorphicJoinWherePlan({ adapter, collections, where })\n    : new Map()\n  let unionQuery: null | SQLiteSelect = null\n\n  for (const { collection, table } of collectionTables) {\n    const sortColumn = table[sortPath]\n    const selectFields = {\n      id: table['id'],\n      parent: sql`${table[onPath]}`.as(onPath),\n      relationTo: sql`${collection}`.as('relationTo'),\n      sortPath: sql`${sortColumn ?? null}`.as('sortPath'),\n    }\n    const collectionWhere =\n      where && Object.keys(where).length > 0\n        ? buildPolymorphicJoinWhere({\n            adapter,\n            collection,\n            locale,\n            table,\n            where,\n            wherePlan,\n          })\n        : undefined\n    let collectionQuery = db.select(selectFields).from(table).$dynamic()\n\n    if (collectionWhere) {\n      collectionQuery = collectionQuery.where(collectionWhere)\n    }\n\n    if (unionQuery === null) {\n      unionQuery = collectionQuery as unknown as SQLiteSelect\n    } else {\n      unionQuery = unionQuery.unionAll(collectionQuery)\n    }\n  }\n\n  const subQueryAlias = `${columnName}_subquery`\n  const parentConstraint = eq(\n    sql.raw(`\"${currentTableName}\".\"id\"`),\n    sql.raw(`\"${subQueryAlias}\".\"${onPath}\"`),\n  )\n  const countExpression = shouldCount\n    ? sql`${db\n        .select({ count: count() })\n        .from(sql`${unionQuery.as(subQueryAlias)}`)\n        .where(parentConstraint)}`.as(`${columnName}_count`)\n    : undefined\n\n  unionQuery = unionQuery.orderBy(sortOrder(sql`\"sortPath\"`))\n\n  const sortedUnionAlias = `${columnName}_sorted`\n  let limitOffsetSQL = sql.empty()\n\n  if (limit) {\n    limitOffsetSQL = sql` LIMIT ${limit}`\n  }\n\n  if (page && limit !== 0) {\n    const offset = (page - 1) * limit\n\n    if (offset > 0) {\n      limitOffsetSQL = sql`${limitOffsetSQL} OFFSET ${offset}`\n    }\n  }\n\n  const parentWhere = sql.raw(`\"${sortedUnionAlias}\".\"${onPath}\" = \"${currentTableName}\".\"id\"`)\n  const documents = sql`(\n    SELECT ${jsonAggBuildObject(adapter, {\n      id: sql.raw(`\"${subQueryAlias}\".\"id\"`),\n      relationTo: sql.raw(`\"${subQueryAlias}\".\"relationTo\"`),\n    })}\n    FROM (\n      SELECT * FROM ${sql`${unionQuery.as(sortedUnionAlias)}`}\n      WHERE ${parentWhere}${limitOffsetSQL}\n    ) AS ${sql.raw(`\"${subQueryAlias}\"`)}\n  )`.as(columnName)\n\n  return {\n    columnName,\n    count: countExpression,\n    documents,\n  }\n}\n\nconst getSortField = ({\n  adapter,\n  collections,\n  sort,\n}: {\n  adapter: DrizzleAdapter\n  collections: string[]\n  sort?: string\n}): string => {\n  if (sort) {\n    return sort\n  }\n\n  const hasCreatedAt = collections.some((collection) =>\n    adapter.payload.collections[collection].config.fields.some(\n      (field) => field.type === 'date' && field.name === 'createdAt',\n    ),\n  )\n\n  return hasCreatedAt ? '-createdAt' : 'id'\n}\n"],"names":["asc","count","desc","eq","sql","toSnakeCase","jsonAggBuildObject","buildPolymorphicJoinWhere","createPolymorphicJoinWherePlan","buildPolymorphicJoinQuery","adapter","currentTableName","field","limit","locale","page","path","shouldCount","sort","where","Array","isArray","collection","Error","length","collections","columnName","replaceAll","name","db","drizzle","onPath","on","split","join","collectionTables","map","payload","tableName","tableNameMap","get","table","tables","undefined","sortField","getSortField","sortOrder","startsWith","sortPath","replace","wherePlan","Map","unionQuery","sortColumn","selectFields","id","parent","as","relationTo","collectionWhere","Object","keys","collectionQuery","select","from","$dynamic","unionAll","subQueryAlias","parentConstraint","raw","countExpression","orderBy","sortedUnionAlias","limitOffsetSQL","empty","offset","parentWhere","documents","hasCreatedAt","some","config","fields","type"],"mappings":"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"}

package/dist/find/buildPolymorphicJoinWhere.d.ts

@@ -5,6 +5,7 @@ import type { PolymorphicJoinWherePlan } from './createPolymorphicJoinWherePlan.
 type BuildPolymorphicJoinWhereArgs = {
     adapter: DrizzleAdapter;
     collection: string;
+    locale?: string;
     table: GenericTable;
     where: Where;
     wherePlan: PolymorphicJoinWherePlan;
@@ -14,6 +15,6 @@ type BuildPolymorphicJoinWhereArgs = {
  * that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current
  * collection slug.
  */
-export declare const buildPolymorphicJoinWhere: ({ adapter, collection, table, where, wherePlan, }: BuildPolymorphicJoinWhereArgs) => SQL | undefined;
+export declare const buildPolymorphicJoinWhere: ({ adapter, collection, locale, table, where, wherePlan, }: BuildPolymorphicJoinWhereArgs) => SQL | undefined;
 export {};
 //# sourceMappingURL=buildPolymorphicJoinWhere.d.ts.map

package/dist/find/buildPolymorphicJoinWhere.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPolymorphicJoinWhere.d.ts","sourceRoot":"","sources":["../../src/find/buildPolymorphicJoinWhere.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,GAAG,EAAE,MAAM,aAAa,CAAA;AAG9C,OAAO,EAAmC,KAAK,KAAK,EAAE,MAAM,SAAS,CAAA;AAGrE,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,qCAAqC,CAAA;AAM5C,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;IACZ,SAAS,EAAE,wBAAwB,CAAA;CACpC,CAAA;AAoBD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,sDAMnC,6BAA6B,KAAG,GAAG,GAAG,SA8KxC,CAAA"}
+{"version":3,"file":"buildPolymorphicJoinWhere.d.ts","sourceRoot":"","sources":["../../src/find/buildPolymorphicJoinWhere.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,GAAG,EAAE,MAAM,aAAa,CAAA;AAG9C,OAAO,EAAkD,KAAK,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpF,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,qCAAqC,CAAA;AAO5C,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;IACZ,SAAS,EAAE,wBAAwB,CAAA;CACpC,CAAA;AAqBD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,8DAOnC,6BAA6B,KAAG,GAAG,GAAG,SAsMxC,CAAA"}

package/dist/find/buildPolymorphicJoinWhere.js

@@ -1,6 +1,7 @@
 import { and, getTableName, isNotNull, isNull, or, sql } from 'drizzle-orm';
 import { QueryError } from 'payload';
 import toSnakeCase from 'to-snake-case';
+import { buildOperatorConstraint } from '../queries/buildOperatorConstraint.js';
 import { sanitizeQueryValue } from '../queries/sanitizeQueryValue.js';
 const supportedJSONQueryOperators = new Set([
     'contains',
@@ -13,7 +14,7 @@ const supportedJSONQueryOperators = new Set([
  * Builds a where clause for one collection before the polymorphic branches are combined. A field
  * that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current
  * collection slug.
- */ export const buildPolymorphicJoinWhere = ({ adapter, collection, table, where, wherePlan })=>{
+ */ export const buildPolymorphicJoinWhere = ({ adapter, collection, locale, table, where, wherePlan })=>{
     const constraints = [];
     for(const key in where){
         if ([
@@ -31,6 +32,7 @@ const supportedJSONQueryOperators = new Set([
             const nestedConstraints = where[key].map((nestedWhere)=>buildPolymorphicJoinWhere({
                     adapter,
                     collection,
+                    locale,
                     table,
                     where: nestedWhere,
                     wherePlan
@@ -74,7 +76,14 @@ const supportedJSONQueryOperators = new Set([
                     relationOrPath: key,
                     val: value
                 });
-                if (sanitizedQueryValue === null || sanitizedQueryValue.columns) {
+                if (sanitizedQueryValue === null) {
+                    throw new QueryError([
+                        {
+                            path: `${key}.${originalOperator}`
+                        }
+                    ]);
+                }
+                if (sanitizedQueryValue.columns) {
                     throw new QueryError([
                         {
                             path: `${key}.${originalOperator}`
@@ -108,7 +117,7 @@ const supportedJSONQueryOperators = new Set([
                 constraints.push(sql.raw(value));
                 continue;
             }
-            const { column, queryValueContext } = resolvedPath;
+            const { column, fieldContext, queryValueContext } = resolvedPath;
             if (payloadOperator === 'like' && (queryValueContext.field.type === 'number' || queryValueContext.field.type === 'relationship' || queryValueContext.field.type === 'upload' || queryValueContext.isUUID)) {
                 payloadOperator = 'equals';
             }
@@ -120,7 +129,14 @@ const supportedJSONQueryOperators = new Set([
                 relationOrPath: key,
                 val: value
             });
-            if (sanitizedQueryValue === null || sanitizedQueryValue.columns) {
+            if (sanitizedQueryValue === null) {
+                throw new QueryError([
+                    {
+                        path: `${key}.${originalOperator}`
+                    }
+                ]);
+            }
+            if (sanitizedQueryValue.columns) {
                 throw new QueryError([
                     {
                         path: `${key}.${originalOperator}`
@@ -136,7 +152,23 @@ const supportedJSONQueryOperators = new Set([
                     }
                 ]);
             }
-            const operator = adapter.operators[payloadOperator];
+            const resolvedOperator = payloadOperator;
+            const operator = adapter.operators[resolvedOperator];
+            const buildColumnConstraint = (constraintValue)=>{
+                if (!fieldContext) {
+                    return operator(column, constraintValue);
+                }
+                return buildOperatorConstraint({
+                    adapter,
+                    column,
+                    field: fieldContext.field,
+                    locale,
+                    originalOperator,
+                    path: key,
+                    resolvedOperator,
+                    value: constraintValue
+                });
+            };
             if (originalOperator === 'equals' && value === null) {
                 constraints.push(isNull(column));
                 continue;
@@ -145,7 +177,7 @@ const supportedJSONQueryOperators = new Set([
                 if (value === null) {
                     constraints.push(isNotNull(column));
                 } else {
-                    const notEqualsConstraint = or(isNull(column), operator(column, value));
+                    const notEqualsConstraint = or(isNull(column), buildColumnConstraint(value));
                     if (notEqualsConstraint) {
                         constraints.push(notEqualsConstraint);
                     }
@@ -154,22 +186,22 @@ const supportedJSONQueryOperators = new Set([
             }
             if (originalOperator === 'in' && Array.isArray(value) && value.includes(null)) {
                 const nonNullValues = value.filter((item)=>item !== null);
-                const inConstraint = nonNullValues.length ? operator(column, nonNullValues) : undefined;
-                const nullAwareInConstraint = inConstraint ? or(isNull(column), inConstraint) : isNull(column);
+                const inConstraint = buildColumnConstraint(nonNullValues);
+                const nullAwareInConstraint = or(isNull(column), inConstraint);
                 if (nullAwareInConstraint) {
                     constraints.push(nullAwareInConstraint);
                 }
                 continue;
             }
             if (payloadOperator === 'like' && typeof value === 'string') {
-                const wordConstraints = value.split(' ').map((word)=>operator(column, `%${word}%`));
+                const wordConstraints = value.split(' ').map((word)=>buildColumnConstraint(`%${word}%`));
                 const wordCondition = and(...wordConstraints);
                 if (wordCondition) {
                     constraints.push(wordCondition);
                 }
                 continue;
             }
-            constraints.push(operator(column, value));
+            constraints.push(buildColumnConstraint(value));
         }
     }
     return and(...constraints);
@@ -240,6 +272,7 @@ const resolveWherePath = ({ adapter, collection, schemaPath, table, wherePlan })
     return {
         type: 'scalar',
         column: fieldContext ? table[pathPlan.columnPath] : sql`null`,
+        fieldContext,
         pathPlan,
         queryValueContext
     };

package/dist/find/buildPolymorphicJoinWhere.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/buildPolymorphicJoinWhere.ts"],"sourcesContent":["import type { Column, SQL } from 'drizzle-orm'\n\nimport { and, getTableName, isNotNull, isNull, or, sql } from 'drizzle-orm'\nimport { type FlattenedField, QueryError, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\nimport type {\n  PolymorphicJoinWherePlan,\n  ScalarWhereField,\n  WherePathPlan,\n} from './createPolymorphicJoinWherePlan.js'\n\nimport { sanitizeQueryValue } from '../queries/sanitizeQueryValue.js'\n\nconst supportedJSONQueryOperators = new Set(['contains', 'equals', 'exists', 'in', 'like'])\n\ntype BuildPolymorphicJoinWhereArgs = {\n  adapter: DrizzleAdapter\n  collection: string\n  table: GenericTable\n  where: Where\n  wherePlan: PolymorphicJoinWherePlan\n}\n\ntype ResolvedWherePath =\n  | {\n      column: Column\n      pathPlan: WherePathPlan\n      queryValueContext: ScalarWhereField\n      type: 'scalar'\n    }\n  | {\n      fieldContext: FlattenedField\n      jsonExpression: string\n      pathPlan: WherePathPlan\n      type: 'hasManySelect'\n    }\n  | {\n      pathPlan: WherePathPlan\n      type: 'invalid'\n    }\n\n/**\n * Builds a where clause for one collection before the polymorphic branches are combined. A field\n * that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current\n * collection slug.\n */\nexport const buildPolymorphicJoinWhere = ({\n  adapter,\n  collection,\n  table,\n  where,\n  wherePlan,\n}: BuildPolymorphicJoinWhereArgs): SQL | undefined => {\n  const constraints: SQL[] = []\n\n  for (const key in where) {\n    if (['AND', 'OR'].includes(key.toUpperCase())) {\n      if (!Array.isArray(where[key])) {\n        throw new QueryError([{ path: key }])\n      }\n\n      const combine = key.toUpperCase() === 'AND' ? and : or\n      const nestedConstraints = where[key].map((nestedWhere) =>\n        buildPolymorphicJoinWhere({\n          adapter,\n          collection,\n          table,\n          where: nestedWhere,\n          wherePlan,\n        }),\n      )\n      const nestedCondition = combine(...nestedConstraints)\n\n      if (nestedCondition) {\n        constraints.push(nestedCondition)\n      }\n\n      continue\n    }\n\n    const resolvedPath = resolveWherePath({\n      adapter,\n      collection,\n      schemaPath: key,\n      table,\n      wherePlan,\n    })\n\n    for (let payloadOperator of Object.keys(where[key])) {\n      const originalOperator = payloadOperator\n      let value = where[key][payloadOperator]\n\n      if (resolvedPath.type === 'invalid') {\n        throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n      }\n\n      if (resolvedPath.type === 'hasManySelect') {\n        if (!supportedJSONQueryOperators.has(payloadOperator)) {\n          throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n        }\n\n        const sanitizedQueryValue = sanitizeQueryValue({\n          adapter,\n          field: resolvedPath.fieldContext,\n          isUUID: false,\n          operator: payloadOperator,\n          relationOrPath: key,\n          val: value,\n        })\n\n        if (sanitizedQueryValue === null || sanitizedQueryValue.columns) {\n          throw new QueryError([{ path: `${key}.${originalOperator}` }])\n        }\n\n        value = sanitizedQueryValue.value\n\n        if (payloadOperator === 'in' && Array.isArray(value) && value.length === 0) {\n          constraints.push(sql.raw('false'))\n          continue\n        }\n\n        const jsonQueryOperator =\n          payloadOperator === 'exists' ? 'exists' : sanitizedQueryValue.operator\n\n        constraints.push(\n          sql.raw(\n            adapter.createJSONQuery({\n              column: resolvedPath.jsonExpression,\n              operator: jsonQueryOperator,\n              pathSegments: [resolvedPath.pathPlan.columnPath],\n              value,\n            }),\n          ),\n        )\n        continue\n      }\n\n      if (payloadOperator === '$raw') {\n        if (typeof value !== 'string') {\n          throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n        }\n\n        constraints.push(sql.raw(value))\n        continue\n      }\n\n      const { column, queryValueContext } = resolvedPath\n\n      if (\n        payloadOperator === 'like' &&\n        (queryValueContext.field.type === 'number' ||\n          queryValueContext.field.type === 'relationship' ||\n          queryValueContext.field.type === 'upload' ||\n          queryValueContext.isUUID)\n      ) {\n        payloadOperator = 'equals'\n      }\n\n      const sanitizedQueryValue = sanitizeQueryValue({\n        adapter,\n        field: queryValueContext.field,\n        isUUID: queryValueContext.isUUID,\n        operator: payloadOperator,\n        relationOrPath: key,\n        val: value,\n      })\n\n      if (sanitizedQueryValue === null || sanitizedQueryValue.columns) {\n        throw new QueryError([{ path: `${key}.${originalOperator}` }])\n      }\n\n      payloadOperator = sanitizedQueryValue.operator\n      value = sanitizedQueryValue.value\n\n      if (!(payloadOperator in adapter.operators)) {\n        throw new QueryError([{ path: `${key}.${originalOperator}` }])\n      }\n\n      const operator = adapter.operators[payloadOperator as keyof typeof adapter.operators]\n\n      if (originalOperator === 'equals' && value === null) {\n        constraints.push(isNull(column))\n        continue\n      }\n\n      if (originalOperator === 'not_equals') {\n        if (value === null) {\n          constraints.push(isNotNull(column))\n        } else {\n          const notEqualsConstraint = or(isNull(column), operator(column, value))\n\n          if (notEqualsConstraint) {\n            constraints.push(notEqualsConstraint)\n          }\n        }\n        continue\n      }\n\n      if (originalOperator === 'in' && Array.isArray(value) && value.includes(null)) {\n        const nonNullValues = value.filter((item) => item !== null)\n        const inConstraint = nonNullValues.length ? operator(column, nonNullValues) : undefined\n        const nullAwareInConstraint = inConstraint\n          ? or(isNull(column), inConstraint)\n          : isNull(column)\n\n        if (nullAwareInConstraint) {\n          constraints.push(nullAwareInConstraint)\n        }\n        continue\n      }\n\n      if (payloadOperator === 'like' && typeof value === 'string') {\n        const wordConstraints = value.split(' ').map((word) => operator(column, `%${word}%`))\n        const wordCondition = and(...wordConstraints)\n\n        if (wordCondition) {\n          constraints.push(wordCondition)\n        }\n        continue\n      }\n\n      constraints.push(operator(column, value))\n    }\n  }\n\n  return and(...constraints)\n}\n\nconst resolveWherePath = ({\n  adapter,\n  collection,\n  schemaPath,\n  table,\n  wherePlan,\n}: {\n  schemaPath: string\n} & Omit<BuildPolymorphicJoinWhereArgs, 'where'>): ResolvedWherePath => {\n  const pathPlan = wherePlan.get(schemaPath)\n\n  if (!pathPlan) {\n    throw new QueryError([{ path: schemaPath }])\n  }\n\n  if (pathPlan.type === 'invalid') {\n    return { type: 'invalid', pathPlan }\n  }\n\n  if (schemaPath === 'relationTo') {\n    return {\n      type: 'scalar',\n      column: sql`${collection}` as unknown as Column,\n      pathPlan,\n      queryValueContext: {\n        type: 'scalar',\n        field: { name: 'relationTo', type: 'text' },\n        isUUID: false,\n      },\n    }\n  }\n\n  if (pathPlan.type === 'hasManySelect') {\n    const fieldContext = [...pathPlan.fieldsByCollection.values()].find(\n      (field) => field.type === 'hasManySelect',\n    )?.field\n\n    if (!fieldContext) {\n      return { type: 'invalid', pathPlan }\n    }\n\n    return {\n      type: 'hasManySelect',\n      fieldContext,\n      jsonExpression: getHasManySelectExpression({\n        adapter,\n        collection,\n        pathPlan,\n        table,\n      }),\n      pathPlan,\n    }\n  }\n\n  const collectionField = pathPlan.fieldsByCollection.get(collection)\n  const fieldContext = collectionField?.type === 'scalar' ? collectionField : undefined\n  const queryValueContext =\n    fieldContext ??\n    [...pathPlan.fieldsByCollection.values()].find(\n      (field): field is ScalarWhereField => field.type === 'scalar',\n    )\n\n  if (!queryValueContext) {\n    return { type: 'invalid', pathPlan }\n  }\n\n  return {\n    type: 'scalar',\n    column: fieldContext ? table[pathPlan.columnPath] : (sql`null` as unknown as Column),\n    pathPlan,\n    queryValueContext,\n  }\n}\n\nconst getHasManySelectExpression = ({\n  adapter,\n  collection,\n  pathPlan,\n  table,\n}: {\n  adapter: DrizzleAdapter\n  collection: string\n  pathPlan: WherePathPlan\n  table: GenericTable\n}): string => {\n  if (pathPlan.fieldsByCollection.get(collection)?.type !== 'hasManySelect') {\n    return adapter.name === 'postgres' ? `'[]'::jsonb` : `'[]'`\n  }\n\n  const selectTablePath = pathPlan.schemaPath\n    .split('.')\n    .map((pathSegment) => toSnakeCase(pathSegment))\n    .join('_')\n  const valuesTableName = adapter.tableNameMap.get(`${toSnakeCase(collection)}_${selectTablePath}`)\n\n  if (!valuesTableName) {\n    throw new Error(\n      `Polymorphic join collection \"${collection}\" has no value table for \"${pathPlan.schemaPath}\"`,\n    )\n  }\n\n  let qualifiedValuesTableName = valuesTableName\n  let parentTableName = getTableName(table)\n\n  if (adapter.schemaName) {\n    qualifiedValuesTableName = `\"${adapter.schemaName}\".\"${valuesTableName}\"`\n    parentTableName = `\"${adapter.schemaName}\".\"${parentTableName}\"`\n  }\n\n  if (adapter.name === 'postgres') {\n    return `(select coalesce(jsonb_agg(${qualifiedValuesTableName}.value), '[]'::jsonb) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n  }\n\n  return `(select json_group_array(${qualifiedValuesTableName}.value) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n}\n"],"names":["and","getTableName","isNotNull","isNull","or","sql","QueryError","toSnakeCase","sanitizeQueryValue","supportedJSONQueryOperators","Set","buildPolymorphicJoinWhere","adapter","collection","table","where","wherePlan","constraints","key","includes","toUpperCase","Array","isArray","path","combine","nestedConstraints","map","nestedWhere","nestedCondition","push","resolvedPath","resolveWherePath","schemaPath","payloadOperator","Object","keys","originalOperator","value","type","has","sanitizedQueryValue","field","fieldContext","isUUID","operator","relationOrPath","val","columns","length","raw","jsonQueryOperator","createJSONQuery","column","jsonExpression","pathSegments","pathPlan","columnPath","queryValueContext","operators","notEqualsConstraint","nonNullValues","filter","item","inConstraint","undefined","nullAwareInConstraint","wordConstraints","split","word","wordCondition","get","name","fieldsByCollection","values","find","getHasManySelectExpression","collectionField","selectTablePath","pathSegment","join","valuesTableName","tableNameMap","Error","qualifiedValuesTableName","parentTableName","schemaName"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/buildPolymorphicJoinWhere.ts"],"sourcesContent":["import type { Column, SQL } from 'drizzle-orm'\n\nimport { and, getTableName, isNotNull, isNull, or, sql } from 'drizzle-orm'\nimport { type FlattenedField, type Operator, QueryError, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleResolvedOperator } from '../queries/operatorMap.js'\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\nimport type {\n  PolymorphicJoinWherePlan,\n  ScalarWhereField,\n  WherePathPlan,\n} from './createPolymorphicJoinWherePlan.js'\n\nimport { buildOperatorConstraint } from '../queries/buildOperatorConstraint.js'\nimport { sanitizeQueryValue } from '../queries/sanitizeQueryValue.js'\n\nconst supportedJSONQueryOperators = new Set(['contains', 'equals', 'exists', 'in', 'like'])\n\ntype BuildPolymorphicJoinWhereArgs = {\n  adapter: DrizzleAdapter\n  collection: string\n  locale?: string\n  table: GenericTable\n  where: Where\n  wherePlan: PolymorphicJoinWherePlan\n}\n\ntype ResolvedWherePath =\n  | {\n      column: Column | SQL\n      fieldContext?: ScalarWhereField\n      pathPlan: WherePathPlan\n      queryValueContext: ScalarWhereField\n      type: 'scalar'\n    }\n  | {\n      fieldContext: FlattenedField\n      jsonExpression: string\n      pathPlan: WherePathPlan\n      type: 'hasManySelect'\n    }\n  | {\n      pathPlan: WherePathPlan\n      type: 'invalid'\n    }\n\n/**\n * Builds a where clause for one collection before the polymorphic branches are combined. A field\n * that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current\n * collection slug.\n */\nexport const buildPolymorphicJoinWhere = ({\n  adapter,\n  collection,\n  locale,\n  table,\n  where,\n  wherePlan,\n}: BuildPolymorphicJoinWhereArgs): SQL | undefined => {\n  const constraints: SQL[] = []\n\n  for (const key in where) {\n    if (['AND', 'OR'].includes(key.toUpperCase())) {\n      if (!Array.isArray(where[key])) {\n        throw new QueryError([{ path: key }])\n      }\n\n      const combine = key.toUpperCase() === 'AND' ? and : or\n      const nestedConstraints = where[key].map((nestedWhere) =>\n        buildPolymorphicJoinWhere({\n          adapter,\n          collection,\n          locale,\n          table,\n          where: nestedWhere,\n          wherePlan,\n        }),\n      )\n      const nestedCondition = combine(...nestedConstraints)\n\n      if (nestedCondition) {\n        constraints.push(nestedCondition)\n      }\n\n      continue\n    }\n\n    const resolvedPath = resolveWherePath({\n      adapter,\n      collection,\n      schemaPath: key,\n      table,\n      wherePlan,\n    })\n\n    for (let payloadOperator of Object.keys(where[key])) {\n      const originalOperator = payloadOperator as Operator\n      let value = where[key][payloadOperator]\n\n      if (resolvedPath.type === 'invalid') {\n        throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n      }\n\n      if (resolvedPath.type === 'hasManySelect') {\n        if (!supportedJSONQueryOperators.has(payloadOperator)) {\n          throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n        }\n\n        const sanitizedQueryValue = sanitizeQueryValue({\n          adapter,\n          field: resolvedPath.fieldContext,\n          isUUID: false,\n          operator: payloadOperator,\n          relationOrPath: key,\n          val: value,\n        })\n\n        if (sanitizedQueryValue === null) {\n          throw new QueryError([{ path: `${key}.${originalOperator}` }])\n        }\n\n        if (sanitizedQueryValue.columns) {\n          throw new QueryError([{ path: `${key}.${originalOperator}` }])\n        }\n\n        value = sanitizedQueryValue.value\n\n        if (payloadOperator === 'in' && Array.isArray(value) && value.length === 0) {\n          constraints.push(sql.raw('false'))\n          continue\n        }\n\n        const jsonQueryOperator =\n          payloadOperator === 'exists' ? 'exists' : sanitizedQueryValue.operator\n\n        constraints.push(\n          sql.raw(\n            adapter.createJSONQuery({\n              column: resolvedPath.jsonExpression,\n              operator: jsonQueryOperator,\n              pathSegments: [resolvedPath.pathPlan.columnPath],\n              value,\n            }),\n          ),\n        )\n        continue\n      }\n\n      if (payloadOperator === '$raw') {\n        if (typeof value !== 'string') {\n          throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n        }\n\n        constraints.push(sql.raw(value))\n        continue\n      }\n\n      const { column, fieldContext, queryValueContext } = resolvedPath\n\n      if (\n        payloadOperator === 'like' &&\n        (queryValueContext.field.type === 'number' ||\n          queryValueContext.field.type === 'relationship' ||\n          queryValueContext.field.type === 'upload' ||\n          queryValueContext.isUUID)\n      ) {\n        payloadOperator = 'equals'\n      }\n\n      const sanitizedQueryValue = sanitizeQueryValue({\n        adapter,\n        field: queryValueContext.field,\n        isUUID: queryValueContext.isUUID,\n        operator: payloadOperator,\n        relationOrPath: key,\n        val: value,\n      })\n\n      if (sanitizedQueryValue === null) {\n        throw new QueryError([{ path: `${key}.${originalOperator}` }])\n      }\n\n      if (sanitizedQueryValue.columns) {\n        throw new QueryError([{ path: `${key}.${originalOperator}` }])\n      }\n\n      payloadOperator = sanitizedQueryValue.operator\n      value = sanitizedQueryValue.value\n\n      if (!(payloadOperator in adapter.operators)) {\n        throw new QueryError([{ path: `${key}.${originalOperator}` }])\n      }\n\n      const resolvedOperator = payloadOperator as DrizzleResolvedOperator\n      const operator = adapter.operators[resolvedOperator]\n      const buildColumnConstraint = (constraintValue: unknown) => {\n        if (!fieldContext) {\n          return operator(column, constraintValue)\n        }\n\n        return buildOperatorConstraint({\n          adapter,\n          column,\n          field: fieldContext.field,\n          locale,\n          originalOperator,\n          path: key,\n          resolvedOperator,\n          value: constraintValue,\n        })\n      }\n\n      if (originalOperator === 'equals' && value === null) {\n        constraints.push(isNull(column))\n        continue\n      }\n\n      if (originalOperator === 'not_equals') {\n        if (value === null) {\n          constraints.push(isNotNull(column))\n        } else {\n          const notEqualsConstraint = or(isNull(column), buildColumnConstraint(value))\n\n          if (notEqualsConstraint) {\n            constraints.push(notEqualsConstraint)\n          }\n        }\n        continue\n      }\n\n      if (originalOperator === 'in' && Array.isArray(value) && value.includes(null)) {\n        const nonNullValues = value.filter((item) => item !== null)\n        const inConstraint = buildColumnConstraint(nonNullValues)\n        const nullAwareInConstraint = or(isNull(column), inConstraint)\n\n        if (nullAwareInConstraint) {\n          constraints.push(nullAwareInConstraint)\n        }\n        continue\n      }\n\n      if (payloadOperator === 'like' && typeof value === 'string') {\n        const wordConstraints = value.split(' ').map((word) => buildColumnConstraint(`%${word}%`))\n        const wordCondition = and(...wordConstraints)\n\n        if (wordCondition) {\n          constraints.push(wordCondition)\n        }\n        continue\n      }\n\n      constraints.push(buildColumnConstraint(value))\n    }\n  }\n\n  return and(...constraints)\n}\n\nconst resolveWherePath = ({\n  adapter,\n  collection,\n  schemaPath,\n  table,\n  wherePlan,\n}: {\n  schemaPath: string\n} & Omit<BuildPolymorphicJoinWhereArgs, 'locale' | 'where'>): ResolvedWherePath => {\n  const pathPlan = wherePlan.get(schemaPath)\n\n  if (!pathPlan) {\n    throw new QueryError([{ path: schemaPath }])\n  }\n\n  if (pathPlan.type === 'invalid') {\n    return { type: 'invalid', pathPlan }\n  }\n\n  if (schemaPath === 'relationTo') {\n    return {\n      type: 'scalar',\n      column: sql`${collection}`,\n      pathPlan,\n      queryValueContext: {\n        type: 'scalar',\n        field: { name: 'relationTo', type: 'text' },\n        isUUID: false,\n      },\n    }\n  }\n\n  if (pathPlan.type === 'hasManySelect') {\n    const fieldContext = [...pathPlan.fieldsByCollection.values()].find(\n      (field) => field.type === 'hasManySelect',\n    )?.field\n\n    if (!fieldContext) {\n      return { type: 'invalid', pathPlan }\n    }\n\n    return {\n      type: 'hasManySelect',\n      fieldContext,\n      jsonExpression: getHasManySelectExpression({\n        adapter,\n        collection,\n        pathPlan,\n        table,\n      }),\n      pathPlan,\n    }\n  }\n\n  const collectionField = pathPlan.fieldsByCollection.get(collection)\n  const fieldContext = collectionField?.type === 'scalar' ? collectionField : undefined\n  const queryValueContext =\n    fieldContext ??\n    [...pathPlan.fieldsByCollection.values()].find(\n      (field): field is ScalarWhereField => field.type === 'scalar',\n    )\n\n  if (!queryValueContext) {\n    return { type: 'invalid', pathPlan }\n  }\n\n  return {\n    type: 'scalar',\n    column: fieldContext ? table[pathPlan.columnPath] : sql`null`,\n    fieldContext,\n    pathPlan,\n    queryValueContext,\n  }\n}\n\nconst getHasManySelectExpression = ({\n  adapter,\n  collection,\n  pathPlan,\n  table,\n}: {\n  adapter: DrizzleAdapter\n  collection: string\n  pathPlan: WherePathPlan\n  table: GenericTable\n}): string => {\n  if (pathPlan.fieldsByCollection.get(collection)?.type !== 'hasManySelect') {\n    return adapter.name === 'postgres' ? `'[]'::jsonb` : `'[]'`\n  }\n\n  const selectTablePath = pathPlan.schemaPath\n    .split('.')\n    .map((pathSegment) => toSnakeCase(pathSegment))\n    .join('_')\n  const valuesTableName = adapter.tableNameMap.get(`${toSnakeCase(collection)}_${selectTablePath}`)\n\n  if (!valuesTableName) {\n    throw new Error(\n      `Polymorphic join collection \"${collection}\" has no value table for \"${pathPlan.schemaPath}\"`,\n    )\n  }\n\n  let qualifiedValuesTableName = valuesTableName\n  let parentTableName = getTableName(table)\n\n  if (adapter.schemaName) {\n    qualifiedValuesTableName = `\"${adapter.schemaName}\".\"${valuesTableName}\"`\n    parentTableName = `\"${adapter.schemaName}\".\"${parentTableName}\"`\n  }\n\n  if (adapter.name === 'postgres') {\n    return `(select coalesce(jsonb_agg(${qualifiedValuesTableName}.value), '[]'::jsonb) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n  }\n\n  return `(select json_group_array(${qualifiedValuesTableName}.value) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n}\n"],"names":["and","getTableName","isNotNull","isNull","or","sql","QueryError","toSnakeCase","buildOperatorConstraint","sanitizeQueryValue","supportedJSONQueryOperators","Set","buildPolymorphicJoinWhere","adapter","collection","locale","table","where","wherePlan","constraints","key","includes","toUpperCase","Array","isArray","path","combine","nestedConstraints","map","nestedWhere","nestedCondition","push","resolvedPath","resolveWherePath","schemaPath","payloadOperator","Object","keys","originalOperator","value","type","has","sanitizedQueryValue","field","fieldContext","isUUID","operator","relationOrPath","val","columns","length","raw","jsonQueryOperator","createJSONQuery","column","jsonExpression","pathSegments","pathPlan","columnPath","queryValueContext","operators","resolvedOperator","buildColumnConstraint","constraintValue","notEqualsConstraint","nonNullValues","filter","item","inConstraint","nullAwareInConstraint","wordConstraints","split","word","wordCondition","get","name","fieldsByCollection","values","find","getHasManySelectExpression","collectionField","undefined","selectTablePath","pathSegment","join","valuesTableName","tableNameMap","Error","qualifiedValuesTableName","parentTableName","schemaName"],"mappings":"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"}

package/dist/find/createPolymorphicJoinWherePlan.js

@@ -122,12 +122,13 @@ import { sanitizePathSegment } from '../utilities/sanitizePathSegment.js';
 const textQueryFieldTypes = new Set([
     'code',
     'email',
+    'slug',
     'text',
     'textarea'
 ]);
 const getScalarQueryValueSignature = ({ column, field })=>{
-    if (field.type === 'radio' || field.type === 'select') {
-        const optionValues = field.options.map((option)=>typeof option === 'object' ? option.value : option);
+    if (field.type === 'select' || field.type === 'radio') {
+        const optionValues = field.options.map((option)=>typeof option === 'string' ? option : option.value);
         return `${field.type}:${JSON.stringify(optionValues)}`;
     }
     if (textQueryFieldTypes.has(field.type)) {

package/dist/find/createPolymorphicJoinWherePlan.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/createPolymorphicJoinWherePlan.ts"],"sourcesContent":["import type { Column } from 'drizzle-orm'\n\nimport { type FlattenedField, getFieldByPath, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\n\nimport { isUUIDType } from '../utilities/isUUIDType.js'\nimport { sanitizePathSegment } from '../utilities/sanitizePathSegment.js'\n\nexport type ScalarWhereField = {\n  field: FlattenedField\n  isUUID: boolean\n  type: 'scalar'\n}\n\ntype CollectionWhereField = { field: FlattenedField; type: 'hasManySelect' } | ScalarWhereField\n\nexport type WherePathPlan = {\n  columnPath: string\n  fieldsByCollection: Map<string, CollectionWhereField>\n  schemaPath: string\n  type: 'hasManySelect' | 'invalid' | 'scalar'\n}\n\nexport type PolymorphicJoinWherePlan = Map<string, WherePathPlan>\n\n/**\n * Analyzes every leaf path in a polymorphic join where clause before SQL is built. Each plan entry\n * records the flattened column path, the compatible field shape for each target collection, and\n * whether the path uses a scalar column or a has-many select value table. A field may be absent\n * from some target collections; those branches compare against SQL NULL or an empty JSON array.\n *\n * Paths are marked as invalid when their storage shapes conflict, require localized or separate-row\n * traversal, have no matching field, lack a required column, or collide after path flattening.\n *\n * @returns A plan keyed by each unique schema path in `where`.\n * @throws If a target collection or its mapped database table is not available in the adapter.\n */\nexport const createPolymorphicJoinWherePlan = ({\n  adapter,\n  collections,\n  where,\n}: {\n  adapter: DrizzleAdapter\n  collections: string[]\n  where: Where\n}): PolymorphicJoinWherePlan => {\n  const collectionContexts = collections.map((collection) => {\n    const collectionConfig = adapter.payload.collections[collection]?.config\n\n    if (!collectionConfig) {\n      throw new Error(`Unknown polymorphic join collection \"${collection}\"`)\n    }\n\n    const tableName = adapter.tableNameMap.get(toSnakeCase(collection))\n    const table = tableName ? (adapter.tables[tableName] as GenericTable | undefined) : undefined\n\n    if (!table) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no database table`)\n    }\n\n    return { collection, collectionConfig, table }\n  })\n  const schemaPathsByColumnPath = new Map<string, Set<string>>()\n  const schemaPaths = new Set(getWhereSchemaPaths(where))\n\n  for (const schemaPath of schemaPaths) {\n    const columnPath = getColumnPath(schemaPath)\n    const paths = schemaPathsByColumnPath.get(columnPath) ?? new Set<string>()\n\n    paths.add(schemaPath)\n    schemaPathsByColumnPath.set(columnPath, paths)\n  }\n\n  const plan: PolymorphicJoinWherePlan = new Map()\n\n  for (const schemaPath of schemaPaths) {\n    const columnPath = getColumnPath(schemaPath)\n    const fieldsByCollection = new Map<string, CollectionWhereField>()\n    let isFieldPresent = schemaPath === 'id' || schemaPath === 'relationTo'\n    let hasManySelect = false\n    let hasUnsupportedFieldShape = false\n    const scalarQueryValueSignatures = new Set<string>()\n\n    for (const { collection, collectionConfig, table } of collectionContexts) {\n      const fieldAtPath = getFieldByPath({\n        fields: collectionConfig.flattenedFields,\n        path: schemaPath,\n      })\n\n      if (schemaPath === 'id') {\n        const idColumn = table['id'] as Column | undefined\n\n        if (!idColumn) {\n          hasUnsupportedFieldShape = true\n        } else {\n          scalarQueryValueSignatures.add(`id:${idColumn.getSQLType()}`)\n          fieldsByCollection.set(collection, {\n            type: 'scalar',\n            field:\n              fieldAtPath?.field ??\n              ({\n                name: 'id',\n                type: isUUIDType(adapter.idType) ? 'text' : 'number',\n              } as FlattenedField),\n            isUUID: !fieldAtPath && isUUIDType(adapter.idType),\n          })\n        }\n\n        continue\n      }\n\n      if (!fieldAtPath) {\n        if (\n          pathHasUnsupportedNestedContainer({\n            fields: collectionConfig.flattenedFields,\n            path: schemaPath,\n          })\n        ) {\n          hasUnsupportedFieldShape = true\n        }\n\n        continue\n      }\n\n      isFieldPresent = true\n\n      if (\n        fieldAtPath.pathHasLocalized ||\n        pathHasSeparateRows({ fields: collectionConfig.flattenedFields, path: schemaPath })\n      ) {\n        hasUnsupportedFieldShape = true\n        continue\n      }\n\n      if (fieldAtPath.field.type === 'select' && fieldAtPath.field.hasMany) {\n        hasManySelect = true\n        fieldsByCollection.set(collection, {\n          type: 'hasManySelect',\n          field: fieldAtPath.field,\n        })\n        continue\n      }\n\n      const fieldColumn = table[columnPath] as Column | undefined\n\n      if (!fieldColumn) {\n        hasUnsupportedFieldShape = true\n        continue\n      }\n\n      fieldsByCollection.set(collection, {\n        type: 'scalar',\n        field: fieldAtPath.field,\n        isUUID: fieldColumn.columnType === 'PgUUID',\n      })\n      scalarQueryValueSignatures.add(\n        getScalarQueryValueSignature({ column: fieldColumn, field: fieldAtPath.field }),\n      )\n    }\n\n    const hasColumnPathCollision = (schemaPathsByColumnPath.get(columnPath)?.size ?? 0) > 1\n    const isInvalid =\n      hasColumnPathCollision ||\n      !isFieldPresent ||\n      hasUnsupportedFieldShape ||\n      (hasManySelect && scalarQueryValueSignatures.size > 0) ||\n      scalarQueryValueSignatures.size > 1\n\n    plan.set(schemaPath, {\n      type: isInvalid ? 'invalid' : hasManySelect ? 'hasManySelect' : 'scalar',\n      columnPath,\n      fieldsByCollection,\n      schemaPath,\n    })\n  }\n\n  return plan\n}\n\nconst textQueryFieldTypes = new Set<FlattenedField['type']>(['code', 'email', 'text', 'textarea'])\n\nconst getScalarQueryValueSignature = ({\n  column,\n  field,\n}: {\n  column: Column\n  field: FlattenedField\n}): string => {\n  if (field.type === 'radio' || field.type === 'select') {\n    const optionValues = field.options.map((option) =>\n      typeof option === 'object' ? option.value : option,\n    )\n\n    return `${field.type}:${JSON.stringify(optionValues)}`\n  }\n\n  if (textQueryFieldTypes.has(field.type)) {\n    return 'text'\n  }\n\n  return `${field.type}:${column.getSQLType()}`\n}\n\nconst getWhereSchemaPaths = (where: Where): string[] => {\n  const paths: string[] = []\n\n  for (const key in where) {\n    if (['AND', 'OR'].includes(key.toUpperCase())) {\n      if (Array.isArray(where[key])) {\n        for (const nestedWhere of where[key]) {\n          paths.push(...getWhereSchemaPaths(nestedWhere))\n        }\n      }\n    } else {\n      paths.push(key)\n    }\n  }\n\n  return paths\n}\n\nconst getColumnPath = (schemaPath: string): string =>\n  schemaPath\n    .split('.')\n    .map((segment) => sanitizePathSegment(segment))\n    .join('_')\n\nconst pathHasSeparateRows = ({ fields, path }: { fields: FlattenedField[]; path: string }) => {\n  const pathSegments = path.split('.')\n\n  for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n    const fieldAtParentPath = getFieldByPath({\n      fields,\n      path: pathSegments.slice(0, segmentIndex).join('.'),\n    })\n\n    if (fieldAtParentPath?.field.type === 'array' || fieldAtParentPath?.field.type === 'blocks') {\n      return true\n    }\n  }\n\n  return false\n}\n\nconst pathHasUnsupportedNestedContainer = ({\n  fields,\n  path,\n}: {\n  fields: FlattenedField[]\n  path: string\n}) => {\n  const pathSegments = path.split('.')\n\n  for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n    const fieldAtParentPath = getFieldByPath({\n      fields,\n      path: pathSegments.slice(0, segmentIndex).join('.'),\n    })\n\n    if (!fieldAtParentPath) {\n      return false\n    }\n\n    if (!['group', 'tab'].includes(fieldAtParentPath.field.type)) {\n      return true\n    }\n  }\n\n  return false\n}\n"],"names":["getFieldByPath","toSnakeCase","isUUIDType","sanitizePathSegment","createPolymorphicJoinWherePlan","adapter","collections","where","collectionContexts","map","collection","collectionConfig","payload","config","Error","tableName","tableNameMap","get","table","tables","undefined","schemaPathsByColumnPath","Map","schemaPaths","Set","getWhereSchemaPaths","schemaPath","columnPath","getColumnPath","paths","add","set","plan","fieldsByCollection","isFieldPresent","hasManySelect","hasUnsupportedFieldShape","scalarQueryValueSignatures","fieldAtPath","fields","flattenedFields","path","idColumn","getSQLType","type","field","name","idType","isUUID","pathHasUnsupportedNestedContainer","pathHasLocalized","pathHasSeparateRows","hasMany","fieldColumn","columnType","getScalarQueryValueSignature","column","hasColumnPathCollision","size","isInvalid","textQueryFieldTypes","optionValues","options","option","value","JSON","stringify","has","key","includes","toUpperCase","Array","isArray","nestedWhere","push","split","segment","join","pathSegments","segmentIndex","length","fieldAtParentPath","slice"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/createPolymorphicJoinWherePlan.ts"],"sourcesContent":["import type { Column } from 'drizzle-orm'\n\nimport { type FlattenedField, getFieldByPath, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\n\nimport { isUUIDType } from '../utilities/isUUIDType.js'\nimport { sanitizePathSegment } from '../utilities/sanitizePathSegment.js'\n\nexport type ScalarWhereField = {\n  field: FlattenedField\n  isUUID: boolean\n  type: 'scalar'\n}\n\ntype CollectionWhereField = { field: FlattenedField; type: 'hasManySelect' } | ScalarWhereField\n\nexport type WherePathPlan = {\n  columnPath: string\n  fieldsByCollection: Map<string, CollectionWhereField>\n  schemaPath: string\n  type: 'hasManySelect' | 'invalid' | 'scalar'\n}\n\nexport type PolymorphicJoinWherePlan = Map<string, WherePathPlan>\n\n/**\n * Analyzes every leaf path in a polymorphic join where clause before SQL is built. Each plan entry\n * records the flattened column path, the compatible field shape for each target collection, and\n * whether the path uses a scalar column or a has-many select value table. A field may be absent\n * from some target collections; those branches compare against SQL NULL or an empty JSON array.\n *\n * Paths are marked as invalid when their storage shapes conflict, require localized or separate-row\n * traversal, have no matching field, lack a required column, or collide after path flattening.\n *\n * @returns A plan keyed by each unique schema path in `where`.\n * @throws If a target collection or its mapped database table is not available in the adapter.\n */\nexport const createPolymorphicJoinWherePlan = ({\n  adapter,\n  collections,\n  where,\n}: {\n  adapter: DrizzleAdapter\n  collections: string[]\n  where: Where\n}): PolymorphicJoinWherePlan => {\n  const collectionContexts = collections.map((collection) => {\n    const collectionConfig = adapter.payload.collections[collection]?.config\n\n    if (!collectionConfig) {\n      throw new Error(`Unknown polymorphic join collection \"${collection}\"`)\n    }\n\n    const tableName = adapter.tableNameMap.get(toSnakeCase(collection))\n    const table = tableName ? (adapter.tables[tableName] as GenericTable | undefined) : undefined\n\n    if (!table) {\n      throw new Error(`Polymorphic join collection \"${collection}\" has no database table`)\n    }\n\n    return { collection, collectionConfig, table }\n  })\n  const schemaPathsByColumnPath = new Map<string, Set<string>>()\n  const schemaPaths = new Set(getWhereSchemaPaths(where))\n\n  for (const schemaPath of schemaPaths) {\n    const columnPath = getColumnPath(schemaPath)\n    const paths = schemaPathsByColumnPath.get(columnPath) ?? new Set<string>()\n\n    paths.add(schemaPath)\n    schemaPathsByColumnPath.set(columnPath, paths)\n  }\n\n  const plan: PolymorphicJoinWherePlan = new Map()\n\n  for (const schemaPath of schemaPaths) {\n    const columnPath = getColumnPath(schemaPath)\n    const fieldsByCollection = new Map<string, CollectionWhereField>()\n    let isFieldPresent = schemaPath === 'id' || schemaPath === 'relationTo'\n    let hasManySelect = false\n    let hasUnsupportedFieldShape = false\n    const scalarQueryValueSignatures = new Set<string>()\n\n    for (const { collection, collectionConfig, table } of collectionContexts) {\n      const fieldAtPath = getFieldByPath({\n        fields: collectionConfig.flattenedFields,\n        path: schemaPath,\n      })\n\n      if (schemaPath === 'id') {\n        const idColumn = table['id'] as Column | undefined\n\n        if (!idColumn) {\n          hasUnsupportedFieldShape = true\n        } else {\n          scalarQueryValueSignatures.add(`id:${idColumn.getSQLType()}`)\n          fieldsByCollection.set(collection, {\n            type: 'scalar',\n            field:\n              fieldAtPath?.field ??\n              ({\n                name: 'id',\n                type: isUUIDType(adapter.idType) ? 'text' : 'number',\n              } as FlattenedField),\n            isUUID: !fieldAtPath && isUUIDType(adapter.idType),\n          })\n        }\n\n        continue\n      }\n\n      if (!fieldAtPath) {\n        if (\n          pathHasUnsupportedNestedContainer({\n            fields: collectionConfig.flattenedFields,\n            path: schemaPath,\n          })\n        ) {\n          hasUnsupportedFieldShape = true\n        }\n\n        continue\n      }\n\n      isFieldPresent = true\n\n      if (\n        fieldAtPath.pathHasLocalized ||\n        pathHasSeparateRows({ fields: collectionConfig.flattenedFields, path: schemaPath })\n      ) {\n        hasUnsupportedFieldShape = true\n        continue\n      }\n\n      if (fieldAtPath.field.type === 'select' && fieldAtPath.field.hasMany) {\n        hasManySelect = true\n        fieldsByCollection.set(collection, {\n          type: 'hasManySelect',\n          field: fieldAtPath.field,\n        })\n        continue\n      }\n\n      const fieldColumn = table[columnPath] as Column | undefined\n\n      if (!fieldColumn) {\n        hasUnsupportedFieldShape = true\n        continue\n      }\n\n      fieldsByCollection.set(collection, {\n        type: 'scalar',\n        field: fieldAtPath.field,\n        isUUID: fieldColumn.columnType === 'PgUUID',\n      })\n      scalarQueryValueSignatures.add(\n        getScalarQueryValueSignature({ column: fieldColumn, field: fieldAtPath.field }),\n      )\n    }\n\n    const hasColumnPathCollision = (schemaPathsByColumnPath.get(columnPath)?.size ?? 0) > 1\n    const isInvalid =\n      hasColumnPathCollision ||\n      !isFieldPresent ||\n      hasUnsupportedFieldShape ||\n      (hasManySelect && scalarQueryValueSignatures.size > 0) ||\n      scalarQueryValueSignatures.size > 1\n\n    plan.set(schemaPath, {\n      type: isInvalid ? 'invalid' : hasManySelect ? 'hasManySelect' : 'scalar',\n      columnPath,\n      fieldsByCollection,\n      schemaPath,\n    })\n  }\n\n  return plan\n}\n\nconst textQueryFieldTypes = new Set<FlattenedField['type']>([\n  'code',\n  'email',\n  'slug',\n  'text',\n  'textarea',\n])\n\nconst getScalarQueryValueSignature = ({\n  column,\n  field,\n}: {\n  column: Column\n  field: FlattenedField\n}): string => {\n  if (field.type === 'select' || field.type === 'radio') {\n    const optionValues = field.options.map((option) =>\n      typeof option === 'string' ? option : option.value,\n    )\n\n    return `${field.type}:${JSON.stringify(optionValues)}`\n  }\n\n  if (textQueryFieldTypes.has(field.type)) {\n    return 'text'\n  }\n\n  return `${field.type}:${column.getSQLType()}`\n}\n\nconst getWhereSchemaPaths = (where: Where): string[] => {\n  const paths: string[] = []\n\n  for (const key in where) {\n    if (['AND', 'OR'].includes(key.toUpperCase())) {\n      if (Array.isArray(where[key])) {\n        for (const nestedWhere of where[key]) {\n          paths.push(...getWhereSchemaPaths(nestedWhere))\n        }\n      }\n    } else {\n      paths.push(key)\n    }\n  }\n\n  return paths\n}\n\nconst getColumnPath = (schemaPath: string): string =>\n  schemaPath\n    .split('.')\n    .map((segment) => sanitizePathSegment(segment))\n    .join('_')\n\nconst pathHasSeparateRows = ({ fields, path }: { fields: FlattenedField[]; path: string }) => {\n  const pathSegments = path.split('.')\n\n  for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n    const fieldAtParentPath = getFieldByPath({\n      fields,\n      path: pathSegments.slice(0, segmentIndex).join('.'),\n    })\n\n    if (fieldAtParentPath?.field.type === 'array' || fieldAtParentPath?.field.type === 'blocks') {\n      return true\n    }\n  }\n\n  return false\n}\n\nconst pathHasUnsupportedNestedContainer = ({\n  fields,\n  path,\n}: {\n  fields: FlattenedField[]\n  path: string\n}) => {\n  const pathSegments = path.split('.')\n\n  for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n    const fieldAtParentPath = getFieldByPath({\n      fields,\n      path: pathSegments.slice(0, segmentIndex).join('.'),\n    })\n\n    if (!fieldAtParentPath) {\n      return false\n    }\n\n    if (!['group', 'tab'].includes(fieldAtParentPath.field.type)) {\n      return true\n    }\n  }\n\n  return false\n}\n"],"names":["getFieldByPath","toSnakeCase","isUUIDType","sanitizePathSegment","createPolymorphicJoinWherePlan","adapter","collections","where","collectionContexts","map","collection","collectionConfig","payload","config","Error","tableName","tableNameMap","get","table","tables","undefined","schemaPathsByColumnPath","Map","schemaPaths","Set","getWhereSchemaPaths","schemaPath","columnPath","getColumnPath","paths","add","set","plan","fieldsByCollection","isFieldPresent","hasManySelect","hasUnsupportedFieldShape","scalarQueryValueSignatures","fieldAtPath","fields","flattenedFields","path","idColumn","getSQLType","type","field","name","idType","isUUID","pathHasUnsupportedNestedContainer","pathHasLocalized","pathHasSeparateRows","hasMany","fieldColumn","columnType","getScalarQueryValueSignature","column","hasColumnPathCollision","size","isInvalid","textQueryFieldTypes","optionValues","options","option","value","JSON","stringify","has","key","includes","toUpperCase","Array","isArray","nestedWhere","push","split","segment","join","pathSegments","segmentIndex","length","fieldAtParentPath","slice"],"mappings":"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"}

package/dist/find/traverseFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,UAAU,EAEhB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAcpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,iSAuBxB,iBAAiB,4BAyoBnB,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,UAAU,EAEhB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAcpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,iSAuBxB,iBAAiB,4BA0oBnB,CAAA"}

package/dist/find/traverseFields.js

@@ -119,8 +119,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                         }
                         break;
                     }
-                    ;
-                    (field.blockReferences ?? field.blocks).forEach((_block)=>{
+                    field.blocks.forEach((_block)=>{
                         const block = typeof _block === 'string' ? adapter.payload.blocks[_block] : _block;
                         const blockKey = `_blocks_${block.slug}${!block[InternalBlockTableNameIndex] ? '' : `_${block[InternalBlockTableNameIndex]}`}`;
                         let blockSelect;
@@ -257,6 +256,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                             currentTableName,
                             field,
                             limit,
+                            locale,
                             page,
                             path,
                             shouldCount,