@payloadcms/drizzle 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/find.js

@@ -1,11 +1,27 @@
+import { applyBranchIDProjection, resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs, withBranchIDSelect } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export const find = async function find({ collection, draftsEnabled, joins, limit, locale, page = 1, pagination, req, select, sort: sortArg, where }) {
+export const find = async function find({ branch, collection, draftsEnabled, joins, limit, locale, page = 1, pagination, req, select, sort: sortArg, where }) {
     const collectionConfig = this.payload.collections[collection].config;
     const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
-    return findMany({
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug: collectionConfig.slug,
+        req
+    });
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchIDs(where) : await resolveBranchQuery({
+        branch,
+        collectionSlug: collectionConfig.slug,
+        req,
+        where
+    });
+    const result = await findMany({
         adapter: this,
+        branchVisibility: branchReadState.useBranching ? {
+            branch: branchReadState.branch,
+            collectionSlug: collectionConfig.slug
+        } : undefined,
         collectionSlug: collectionConfig.slug,
         draftsEnabled,
         fields: collectionConfig.flattenedFields,
@@ -15,11 +31,23 @@ export const find = async function find({ collection, draftsEnabled, joins, limi
         page,
         pagination,
         req,
-        select,
+        select: withBranchIDSelect({
+            branch,
+            collectionSlug: collectionConfig.slug,
+            req,
+            select
+        }),
         sort,
         tableName,
-        where
+        where: branchedWhere
+    });
+    applyBranchIDProjection({
+        branch,
+        collectionSlug: collectionConfig.slug,
+        docs: result.docs,
+        req
     });
+    return result;
 };
 
 //# sourceMappingURL=find.js.map

package/dist/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { Find, SanitizedCollectionConfig } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const find: Find = async function find(\n  this: DrizzleAdapter,\n  {\n    collection,\n    draftsEnabled,\n    joins,\n    limit,\n    locale,\n    page = 1,\n    pagination,\n    req,\n    select,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  return findMany({\n    adapter: this,\n    collectionSlug: collectionConfig.slug,\n    draftsEnabled,\n    fields: collectionConfig.flattenedFields,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["toSnakeCase","findMany","find","collection","draftsEnabled","joins","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","adapter","collectionSlug","fields","flattenedFields"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,OAAa,eAAeA,KAEvC,EACEC,UAAU,EACVC,aAAa,EACbC,KAAK,EACLC,KAAK,EACLC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,GAAG,EACHC,MAAM,EACNC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACd,WAAW,CAACe,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACvB,YAAYe,iBAAiBS,IAAI;IAEzE,OAAOvB,SAAS;QACdwB,SAAS,IAAI;QACbC,gBAAgBX,iBAAiBS,IAAI;QACrCpB;QACAuB,QAAQZ,iBAAiBa,eAAe;QACxCvB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAS;QACAP;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { Find, SanitizedCollectionConfig } from 'payload'\n\nimport {\n  applyBranchIDProjection,\n  resolveBranchQuery,\n  resolveBranchReadState,\n  rewriteBranchIDs,\n  withBranchIDSelect,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const find: Find = async function find(\n  this: DrizzleAdapter,\n  {\n    branch,\n    collection,\n    draftsEnabled,\n    joins,\n    limit,\n    locale,\n    page = 1,\n    pagination,\n    req,\n    select,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const branchReadState = resolveBranchReadState({\n    branch,\n    collectionSlug: collectionConfig.slug,\n    req,\n  })\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchIDs(where)\n    : await resolveBranchQuery({\n        branch,\n        collectionSlug: collectionConfig.slug,\n        req,\n        where,\n      })\n\n  const result = await findMany({\n    adapter: this,\n    branchVisibility: branchReadState.useBranching\n      ? { branch: branchReadState.branch, collectionSlug: collectionConfig.slug }\n      : undefined,\n    collectionSlug: collectionConfig.slug,\n    draftsEnabled,\n    fields: collectionConfig.flattenedFields,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select: withBranchIDSelect({ branch, collectionSlug: collectionConfig.slug, req, select }),\n    sort,\n    tableName,\n    where: branchedWhere,\n  })\n\n  applyBranchIDProjection({\n    branch,\n    collectionSlug: collectionConfig.slug,\n    docs: result.docs as Record<string, unknown>[],\n    req,\n  })\n\n  return result\n}\n"],"names":["applyBranchIDProjection","resolveBranchQuery","resolveBranchReadState","rewriteBranchIDs","withBranchIDSelect","toSnakeCase","findMany","find","branch","collection","draftsEnabled","joins","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","branchReadState","collectionSlug","branchedWhere","useBranching","result","adapter","branchVisibility","fields","flattenedFields","docs"],"mappings":"AAEA,SACEA,uBAAuB,EACvBC,kBAAkB,EAClBC,sBAAsB,EACtBC,gBAAgB,EAChBC,kBAAkB,QACb,UAAS;AAChB,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,OAAa,eAAeA,KAEvC,EACEC,MAAM,EACNC,UAAU,EACVC,aAAa,EACbC,KAAK,EACLC,KAAK,EACLC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,GAAG,EACHC,MAAM,EACNC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACd,WAAW,CAACe,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACxB,YAAYgB,iBAAiBS,IAAI;IAEzE,MAAMC,kBAAkB7B,uBAAuB;QAC7CM;QACAwB,gBAAgBX,iBAAiBS,IAAI;QACrCd;IACF;IACA,MAAMiB,gBAAgBF,gBAAgBG,YAAY,GAC9C/B,iBAAiBiB,SACjB,MAAMnB,mBAAmB;QACvBO;QACAwB,gBAAgBX,iBAAiBS,IAAI;QACrCd;QACAI;IACF;IAEJ,MAAMe,SAAS,MAAM7B,SAAS;QAC5B8B,SAAS,IAAI;QACbC,kBAAkBN,gBAAgBG,YAAY,GAC1C;YAAE1B,QAAQuB,gBAAgBvB,MAAM;YAAEwB,gBAAgBX,iBAAiBS,IAAI;QAAC,IACxEL;QACJO,gBAAgBX,iBAAiBS,IAAI;QACrCpB;QACA4B,QAAQjB,iBAAiBkB,eAAe;QACxC5B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC,QAAQb,mBAAmB;YAAEI;YAAQwB,gBAAgBX,iBAAiBS,IAAI;YAAEd;YAAKC;QAAO;QACxFC;QACAS;QACAP,OAAOa;IACT;IAEAjC,wBAAwB;QACtBQ;QACAwB,gBAAgBX,iBAAiBS,IAAI;QACrCU,MAAML,OAAOK,IAAI;QACjBxB;IACF;IAEA,OAAOmB;AACT,EAAC"}

package/dist/findDistinct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAkD,MAAM,SAAS,CAAA;AA8B3F,eAAO,MAAM,YAAY,EAAE,YA6H1B,CAAA"}
+{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,YAAY,EAQlB,MAAM,SAAS,CAAA;AA+ChB,eAAO,MAAM,YAAY,EAAE,YAgP1B,CAAA"}

package/dist/findDistinct.js

@@ -1,10 +1,28 @@
-import { max, sql } from 'drizzle-orm';
-import { getFieldByPath } from 'payload';
+import { and, asc, desc, max, sql } from 'drizzle-orm';
+import { getFieldByPath, getLocalizedPaths, resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs } from 'payload';
 import toSnakeCase from 'to-snake-case';
+import { buildBranchVisibility } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { selectDistinct } from './queries/selectDistinct.js';
 import { getTransaction } from './utilities/getTransaction.js';
 import { DistinctSymbol } from './utilities/rawConstraint.js';
+const prefixWherePaths = ({ prefix, where })=>{
+    const prefixedWhere = {};
+    for (const [key, value] of Object.entries(where)){
+        if ([
+            'and',
+            'or'
+        ].includes(key.toLowerCase()) && Array.isArray(value)) {
+            prefixedWhere[key] = value.map((nestedWhere)=>prefixWherePaths({
+                    prefix,
+                    where: nestedWhere
+                }));
+        } else {
+            prefixedWhere[`${prefix}.${key}`] = value;
+        }
+    }
+    return prefixedWhere;
+};
 const getOrderColumn = (orderBy, selectFields, joins)=>{
     if (orderBy.length === 0) {
         return null;
@@ -22,7 +40,60 @@ export const findDistinct = async function(args) {
     const page = args.page || 1;
     const offset = args.limit ? (page - 1) * args.limit : undefined;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
-    const { joins, orderBy, selectFields, where } = buildQuery({
+    // Same predicate a list read gets: distinct values describe the visible documents.
+    const branchReadState = resolveBranchReadState({
+        branch: args.branch,
+        collectionSlug: args.collection,
+        req: args.req
+    });
+    const branchScopedWhere = branchReadState.useBranching ? rewriteBranchIDs(args.where) : await resolveBranchQuery({
+        branch: args.branch,
+        collectionSlug: args.collection,
+        req: args.req,
+        where: args.where
+    });
+    const relatedBranchConstraints = [];
+    const nativeRelatedBranchReads = [];
+    const fieldPaths = getLocalizedPaths({
+        collectionSlug: args.collection,
+        fields: collectionConfig.flattenedFields,
+        incomingPath: args.field,
+        locale: args.locale,
+        overrideAccess: true,
+        payload: this.payload
+    });
+    for(let pathIndex = 1; pathIndex < fieldPaths.length; pathIndex++){
+        const relatedCollectionSlug = fieldPaths[pathIndex]?.collectionSlug;
+        if (!relatedCollectionSlug) {
+            continue;
+        }
+        const relationshipPath = fieldPaths.slice(0, pathIndex).map(({ path })=>path).join('.');
+        const relatedBranchReadState = resolveBranchReadState({
+            branch: args.branch,
+            collectionSlug: relatedCollectionSlug,
+            req: args.req
+        });
+        const relatedWhere = relatedBranchReadState.useBranching ? rewriteBranchIDs(args.relatedAccess?.[relationshipPath]) : await resolveBranchQuery({
+            branch: args.branch,
+            collectionSlug: relatedCollectionSlug,
+            req: args.req,
+            where: args.relatedAccess?.[relationshipPath]
+        });
+        if (relatedBranchReadState.useBranching) {
+            nativeRelatedBranchReads.push({
+                branch: relatedBranchReadState.branch,
+                collectionSlug: relatedCollectionSlug,
+                relationshipPath
+            });
+        }
+        if (relatedWhere && Object.keys(relatedWhere).length) {
+            relatedBranchConstraints.push(prefixWherePaths({
+                prefix: relationshipPath,
+                where: relatedWhere
+            }));
+        }
+    }
+    const { joins, orderBy, selectFields, where: queryWhere } = buildQuery({
         adapter: this,
         fields: collectionConfig.flattenedFields,
         locale: args.locale,
@@ -30,18 +101,44 @@ export const findDistinct = async function(args) {
         tableName,
         where: {
             and: [
-                args.where ?? {},
                 {
                     [args.field]: {
                         equals: DistinctSymbol
                     }
-                }
+                },
+                branchScopedWhere ?? {},
+                ...relatedBranchConstraints
             ]
         }
     });
     orderBy.pop();
+    const table = this.tables[tableName];
+    const canonicalIDExpression = branchReadState.useBranching && args.field === 'id' ? sql`COALESCE(${table._branchDocID}, ${table.id})` : undefined;
+    if (canonicalIDExpression) {
+        selectFields['_selected'] = canonicalIDExpression.as('_selected');
+    }
+    const branchVisibilityWhere = branchReadState.useBranching ? buildBranchVisibility({
+        adapter: this,
+        branch: branchReadState.branch,
+        collectionSlug: args.collection,
+        table
+    }) : undefined;
+    const relatedBranchVisibility = nativeRelatedBranchReads.flatMap((relatedBranchRead)=>{
+        const relatedTable = joins.find(({ queryPath })=>queryPath?.endsWith(`${relatedBranchRead.relationshipPath}._target`))?.table;
+        return relatedTable ? [
+            buildBranchVisibility({
+                adapter: this,
+                branch: relatedBranchRead.branch,
+                collectionSlug: relatedBranchRead.collectionSlug,
+                table: relatedTable
+            })
+        ] : [];
+    });
+    const where = and(queryWhere, branchVisibilityWhere, ...relatedBranchVisibility);
     const db = await getTransaction(this, args.req);
-    const _order = getOrderColumn(orderBy, selectFields, joins);
+    const _order = canonicalIDExpression ? null : getOrderColumn(orderBy, selectFields, joins);
+    const firstSort = Array.isArray(args.sort) ? args.sort[0] : args.sort;
+    const canonicalIDOrder = firstSort?.startsWith('-') ? desc : asc;
     const selectDistinctResult = await selectDistinct({
         adapter: this,
         db,
@@ -49,7 +146,9 @@ export const findDistinct = async function(args) {
         hasAggregates: Boolean(_order) && !joins.length,
         joins,
         query: ({ query })=>{
-            if (_order && orderBy.length > 0 && !joins.length) {
+            if (canonicalIDExpression) {
+                query = query.orderBy(canonicalIDOrder(sql`_selected`));
+            } else if (_order && orderBy.length > 0 && !joins.length) {
                 query = query.orderBy(orderBy[0].order(sql`_order`));
             } else {
                 query = query.orderBy(()=>orderBy.map(({ column, order })=>order(column)));
@@ -97,7 +196,7 @@ export const findDistinct = async function(args) {
         }));
     if (args.limit) {
         const totalDocs = await this.countDistinct({
-            column: selectFields['_selected'],
+            column: canonicalIDExpression ?? selectFields['_selected'],
             db,
             joins,
             tableName,

package/dist/findDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\n\nimport { max, sql } from 'drizzle-orm'\nimport { type FindDistinct, getFieldByPath, type SanitizedCollectionConfig } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, DrizzleAdapter, GenericColumn } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { DistinctSymbol } from './utilities/rawConstraint.js'\n\nconst getOrderColumn = (\n  orderBy: { column: GenericColumn; order: typeof asc | typeof desc }[],\n  selectFields: Record<string, GenericColumn>,\n  joins: BuildQueryJoinAliases,\n): GenericColumn | null | SQL.Aliased => {\n  if (orderBy.length === 0) {\n    return null\n  }\n\n  if (orderBy[0].column === selectFields['_selected']) {\n    return null\n  }\n\n  if (joins.length > 0) {\n    return orderBy[0].column\n  }\n\n  return max(orderBy[0]?.column).as('_order')\n}\n\nexport const findDistinct: FindDistinct = async function (this: DrizzleAdapter, args) {\n  const collectionConfig: SanitizedCollectionConfig =\n    this.payload.collections[args.collection].config\n  const page = args.page || 1\n  const offset = args.limit ? (page - 1) * args.limit : undefined\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    tableName,\n    where: {\n      and: [\n        args.where ?? {},\n        {\n          [args.field]: {\n            equals: DistinctSymbol,\n          },\n        },\n      ],\n    },\n  })\n\n  orderBy.pop()\n\n  const db = await getTransaction(this, args.req)\n\n  const _order = getOrderColumn(orderBy, selectFields, joins)\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    forceRun: true,\n    hasAggregates: Boolean(_order) && !joins.length,\n    joins,\n    query: ({ query }) => {\n      if (_order && orderBy.length > 0 && !joins.length) {\n        query = query.orderBy(orderBy[0].order(sql`_order`))\n      } else {\n        query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n      }\n\n      if (args.limit) {\n        if (offset) {\n          query = query.offset(offset)\n        }\n\n        query = query.limit(args.limit)\n      }\n\n      return query\n    },\n    selectFields: {\n      _selected: selectFields['_selected'],\n      ...(_order ? { _order } : {}),\n    } as Record<string, any>,\n    tableName,\n    where,\n  })\n\n  const field = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })?.field\n\n  if (field && 'relationTo' in field && Array.isArray(field.relationTo)) {\n    for (const row of selectDistinctResult as any) {\n      const json = JSON.parse(row._selected)\n      const relationTo = Object.keys(json).find((each) => Boolean(json[each]))\n      const value = json[relationTo]\n\n      if (!value) {\n        row._selected = null\n      } else {\n        row._selected = { relationTo, value }\n      }\n    }\n  }\n\n  const values = selectDistinctResult.map((each) => ({\n    [args.field]: (each as Record<string, any>)._selected,\n  }))\n\n  if (args.limit) {\n    const totalDocs = await this.countDistinct({\n      column: selectFields['_selected'],\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values,\n    }\n  }\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["max","sql","getFieldByPath","toSnakeCase","buildQuery","selectDistinct","getTransaction","DistinctSymbol","getOrderColumn","orderBy","selectFields","joins","length","column","as","findDistinct","args","collectionConfig","payload","collections","collection","config","page","offset","limit","undefined","tableName","tableNameMap","get","slug","where","adapter","fields","flattenedFields","locale","sort","field","and","equals","pop","db","req","_order","selectDistinctResult","forceRun","hasAggregates","Boolean","query","order","map","_selected","includeRelationships","path","Array","isArray","relationTo","row","json","JSON","parse","Object","keys","find","each","value","values","totalDocs","countDistinct","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage"],"mappings":"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"}
+{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\n\nimport { and, asc, desc, max, sql } from 'drizzle-orm'\nimport {\n  type FindDistinct,\n  getFieldByPath,\n  getLocalizedPaths,\n  resolveBranchQuery,\n  resolveBranchReadState,\n  rewriteBranchIDs,\n  type SanitizedCollectionConfig,\n  type Where,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, DrizzleAdapter, GenericColumn } from './types.js'\n\nimport { buildBranchVisibility } from './queries/buildBranchVisibility.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { DistinctSymbol } from './utilities/rawConstraint.js'\n\nconst prefixWherePaths = ({ prefix, where }: { prefix: string; where: Where }): Where => {\n  const prefixedWhere: Where = {}\n\n  for (const [key, value] of Object.entries(where)) {\n    if (['and', 'or'].includes(key.toLowerCase()) && Array.isArray(value)) {\n      prefixedWhere[key] = value.map((nestedWhere) =>\n        prefixWherePaths({ prefix, where: nestedWhere }),\n      )\n    } else {\n      prefixedWhere[`${prefix}.${key}`] = value\n    }\n  }\n\n  return prefixedWhere\n}\n\nconst getOrderColumn = (\n  orderBy: { column: GenericColumn; order: typeof asc | typeof desc }[],\n  selectFields: Record<string, GenericColumn>,\n  joins: BuildQueryJoinAliases,\n): GenericColumn | null | SQL.Aliased => {\n  if (orderBy.length === 0) {\n    return null\n  }\n\n  if (orderBy[0].column === selectFields['_selected']) {\n    return null\n  }\n\n  if (joins.length > 0) {\n    return orderBy[0].column\n  }\n\n  return max(orderBy[0]?.column).as('_order')\n}\n\nexport const findDistinct: FindDistinct = async function (this: DrizzleAdapter, args) {\n  const collectionConfig: SanitizedCollectionConfig =\n    this.payload.collections[args.collection].config\n  const page = args.page || 1\n  const offset = args.limit ? (page - 1) * args.limit : undefined\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  // Same predicate a list read gets: distinct values describe the visible documents.\n  const branchReadState = resolveBranchReadState({\n    branch: args.branch,\n    collectionSlug: args.collection,\n    req: args.req,\n  })\n  const branchScopedWhere = branchReadState.useBranching\n    ? rewriteBranchIDs(args.where)\n    : await resolveBranchQuery({\n        branch: args.branch,\n        collectionSlug: args.collection,\n        req: args.req,\n        where: args.where,\n      })\n\n  const relatedBranchConstraints: Where[] = []\n  const nativeRelatedBranchReads: {\n    branch: string\n    collectionSlug: string\n    relationshipPath: string\n  }[] = []\n  const fieldPaths = getLocalizedPaths({\n    collectionSlug: args.collection,\n    fields: collectionConfig.flattenedFields,\n    incomingPath: args.field,\n    locale: args.locale,\n    overrideAccess: true,\n    payload: this.payload,\n  })\n\n  for (let pathIndex = 1; pathIndex < fieldPaths.length; pathIndex++) {\n    const relatedCollectionSlug = fieldPaths[pathIndex]?.collectionSlug\n\n    if (!relatedCollectionSlug) {\n      continue\n    }\n\n    const relationshipPath = fieldPaths\n      .slice(0, pathIndex)\n      .map(({ path }) => path)\n      .join('.')\n    const relatedBranchReadState = resolveBranchReadState({\n      branch: args.branch,\n      collectionSlug: relatedCollectionSlug,\n      req: args.req,\n    })\n    const relatedWhere = relatedBranchReadState.useBranching\n      ? rewriteBranchIDs(args.relatedAccess?.[relationshipPath])\n      : await resolveBranchQuery({\n          branch: args.branch,\n          collectionSlug: relatedCollectionSlug,\n          req: args.req,\n          where: args.relatedAccess?.[relationshipPath],\n        })\n\n    if (relatedBranchReadState.useBranching) {\n      nativeRelatedBranchReads.push({\n        branch: relatedBranchReadState.branch,\n        collectionSlug: relatedCollectionSlug,\n        relationshipPath,\n      })\n    }\n\n    if (relatedWhere && Object.keys(relatedWhere).length) {\n      relatedBranchConstraints.push(\n        prefixWherePaths({ prefix: relationshipPath, where: relatedWhere }),\n      )\n    }\n  }\n\n  const {\n    joins,\n    orderBy,\n    selectFields,\n    where: queryWhere,\n  } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    tableName,\n    where: {\n      and: [\n        {\n          [args.field]: {\n            equals: DistinctSymbol,\n          },\n        },\n        branchScopedWhere ?? {},\n        ...relatedBranchConstraints,\n      ],\n    },\n  })\n\n  orderBy.pop()\n  const table = this.tables[tableName]\n  const canonicalIDExpression =\n    branchReadState.useBranching && args.field === 'id'\n      ? sql`COALESCE(${table._branchDocID}, ${table.id})`\n      : undefined\n\n  if (canonicalIDExpression) {\n    selectFields['_selected'] = canonicalIDExpression.as('_selected') as unknown as GenericColumn\n  }\n\n  const branchVisibilityWhere = branchReadState.useBranching\n    ? buildBranchVisibility({\n        adapter: this,\n        branch: branchReadState.branch,\n        collectionSlug: args.collection,\n        table,\n      })\n    : undefined\n  const relatedBranchVisibility = nativeRelatedBranchReads.flatMap((relatedBranchRead) => {\n    const relatedTable = joins.find(({ queryPath }) =>\n      queryPath?.endsWith(`${relatedBranchRead.relationshipPath}._target`),\n    )?.table\n\n    return relatedTable\n      ? [\n          buildBranchVisibility({\n            adapter: this,\n            branch: relatedBranchRead.branch,\n            collectionSlug: relatedBranchRead.collectionSlug,\n            table: relatedTable,\n          }),\n        ]\n      : []\n  })\n  const where = and(queryWhere, branchVisibilityWhere, ...relatedBranchVisibility)\n\n  const db = await getTransaction(this, args.req)\n\n  const _order = canonicalIDExpression ? null : getOrderColumn(orderBy, selectFields, joins)\n  const firstSort = Array.isArray(args.sort) ? args.sort[0] : args.sort\n  const canonicalIDOrder = firstSort?.startsWith('-') ? desc : asc\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    forceRun: true,\n    hasAggregates: Boolean(_order) && !joins.length,\n    joins,\n    query: ({ query }) => {\n      if (canonicalIDExpression) {\n        query = query.orderBy(canonicalIDOrder(sql`_selected`))\n      } else if (_order && orderBy.length > 0 && !joins.length) {\n        query = query.orderBy(orderBy[0].order(sql`_order`))\n      } else {\n        query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n      }\n\n      if (args.limit) {\n        if (offset) {\n          query = query.offset(offset)\n        }\n\n        query = query.limit(args.limit)\n      }\n\n      return query\n    },\n    selectFields: {\n      _selected: selectFields['_selected'],\n      ...(_order ? { _order } : {}),\n    } as Record<string, any>,\n    tableName,\n    where,\n  })\n\n  const field = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })?.field\n\n  if (field && 'relationTo' in field && Array.isArray(field.relationTo)) {\n    for (const row of selectDistinctResult as any) {\n      const json = JSON.parse(row._selected)\n      const relationTo = Object.keys(json).find((each) => Boolean(json[each]))\n      const value = json[relationTo]\n\n      if (!value) {\n        row._selected = null\n      } else {\n        row._selected = { relationTo, value }\n      }\n    }\n  }\n\n  const values = selectDistinctResult.map((each) => ({\n    [args.field]: (each as Record<string, any>)._selected,\n  }))\n\n  if (args.limit) {\n    const totalDocs = await this.countDistinct({\n      column: (canonicalIDExpression ?? selectFields['_selected']) as GenericColumn,\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values,\n    }\n  }\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["and","asc","desc","max","sql","getFieldByPath","getLocalizedPaths","resolveBranchQuery","resolveBranchReadState","rewriteBranchIDs","toSnakeCase","buildBranchVisibility","buildQuery","selectDistinct","getTransaction","DistinctSymbol","prefixWherePaths","prefix","where","prefixedWhere","key","value","Object","entries","includes","toLowerCase","Array","isArray","map","nestedWhere","getOrderColumn","orderBy","selectFields","joins","length","column","as","findDistinct","args","collectionConfig","payload","collections","collection","config","page","offset","limit","undefined","tableName","tableNameMap","get","slug","branchReadState","branch","collectionSlug","req","branchScopedWhere","useBranching","relatedBranchConstraints","nativeRelatedBranchReads","fieldPaths","fields","flattenedFields","incomingPath","field","locale","overrideAccess","pathIndex","relatedCollectionSlug","relationshipPath","slice","path","join","relatedBranchReadState","relatedWhere","relatedAccess","push","keys","queryWhere","adapter","sort","equals","pop","table","tables","canonicalIDExpression","_branchDocID","id","branchVisibilityWhere","relatedBranchVisibility","flatMap","relatedBranchRead","relatedTable","find","queryPath","endsWith","db","_order","firstSort","canonicalIDOrder","startsWith","selectDistinctResult","forceRun","hasAggregates","Boolean","query","order","_selected","includeRelationships","relationTo","row","json","JSON","parse","each","values","totalDocs","countDistinct","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage"],"mappings":"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"}

package/dist/findGlobal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findGlobal.d.ts","sourceRoot":"","sources":["../src/findGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAQzC,eAAO,MAAM,UAAU,EAAE,UA4BxB,CAAA"}
+{"version":3,"file":"findGlobal.d.ts","sourceRoot":"","sources":["../src/findGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAezC,eAAO,MAAM,UAAU,EAAE,UAgCxB,CAAA"}

package/dist/findGlobal.js

@@ -1,19 +1,36 @@
+import { branchGlobalNeedsBothRows, pickBranchGlobal, resolveBranch, resolveBranchGlobalQuery, withBranchGlobalSelect } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export const findGlobal = async function findGlobal({ slug, locale, req, select, where }) {
+export const findGlobal = async function findGlobal({ slug, branch, locale, req, select, where }) {
     const globalConfig = this.payload.globals.config.find((config)=>config.slug === slug);
     const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug));
-    const { docs: [doc] } = await findMany({
+    const needsBoth = branchGlobalNeedsBothRows({
+        branch,
+        globalSlug: slug,
+        req
+    });
+    const { docs } = await findMany({
         adapter: this,
         fields: globalConfig.flattenedFields,
-        limit: 1,
+        limit: needsBoth ? 2 : 1,
         locale,
         pagination: false,
         req,
-        select,
+        select: withBranchGlobalSelect({
+            branch,
+            globalSlug: slug,
+            req,
+            select
+        }),
         tableName,
-        where
+        where: resolveBranchGlobalQuery({
+            branch,
+            globalSlug: slug,
+            req,
+            where
+        })
     });
+    const doc = needsBoth ? pickBranchGlobal(docs, branch || resolveBranch(req)) : docs[0];
     if (doc) {
         doc.globalType = slug;
         return doc;

package/dist/findGlobal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findGlobal.ts"],"sourcesContent":["import type { FindGlobal } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobal: FindGlobal = async function findGlobal(\n  this: DrizzleAdapter,\n  { slug, locale, req, select, where },\n) {\n  const globalConfig = this.payload.globals.config.find((config) => config.slug === slug)\n\n  const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug))\n\n  const {\n    docs: [doc],\n  } = await findMany({\n    adapter: this,\n    fields: globalConfig.flattenedFields,\n    limit: 1,\n    locale,\n    pagination: false,\n    req,\n    select,\n    tableName,\n    where,\n  })\n\n  if (doc) {\n    doc.globalType = slug\n    return doc\n  }\n\n  return {}\n}\n"],"names":["toSnakeCase","findMany","findGlobal","slug","locale","req","select","where","globalConfig","payload","globals","config","find","tableName","tableNameMap","get","docs","doc","adapter","fields","flattenedFields","limit","pagination","globalType"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,IAAI,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAEpC,MAAMC,eAAe,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAACD,SAAWA,OAAOR,IAAI,KAAKA;IAElF,MAAMU,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACf,YAAYQ,aAAaL,IAAI;IAErE,MAAM,EACJa,MAAM,CAACC,IAAI,EACZ,GAAG,MAAMhB,SAAS;QACjBiB,SAAS,IAAI;QACbC,QAAQX,aAAaY,eAAe;QACpCC,OAAO;QACPjB;QACAkB,YAAY;QACZjB;QACAC;QACAO;QACAN;IACF;IAEA,IAAIU,KAAK;QACPA,IAAIM,UAAU,GAAGpB;QACjB,OAAOc;IACT;IAEA,OAAO,CAAC;AACV,EAAC"}
+{"version":3,"sources":["../src/findGlobal.ts"],"sourcesContent":["import type { FindGlobal } from 'payload'\n\nimport {\n  branchGlobalNeedsBothRows,\n  pickBranchGlobal,\n  resolveBranch,\n  resolveBranchGlobalQuery,\n  withBranchGlobalSelect,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobal: FindGlobal = async function findGlobal(\n  this: DrizzleAdapter,\n  { slug, branch, locale, req, select, where },\n) {\n  const globalConfig = this.payload.globals.config.find((config) => config.slug === slug)\n\n  const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug))\n\n  const needsBoth = branchGlobalNeedsBothRows({ branch, globalSlug: slug, req })\n\n  const { docs } = await findMany({\n    adapter: this,\n    fields: globalConfig.flattenedFields,\n    limit: needsBoth ? 2 : 1,\n    locale,\n    pagination: false,\n    req,\n    select: withBranchGlobalSelect({ branch, globalSlug: slug, req, select }),\n    tableName,\n    where: resolveBranchGlobalQuery({ branch, globalSlug: slug, req, where }),\n  })\n\n  const doc = needsBoth\n    ? pickBranchGlobal(docs, (branch as string) || resolveBranch(req as never))\n    : docs[0]\n\n  if (doc) {\n    doc.globalType = slug\n    return doc\n  }\n\n  return {}\n}\n"],"names":["branchGlobalNeedsBothRows","pickBranchGlobal","resolveBranch","resolveBranchGlobalQuery","withBranchGlobalSelect","toSnakeCase","findMany","findGlobal","slug","branch","locale","req","select","where","globalConfig","payload","globals","config","find","tableName","tableNameMap","get","needsBoth","globalSlug","docs","adapter","fields","flattenedFields","limit","pagination","doc","globalType"],"mappings":"AAEA,SACEA,yBAAyB,EACzBC,gBAAgB,EAChBC,aAAa,EACbC,wBAAwB,EACxBC,sBAAsB,QACjB,UAAS;AAChB,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAE5C,MAAMC,eAAe,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAACD,SAAWA,OAAOT,IAAI,KAAKA;IAElF,MAAMW,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAChB,YAAYS,aAAaN,IAAI;IAErE,MAAMc,YAAYtB,0BAA0B;QAAES;QAAQc,YAAYf;QAAMG;IAAI;IAE5E,MAAM,EAAEa,IAAI,EAAE,GAAG,MAAMlB,SAAS;QAC9BmB,SAAS,IAAI;QACbC,QAAQZ,aAAaa,eAAe;QACpCC,OAAON,YAAY,IAAI;QACvBZ;QACAmB,YAAY;QACZlB;QACAC,QAAQR,uBAAuB;YAAEK;YAAQc,YAAYf;YAAMG;YAAKC;QAAO;QACvEO;QACAN,OAAOV,yBAAyB;YAAEM;YAAQc,YAAYf;YAAMG;YAAKE;QAAM;IACzE;IAEA,MAAMiB,MAAMR,YACRrB,iBAAiBuB,MAAM,AAACf,UAAqBP,cAAcS,QAC3Da,IAAI,CAAC,EAAE;IAEX,IAAIM,KAAK;QACPA,IAAIC,UAAU,GAAGvB;QACjB,OAAOsB;IACT;IAEA,OAAO,CAAC;AACV,EAAC"}

package/dist/findGlobalVersions.js

@@ -1,7 +1,7 @@
-import { buildVersionGlobalFields } from 'payload';
+import { buildVersionGlobalFields, resolveBranchGlobalVersionQuery } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export const findGlobalVersions = async function findGlobalVersions({ global, limit, locale, page, pagination, req, select, sort: sortArg, where }) {
+export const findGlobalVersions = async function findGlobalVersions({ branch, global, limit, locale, page, pagination, req, select, sort: sortArg, where }) {
     const globalConfig = this.payload.globals.config.find(({ slug })=>slug === global);
     const sort = sortArg !== undefined && sortArg !== null ? sortArg : '-createdAt';
     const tableName = this.tableNameMap.get(`_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`);
@@ -17,7 +17,12 @@ export const findGlobalVersions = async function findGlobalVersions({ global, li
         select,
         sort,
         tableName,
-        where
+        where: resolveBranchGlobalVersionQuery({
+            branch,
+            globalSlug: global,
+            req,
+            where
+        })
     });
 };
 

package/dist/findGlobalVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { FindGlobalVersions, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: DrizzleAdapter,\n  { global, limit, locale, page, pagination, req, select, sort: sortArg, where },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : '-createdAt'\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig, true)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionGlobalFields","toSnakeCase","findMany","findGlobalVersions","global","limit","locale","page","pagination","req","select","sort","sortArg","where","globalConfig","payload","globals","config","find","slug","undefined","tableName","tableNameMap","get","versionsSuffix","fields","adapter"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EAAEC,MAAM,EAAEC,KAAK,EAAEC,MAAM,EAAEC,IAAI,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,MAAMC,OAAO,EAAEC,KAAK,EAAE;IAE9E,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASf;IAEzB,MAAMO,OAAOC,YAAYQ,aAAaR,YAAY,OAAOA,UAAU;IAEnE,MAAMS,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEtB,YAAYa,aAAaK,IAAI,IAAI,IAAI,CAACK,cAAc,EAAE;IAG5D,MAAMC,SAASzB,yBAAyB,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH,cAAc;IAE3E,OAAOZ,SAAS;QACdwB,SAAS,IAAI;QACbD;QACApB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAU;QACAR;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { FindGlobalVersions, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields, resolveBranchGlobalVersionQuery } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: DrizzleAdapter,\n  { branch, global, limit, locale, page, pagination, req, select, sort: sortArg, where },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : '-createdAt'\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig, true)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort,\n    tableName,\n    where: resolveBranchGlobalVersionQuery({ branch, globalSlug: global, req, where }),\n  })\n}\n"],"names":["buildVersionGlobalFields","resolveBranchGlobalVersionQuery","toSnakeCase","findMany","findGlobalVersions","branch","global","limit","locale","page","pagination","req","select","sort","sortArg","where","globalConfig","payload","globals","config","find","slug","undefined","tableName","tableNameMap","get","versionsSuffix","fields","adapter","globalSlug"],"mappings":"AAEA,SAASA,wBAAwB,EAAEC,+BAA+B,QAAQ,UAAS;AACnF,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EAAEC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,MAAM,EAAEC,IAAI,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,MAAMC,OAAO,EAAEC,KAAK,EAAE;IAEtF,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASf;IAEzB,MAAMO,OAAOC,YAAYQ,aAAaR,YAAY,OAAOA,UAAU;IAEnE,MAAMS,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEvB,YAAYc,aAAaK,IAAI,IAAI,IAAI,CAACK,cAAc,EAAE;IAG5D,MAAMC,SAAS3B,yBAAyB,IAAI,CAACiB,OAAO,CAACE,MAAM,EAAEH,cAAc;IAE3E,OAAOb,SAAS;QACdyB,SAAS,IAAI;QACbD;QACApB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAU;QACAR,OAAOd,gCAAgC;YAAEI;YAAQwB,YAAYvB;YAAQK;YAAKI;QAAM;IAClF;AACF,EAAC"}

package/dist/findOne.d.ts

@@ -1,4 +1,4 @@
 import type { FindOneArgs, TypeWithID } from 'payload';
 import type { DrizzleAdapter } from './types.js';
-export declare function findOne<T extends TypeWithID>(this: DrizzleAdapter, { collection, draftsEnabled, joins, locale, req, select, where }: FindOneArgs): Promise<null | T>;
+export declare function findOne<T extends TypeWithID>(this: DrizzleAdapter, { branch, collection, draftsEnabled, joins, locale, req, select, where }: FindOneArgs): Promise<null | T>;
 //# sourceMappingURL=findOne.d.ts.map

package/dist/findOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA6B,UAAU,EAAE,MAAM,SAAS,CAAA;AAIjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,OAAO,CAAC,CAAC,SAAS,UAAU,EAChD,IAAI,EAAE,cAAc,EACpB,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,GAC5E,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAuBnB"}
+{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA6B,UAAU,EAAE,MAAM,SAAS,CAAA;AAWjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,OAAO,CAAC,CAAC,SAAS,UAAU,EAChD,IAAI,EAAE,cAAc,EACpB,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,GACpF,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAsCnB"}

package/dist/findOne.js

@@ -1,10 +1,26 @@
+import { applyBranchIDProjection, resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs, withBranchIDSelect } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export async function findOne({ collection, draftsEnabled, joins, locale, req, select, where }) {
+export async function findOne({ branch, collection, draftsEnabled, joins, locale, req, select, where }) {
     const collectionConfig = this.payload.collections[collection].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug: collection,
+        req
+    });
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchIDs(where) : await resolveBranchQuery({
+        branch,
+        collectionSlug: collection,
+        req,
+        where
+    });
     const { docs } = await findMany({
         adapter: this,
+        branchVisibility: branchReadState.useBranching ? {
+            branch: branchReadState.branch,
+            collectionSlug: collection
+        } : undefined,
         collectionSlug: collection,
         draftsEnabled,
         fields: collectionConfig.flattenedFields,
@@ -14,10 +30,21 @@ export async function findOne({ collection, draftsEnabled, joins, locale, req, s
         page: 1,
         pagination: false,
         req,
-        select,
+        select: withBranchIDSelect({
+            branch,
+            collectionSlug: collection,
+            req,
+            select
+        }),
         sort: undefined,
         tableName,
-        where
+        where: branchedWhere
+    });
+    applyBranchIDProjection({
+        branch,
+        collectionSlug: collection,
+        docs: docs,
+        req
     });
     return docs?.[0] || null;
 }

package/dist/findOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { FindOneArgs, SanitizedCollectionConfig, TypeWithID } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport async function findOne<T extends TypeWithID>(\n  this: DrizzleAdapter,\n  { collection, draftsEnabled, joins, locale, req, select, where }: FindOneArgs,\n): Promise<null | T> {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { docs } = await findMany({\n    adapter: this,\n    collectionSlug: collection,\n    draftsEnabled,\n    fields: collectionConfig.flattenedFields,\n    joins,\n    limit: 1,\n    locale,\n    page: 1,\n    pagination: false,\n    req,\n    select,\n    sort: undefined,\n    tableName,\n    where,\n  })\n\n  return docs?.[0] || null\n}\n"],"names":["toSnakeCase","findMany","findOne","collection","draftsEnabled","joins","locale","req","select","where","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","docs","adapter","collectionSlug","fields","flattenedFields","limit","page","pagination","sort","undefined"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,eAAeC,QAEpB,EAAEC,UAAU,EAAEC,aAAa,EAAEC,KAAK,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAe;IAE7E,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACT,WAAW,CAACU,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAChB,YAAYU,iBAAiBO,IAAI;IAEzE,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMjB,SAAS;QAC9BkB,SAAS,IAAI;QACbC,gBAAgBjB;QAChBC;QACAiB,QAAQX,iBAAiBY,eAAe;QACxCjB;QACAkB,OAAO;QACPjB;QACAkB,MAAM;QACNC,YAAY;QACZlB;QACAC;QACAkB,MAAMC;QACNb;QACAL;IACF;IAEA,OAAOS,MAAM,CAAC,EAAE,IAAI;AACtB"}
+{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { FindOneArgs, SanitizedCollectionConfig, TypeWithID } from 'payload'\n\nimport {\n  applyBranchIDProjection,\n  resolveBranchQuery,\n  resolveBranchReadState,\n  rewriteBranchIDs,\n  withBranchIDSelect,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport async function findOne<T extends TypeWithID>(\n  this: DrizzleAdapter,\n  { branch, collection, draftsEnabled, joins, locale, req, select, where }: FindOneArgs,\n): Promise<null | T> {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const branchReadState = resolveBranchReadState({ branch, collectionSlug: collection, req })\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchIDs(where)\n    : await resolveBranchQuery({ branch, collectionSlug: collection, req, where })\n\n  const { docs } = await findMany({\n    adapter: this,\n    branchVisibility: branchReadState.useBranching\n      ? { branch: branchReadState.branch, collectionSlug: collection }\n      : undefined,\n    collectionSlug: collection,\n    draftsEnabled,\n    fields: collectionConfig.flattenedFields,\n    joins,\n    limit: 1,\n    locale,\n    page: 1,\n    pagination: false,\n    req,\n    select: withBranchIDSelect({ branch, collectionSlug: collection, req, select }),\n    sort: undefined,\n    tableName,\n    where: branchedWhere,\n  })\n\n  applyBranchIDProjection({\n    branch,\n    collectionSlug: collection,\n    docs: docs as Record<string, unknown>[],\n    req,\n  })\n\n  return docs?.[0] || null\n}\n"],"names":["applyBranchIDProjection","resolveBranchQuery","resolveBranchReadState","rewriteBranchIDs","withBranchIDSelect","toSnakeCase","findMany","findOne","branch","collection","draftsEnabled","joins","locale","req","select","where","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","branchReadState","collectionSlug","branchedWhere","useBranching","docs","adapter","branchVisibility","undefined","fields","flattenedFields","limit","page","pagination","sort"],"mappings":"AAEA,SACEA,uBAAuB,EACvBC,kBAAkB,EAClBC,sBAAsB,EACtBC,gBAAgB,EAChBC,kBAAkB,QACb,UAAS;AAChB,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,eAAeC,QAEpB,EAAEC,MAAM,EAAEC,UAAU,EAAEC,aAAa,EAAEC,KAAK,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAe;IAErF,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACT,WAAW,CAACU,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACjB,YAAYW,iBAAiBO,IAAI;IAEzE,MAAMC,kBAAkBtB,uBAAuB;QAAEM;QAAQiB,gBAAgBhB;QAAYI;IAAI;IACzF,MAAMa,gBAAgBF,gBAAgBG,YAAY,GAC9CxB,iBAAiBY,SACjB,MAAMd,mBAAmB;QAAEO;QAAQiB,gBAAgBhB;QAAYI;QAAKE;IAAM;IAE9E,MAAM,EAAEa,IAAI,EAAE,GAAG,MAAMtB,SAAS;QAC9BuB,SAAS,IAAI;QACbC,kBAAkBN,gBAAgBG,YAAY,GAC1C;YAAEnB,QAAQgB,gBAAgBhB,MAAM;YAAEiB,gBAAgBhB;QAAW,IAC7DsB;QACJN,gBAAgBhB;QAChBC;QACAsB,QAAQhB,iBAAiBiB,eAAe;QACxCtB;QACAuB,OAAO;QACPtB;QACAuB,MAAM;QACNC,YAAY;QACZvB;QACAC,QAAQV,mBAAmB;YAAEI;YAAQiB,gBAAgBhB;YAAYI;YAAKC;QAAO;QAC7EuB,MAAMN;QACNX;QACAL,OAAOW;IACT;IAEA1B,wBAAwB;QACtBQ;QACAiB,gBAAgBhB;QAChBmB,MAAMA;QACNf;IACF;IAEA,OAAOe,MAAM,CAAC,EAAE,IAAI;AACtB"}

package/dist/findVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../src/findVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA6B,MAAM,SAAS,CAAA;AAStE,eAAO,MAAM,YAAY,EAAE,YA2B1B,CAAA"}
+{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../src/findVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA6B,MAAM,SAAS,CAAA;AAgBtE,eAAO,MAAM,YAAY,EAAE,YAgD1B,CAAA"}

package/dist/findVersions.js

@@ -1,13 +1,29 @@
-import { buildVersionCollectionFields } from 'payload';
+import { buildVersionCollectionFields, projectBranchVersionParents, resolveBranchReadState, resolveBranchVersionHistoryQuery, rewriteBranchVersionParents, withBranchVersionSelect } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export const findVersions = async function findVersions({ collection, limit, locale, page, pagination, req, select, sort: sortArg, where }) {
+export const findVersions = async function findVersions({ branch, collection, limit, locale, page, pagination, req, select, sort: sortArg, where }) {
     const collectionConfig = this.payload.collections[collection].config;
     const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort;
     const tableName = this.tableNameMap.get(`_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`);
     const fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true);
-    return findMany({
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug: collection,
+        req
+    });
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchVersionParents(where) : await resolveBranchVersionHistoryQuery({
+        branch,
+        collectionSlug: collection,
+        req,
+        where
+    });
+    const result = await findMany({
         adapter: this,
+        branchVisibility: branchReadState.useBranching ? {
+            branch: branchReadState.branch,
+            collectionSlug: collection,
+            mode: 'history'
+        } : undefined,
         fields,
         joins: false,
         limit,
@@ -15,11 +31,22 @@ export const findVersions = async function findVersions({ collection, limit, loc
         page,
         pagination,
         req,
-        select,
+        select: withBranchVersionSelect({
+            branch,
+            collectionSlug: collection,
+            req,
+            select
+        }),
         sort,
         tableName,
-        where
+        where: branchedWhere
     });
+    if (branchReadState.useBranching) {
+        // A branch version hangs off the shadow row, so its `parent` is that row rather
+        // than the document the history belongs to.
+        projectBranchVersionParents(result.docs);
+    }
+    return result;
 };
 
 //# sourceMappingURL=findVersions.js.map

package/dist/findVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions, SanitizedCollectionConfig } from 'payload'\n\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: DrizzleAdapter,\n  { collection, limit, locale, page, pagination, req, select, sort: sortArg, where },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  return findMany({\n    adapter: this,\n    fields,\n    joins: false,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionCollectionFields","toSnakeCase","findMany","findVersions","collection","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","versionsSuffix","fields","adapter","joins"],"mappings":"AAEA,SAASA,4BAA4B,QAAQ,UAAS;AACtD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EAAEC,UAAU,EAAEC,KAAK,EAAEC,MAAM,EAAEC,IAAI,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,MAAMC,OAAO,EAAEC,KAAK,EAAE;IAElF,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAErB,YAAYa,iBAAiBS,IAAI,IAAI,IAAI,CAACC,cAAc,EAAE;IAGhE,MAAMC,SAASzB,6BAA6B,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH,kBAAkB;IAEnF,OAAOZ,SAAS;QACdwB,SAAS,IAAI;QACbD;QACAE,OAAO;QACPtB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAS;QACAP;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions, SanitizedCollectionConfig } from 'payload'\n\nimport {\n  buildVersionCollectionFields,\n  projectBranchVersionParents,\n  resolveBranchReadState,\n  resolveBranchVersionHistoryQuery,\n  rewriteBranchVersionParents,\n  withBranchVersionSelect,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: DrizzleAdapter,\n  { branch, collection, limit, locale, page, pagination, req, select, sort: sortArg, where },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  const branchReadState = resolveBranchReadState({ branch, collectionSlug: collection, req })\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchVersionParents(where)\n    : await resolveBranchVersionHistoryQuery({\n        branch,\n        collectionSlug: collection,\n        req,\n        where,\n      })\n\n  const result = await findMany({\n    adapter: this,\n    branchVisibility: branchReadState.useBranching\n      ? { branch: branchReadState.branch, collectionSlug: collection, mode: 'history' }\n      : undefined,\n    fields,\n    joins: false,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select: withBranchVersionSelect({ branch, collectionSlug: collection, req, select }),\n    sort,\n    tableName,\n    where: branchedWhere,\n  })\n\n  if (branchReadState.useBranching) {\n    // A branch version hangs off the shadow row, so its `parent` is that row rather\n    // than the document the history belongs to.\n    projectBranchVersionParents(result.docs as Record<string, unknown>[])\n  }\n\n  return result\n}\n"],"names":["buildVersionCollectionFields","projectBranchVersionParents","resolveBranchReadState","resolveBranchVersionHistoryQuery","rewriteBranchVersionParents","withBranchVersionSelect","toSnakeCase","findMany","findVersions","branch","collection","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","versionsSuffix","fields","branchReadState","collectionSlug","branchedWhere","useBranching","result","adapter","branchVisibility","mode","joins","docs"],"mappings":"AAEA,SACEA,4BAA4B,EAC5BC,2BAA2B,EAC3BC,sBAAsB,EACtBC,gCAAgC,EAChCC,2BAA2B,EAC3BC,uBAAuB,QAClB,UAAS;AAChB,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EAAEC,MAAM,EAAEC,UAAU,EAAEC,KAAK,EAAEC,MAAM,EAAEC,IAAI,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,MAAMC,OAAO,EAAEC,KAAK,EAAE;IAE1F,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEtB,YAAYc,iBAAiBS,IAAI,IAAI,IAAI,CAACC,cAAc,EAAE;IAGhE,MAAMC,SAAS/B,6BAA6B,IAAI,CAACqB,OAAO,CAACE,MAAM,EAAEH,kBAAkB;IAEnF,MAAMY,kBAAkB9B,uBAAuB;QAAEO;QAAQwB,gBAAgBvB;QAAYK;IAAI;IACzF,MAAMmB,gBAAgBF,gBAAgBG,YAAY,GAC9C/B,4BAA4Be,SAC5B,MAAMhB,iCAAiC;QACrCM;QACAwB,gBAAgBvB;QAChBK;QACAI;IACF;IAEJ,MAAMiB,SAAS,MAAM7B,SAAS;QAC5B8B,SAAS,IAAI;QACbC,kBAAkBN,gBAAgBG,YAAY,GAC1C;YAAE1B,QAAQuB,gBAAgBvB,MAAM;YAAEwB,gBAAgBvB;YAAY6B,MAAM;QAAU,IAC9Ef;QACJO;QACAS,OAAO;QACP7B;QACAC;QACAC;QACAC;QACAC;QACAC,QAAQX,wBAAwB;YAAEI;YAAQwB,gBAAgBvB;YAAYK;YAAKC;QAAO;QAClFC;QACAS;QACAP,OAAOe;IACT;IAEA,IAAIF,gBAAgBG,YAAY,EAAE;QAChC,gFAAgF;QAChF,4CAA4C;QAC5ClC,4BAA4BmC,OAAOK,IAAI;IACzC;IAEA,OAAOL;AACT,EAAC"}

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export { createGlobal } from './createGlobal.js';
 export { createGlobalVersion } from './createGlobalVersion.js';
 export { createTableName } from './createTableName.js';
 export { createVersion } from './createVersion.js';
+export { deleteBranchGlobal } from './deleteBranchGlobal.js';
 export { deleteMany } from './deleteMany.js';
 export { deleteOne } from './deleteOne.js';
 export { deleteVersions } from './deleteVersions.js';
@@ -24,15 +25,16 @@ export { migrateReset } from './migrateReset.js';
 export { migrateStatus } from './migrateStatus.js';
 export { buildQuery } from './queries/buildQuery.js';
 export { operatorMap } from './queries/operatorMap.js';
-export type { Operators } from './queries/operatorMap.js';
+export type { DrizzleResolvedOperator, Operators } from './queries/operatorMap.js';
 export { parseParams } from './queries/parseParams.js';
+export { validateOperatorHandlers } from './queries/validateOperatorHandlers.js';
 export { queryDrafts } from './queryDrafts.js';
 export { buildDrizzleRelations } from './schema/buildDrizzleRelations.js';
 export { buildRawSchema } from './schema/buildRawSchema.js';
 export { beginTransaction } from './transactions/beginTransaction.js';
 export { commitTransaction } from './transactions/commitTransaction.js';
 export { rollbackTransaction } from './transactions/rollbackTransaction.js';
-export type { BaseRawColumn, BlocksToJsonMigrator, BuildDrizzleTable, BuildQueryJoinAliases, ColumnToCodeConverter, CountDistinct, CreateJSONQueryArgs, DeleteWhere, DrizzleAdapter, DrizzleTransaction, DropDatabase, EnumRawColumn, Execute, GenericColumn, GenericColumns, GenericPgColumn, GenericRelation, GenericTable, IDType, Insert, IntegerRawColumn, Migration, PostgresDB, RawColumn, RawForeignKey, RawIndex, RawRelation, RawTable, RelationMap, RequireDrizzleKit, SetColumnID, SQLiteDB, TimestampRawColumn, TransactionPg, TransactionSQLite, UUIDRawColumn, VectorRawColumn, } from './types.js';
+export type { BaseRawColumn, BlocksToJsonMigrator, BuildDrizzleTable, BuildQueryJoinAliases, ColumnToCodeConverter, CountDistinct, CreateJSONQueryArgs, DeleteWhere, DrizzleAdapter, DrizzleOperandTransformHandler, DrizzleOperatorHandler, DrizzleOperatorHandlerContext, DrizzleOperatorReplacementHandler, DrizzleQueryConfig, DrizzleTransaction, DropDatabase, EnumRawColumn, Execute, GenericColumn, GenericColumns, GenericPgColumn, GenericRelation, GenericTable, IDType, Insert, IntegerRawColumn, Migration, PostgresDB, RawColumn, RawForeignKey, RawIndex, RawRelation, RawTable, RelationMap, RequireDrizzleKit, SetColumnID, SQLiteDB, TimestampRawColumn, TransactionPg, TransactionSQLite, UUIDRawColumn, VectorRawColumn, } from './types.js';
 export { updateGlobal } from './updateGlobal.js';
 export { updateGlobalVersion } from './updateGlobalVersion.js';
 export { updateJobs } from './updateJobs.js';
@@ -40,9 +42,11 @@ export { updateMany } from './updateMany.js';
 export { updateOne } from './updateOne.js';
 export { updateVersion } from './updateVersion.js';
 export { upsert } from './upsert.js';
+export { upsertBranchGlobalChange } from './upsertBranchGlobalChange.js';
 export { upsertRow } from './upsertRow/index.js';
 export { buildDynamicPredefinedBlocksToJsonMigration, createBlocksToJsonMigrator, getBlocksToJsonMigrator, } from './utilities/blocksToJsonMigrator.js';
 export { buildCreateMigration } from './utilities/buildCreateMigration.js';
+export { buildDynamicPredefinedSizesToVariantsMigration } from './utilities/buildDynamicPredefinedSizesToVariantsMigration.js';
 export { buildIndexName } from './utilities/buildIndexName.js';
 export { createSchemaGenerator } from './utilities/createSchemaGenerator.js';
 export { executeSchemaHooks } from './utilities/executeSchemaHooks.js';