@payloadcms/drizzle 4.0.0-internal.a6582c6 → 4.0.0-internal.a9d2e4e

package/dist/count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../src/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA6B,MAAM,SAAS,CAAA;AAS/D,eAAO,MAAM,KAAK,EAAE,KA0BnB,CAAA"}
+{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../src/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA6B,MAAM,SAAS,CAAA;AAY/D,eAAO,MAAM,KAAK,EAAE,KAiDnB,CAAA"}

package/dist/count.js

@@ -1,16 +1,38 @@
+import { and } from 'drizzle-orm';
+import { resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs } from 'payload';
 import toSnakeCase from 'to-snake-case';
+import { buildBranchVisibility } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { getTransaction } from './utilities/getTransaction.js';
-export const count = async function count({ collection, locale, req, where: whereArg }) {
+export const count = async function count({ branch, collection, locale, req, where: whereArg }) {
     const collectionConfig = this.payload.collections[collection].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
-    const { joins, where } = buildQuery({
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug: collectionConfig.slug,
+        req
+    });
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchIDs(whereArg) : await resolveBranchQuery({
+        branch,
+        collectionSlug: collectionConfig.slug,
+        req,
+        where: whereArg
+    });
+    const { joins, where: queryWhere } = buildQuery({
         adapter: this,
         fields: collectionConfig.flattenedFields,
         locale,
+        req,
         tableName,
-        where: whereArg
+        where: branchedWhere
     });
+    const branchVisibilityWhere = branchReadState.useBranching ? buildBranchVisibility({
+        adapter: this,
+        branch: branchReadState.branch,
+        collectionSlug: collectionConfig.slug,
+        table: this.tables[tableName]
+    }) : undefined;
+    const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere;
     const db = await getTransaction(this, req);
     const countResult = await this.countDistinct({
         db,

package/dist/count.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/count.ts"],"sourcesContent":["import type { Count, SanitizedCollectionConfig } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const count: Count = async function count(\n  this: DrizzleAdapter,\n  { collection, locale, req, where: whereArg },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { joins, where } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    tableName,\n    where: whereArg,\n  })\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["toSnakeCase","buildQuery","getTransaction","count","collection","locale","req","where","whereArg","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","joins","adapter","fields","flattenedFields","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,QAAe,eAAeA,MAEzC,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAE5C,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACf,YAAYS,iBAAiBO,IAAI;IAEzE,MAAM,EAAEC,KAAK,EAAEV,KAAK,EAAE,GAAGN,WAAW;QAClCiB,SAAS,IAAI;QACbC,QAAQV,iBAAiBW,eAAe;QACxCf;QACAQ;QACAN,OAAOC;IACT;IAEA,MAAMa,KAAK,MAAMnB,eAAe,IAAI,EAAEI;IAEtC,MAAMgB,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAJ;QACAJ;QACAN;IACF;IAEA,OAAO;QAAEiB,WAAWF;IAAY;AAClC,EAAC"}
+{"version":3,"sources":["../src/count.ts"],"sourcesContent":["import type { Count, SanitizedCollectionConfig } from 'payload'\n\nimport { and } from 'drizzle-orm'\nimport { resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildBranchVisibility } from './queries/buildBranchVisibility.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const count: Count = async function count(\n  this: DrizzleAdapter,\n  { branch, collection, locale, req, where: whereArg },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n  const branchReadState = resolveBranchReadState({\n    branch,\n    collectionSlug: collectionConfig.slug,\n    req,\n  })\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchIDs(whereArg)\n    : await resolveBranchQuery({\n        branch,\n        collectionSlug: collectionConfig.slug,\n        req,\n        where: whereArg,\n      })\n\n  const { joins, where: queryWhere } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    req,\n    tableName,\n    where: branchedWhere,\n  })\n  const branchVisibilityWhere = branchReadState.useBranching\n    ? buildBranchVisibility({\n        adapter: this,\n        branch: branchReadState.branch,\n        collectionSlug: collectionConfig.slug,\n        table: this.tables[tableName],\n      })\n    : undefined\n  const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["and","resolveBranchQuery","resolveBranchReadState","rewriteBranchIDs","toSnakeCase","buildBranchVisibility","buildQuery","getTransaction","count","branch","collection","locale","req","where","whereArg","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","branchReadState","collectionSlug","branchedWhere","useBranching","joins","queryWhere","adapter","fields","flattenedFields","branchVisibilityWhere","table","tables","undefined","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,kBAAkB,EAAEC,sBAAsB,EAAEC,gBAAgB,QAAQ,UAAS;AACtF,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,qBAAqB,QAAQ,qCAAoC;AAC1E,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,QAAe,eAAeA,MAEzC,EAAEC,MAAM,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAEpD,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACjB,YAAYW,iBAAiBO,IAAI;IACzE,MAAMC,kBAAkBrB,uBAAuB;QAC7CO;QACAe,gBAAgBT,iBAAiBO,IAAI;QACrCV;IACF;IACA,MAAMa,gBAAgBF,gBAAgBG,YAAY,GAC9CvB,iBAAiBW,YACjB,MAAMb,mBAAmB;QACvBQ;QACAe,gBAAgBT,iBAAiBO,IAAI;QACrCV;QACAC,OAAOC;IACT;IAEJ,MAAM,EAAEa,KAAK,EAAEd,OAAOe,UAAU,EAAE,GAAGtB,WAAW;QAC9CuB,SAAS,IAAI;QACbC,QAAQf,iBAAiBgB,eAAe;QACxCpB;QACAC;QACAO;QACAN,OAAOY;IACT;IACA,MAAMO,wBAAwBT,gBAAgBG,YAAY,GACtDrB,sBAAsB;QACpBwB,SAAS,IAAI;QACbpB,QAAQc,gBAAgBd,MAAM;QAC9Be,gBAAgBT,iBAAiBO,IAAI;QACrCW,OAAO,IAAI,CAACC,MAAM,CAACf,UAAU;IAC/B,KACAgB;IACJ,MAAMtB,QAAQmB,wBAAwBhC,IAAI4B,YAAYI,yBAAyBJ;IAE/E,MAAMQ,KAAK,MAAM7B,eAAe,IAAI,EAAEK;IAEtC,MAAMyB,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAT;QACAR;QACAN;IACF;IAEA,OAAO;QAAE0B,WAAWF;IAAY;AAClC,EAAC"}

package/dist/countGlobalVersions.js

@@ -1,8 +1,8 @@
-import { buildVersionGlobalFields } from 'payload';
+import { buildVersionGlobalFields, resolveBranchGlobalVersionQuery } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { buildQuery } from './queries/buildQuery.js';
 import { getTransaction } from './utilities/getTransaction.js';
-export const countGlobalVersions = async function countGlobalVersions({ global, locale, req, where: whereArg }) {
+export const countGlobalVersions = async function countGlobalVersions({ branch, global, locale, req, where: whereArg }) {
     const globalConfig = this.payload.globals.config.find(({ slug })=>slug === global);
     const tableName = this.tableNameMap.get(`_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`);
     const fields = buildVersionGlobalFields(this.payload.config, globalConfig, true);
@@ -11,7 +11,12 @@ export const countGlobalVersions = async function countGlobalVersions({ global,
         fields,
         locale,
         tableName,
-        where: whereArg
+        where: resolveBranchGlobalVersionQuery({
+            branch,
+            globalSlug: global,
+            req,
+            where: whereArg
+        })
     });
     const db = await getTransaction(this, req);
     const countResult = await this.countDistinct({

package/dist/countGlobalVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/countGlobalVersions.ts"],"sourcesContent":["import type { CountGlobalVersions, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const countGlobalVersions: CountGlobalVersions = async function countGlobalVersions(\n  this: DrizzleAdapter,\n  { global, locale, req, where: whereArg },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\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  const { joins, where } = buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    tableName,\n    where: whereArg,\n  })\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["buildVersionGlobalFields","toSnakeCase","buildQuery","getTransaction","countGlobalVersions","global","locale","req","where","whereArg","globalConfig","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","fields","joins","adapter","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,sBAA2C,eAAeA,oBAErE,EAAEC,MAAM,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAExC,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASV;IAGzB,MAAMW,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEjB,YAAYS,aAAaK,IAAI,IAAI,IAAI,CAACI,cAAc,EAAE;IAG5D,MAAMC,SAASpB,yBAAyB,IAAI,CAACW,OAAO,CAACE,MAAM,EAAEH,cAAc;IAE3E,MAAM,EAAEW,KAAK,EAAEb,KAAK,EAAE,GAAGN,WAAW;QAClCoB,SAAS,IAAI;QACbF;QACAd;QACAU;QACAR,OAAOC;IACT;IAEA,MAAMc,KAAK,MAAMpB,eAAe,IAAI,EAAEI;IAEtC,MAAMiB,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAF;QACAL;QACAR;IACF;IAEA,OAAO;QAAEkB,WAAWF;IAAY;AAClC,EAAC"}
+{"version":3,"sources":["../src/countGlobalVersions.ts"],"sourcesContent":["import type { CountGlobalVersions, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields, resolveBranchGlobalVersionQuery } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const countGlobalVersions: CountGlobalVersions = async function countGlobalVersions(\n  this: DrizzleAdapter,\n  { branch, global, locale, req, where: whereArg },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\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  const { joins, where } = buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    tableName,\n    where: resolveBranchGlobalVersionQuery({ branch, globalSlug: global, req, where: whereArg }),\n  })\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["buildVersionGlobalFields","resolveBranchGlobalVersionQuery","toSnakeCase","buildQuery","getTransaction","countGlobalVersions","branch","global","locale","req","where","whereArg","globalConfig","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","fields","joins","adapter","globalSlug","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,SAASA,wBAAwB,EAAEC,+BAA+B,QAAQ,UAAS;AACnF,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,sBAA2C,eAAeA,oBAErE,EAAEC,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAEhD,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASV;IAGzB,MAAMW,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAElB,YAAYU,aAAaK,IAAI,IAAI,IAAI,CAACI,cAAc,EAAE;IAG5D,MAAMC,SAAStB,yBAAyB,IAAI,CAACa,OAAO,CAACE,MAAM,EAAEH,cAAc;IAE3E,MAAM,EAAEW,KAAK,EAAEb,KAAK,EAAE,GAAGP,WAAW;QAClCqB,SAAS,IAAI;QACbF;QACAd;QACAU;QACAR,OAAOT,gCAAgC;YAAEK;YAAQmB,YAAYlB;YAAQE;YAAKC,OAAOC;QAAS;IAC5F;IAEA,MAAMe,KAAK,MAAMtB,eAAe,IAAI,EAAEK;IAEtC,MAAMkB,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAH;QACAL;QACAR;IACF;IAEA,OAAO;QAAEmB,WAAWF;IAAY;AAClC,EAAC"}

package/dist/countVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countVersions.d.ts","sourceRoot":"","sources":["../src/countVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,SAAS,CAAA;AAUvE,eAAO,MAAM,aAAa,EAAE,aA8B3B,CAAA"}
+{"version":3,"file":"countVersions.d.ts","sourceRoot":"","sources":["../src/countVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,SAAS,CAAA;AAiBvE,eAAO,MAAM,aAAa,EAAE,aAsD3B,CAAA"}

package/dist/countVersions.js

@@ -1,18 +1,43 @@
-import { buildVersionCollectionFields } from 'payload';
+import { and } from 'drizzle-orm';
+import { buildVersionCollectionFields, resolveBranchReadState, resolveBranchVersionHistoryQuery, rewriteBranchVersionParents } from 'payload';
 import toSnakeCase from 'to-snake-case';
+import { buildBranchVisibility } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { getTransaction } from './utilities/getTransaction.js';
-export const countVersions = async function countVersions({ collection, locale, req, where: whereArg }) {
+export const countVersions = async function countVersions({ branch, collection, locale, req, where: whereArg }) {
     const collectionConfig = this.payload.collections[collection].config;
     const tableName = this.tableNameMap.get(`_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`);
     const fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true);
-    const { joins, where } = buildQuery({
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug: collection,
+        req
+    });
+    // Shares the list's predicate so the count in the Versions tab can never
+    // disagree with the rows the Versions view actually renders.
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchVersionParents(whereArg) : await resolveBranchVersionHistoryQuery({
+        branch,
+        collectionSlug: collection,
+        req,
+        where: whereArg
+    });
+    const { joins, where: queryWhere } = buildQuery({
         adapter: this,
         fields,
         locale,
+        req,
         tableName,
-        where: whereArg
+        where: branchedWhere
     });
+    const branchVisibilityWhere = branchReadState.useBranching ? buildBranchVisibility({
+        adapter: this,
+        branch: branchReadState.branch,
+        canonicalIDExpression: undefined,
+        collectionSlug: collection,
+        mode: 'history',
+        table: this.tables[tableName]
+    }) : undefined;
+    const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere;
     const db = await getTransaction(this, req);
     const countResult = await this.countDistinct({
         db,

package/dist/countVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/countVersions.ts"],"sourcesContent":["import type { CountVersions, SanitizedCollectionConfig } from 'payload'\n\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const countVersions: CountVersions = async function countVersions(\n  this: DrizzleAdapter,\n  { collection, locale, req, where: whereArg },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\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 { joins, where } = buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    tableName,\n    where: whereArg,\n  })\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["buildVersionCollectionFields","toSnakeCase","buildQuery","getTransaction","countVersions","collection","locale","req","where","whereArg","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","versionsSuffix","fields","joins","adapter","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,SAASA,4BAA4B,QAAQ,UAAS;AACtD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAE5C,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEf,YAAYS,iBAAiBO,IAAI,IAAI,IAAI,CAACC,cAAc,EAAE;IAGhE,MAAMC,SAASnB,6BAA6B,IAAI,CAACW,OAAO,CAACE,MAAM,EAAEH,kBAAkB;IAEnF,MAAM,EAAEU,KAAK,EAAEZ,KAAK,EAAE,GAAGN,WAAW;QAClCmB,SAAS,IAAI;QACbF;QACAb;QACAQ;QACAN,OAAOC;IACT;IAEA,MAAMa,KAAK,MAAMnB,eAAe,IAAI,EAAEI;IAEtC,MAAMgB,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAF;QACAN;QACAN;IACF;IAEA,OAAO;QAAEiB,WAAWF;IAAY;AAClC,EAAC"}
+{"version":3,"sources":["../src/countVersions.ts"],"sourcesContent":["import type { CountVersions, SanitizedCollectionConfig } from 'payload'\n\nimport { and } from 'drizzle-orm'\nimport {\n  buildVersionCollectionFields,\n  resolveBranchReadState,\n  resolveBranchVersionHistoryQuery,\n  rewriteBranchVersionParents,\n} from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildBranchVisibility } from './queries/buildBranchVisibility.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const countVersions: CountVersions = async function countVersions(\n  this: DrizzleAdapter,\n  { branch, collection, locale, req, where: whereArg },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\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  const branchReadState = resolveBranchReadState({ branch, collectionSlug: collection, req })\n\n  // Shares the list's predicate so the count in the Versions tab can never\n  // disagree with the rows the Versions view actually renders.\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchVersionParents(whereArg)\n    : await resolveBranchVersionHistoryQuery({\n        branch,\n        collectionSlug: collection,\n        req,\n        where: whereArg,\n      })\n\n  const { joins, where: queryWhere } = buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    req,\n    tableName,\n    where: branchedWhere,\n  })\n  const branchVisibilityWhere = branchReadState.useBranching\n    ? buildBranchVisibility({\n        adapter: this,\n        branch: branchReadState.branch,\n        canonicalIDExpression: undefined,\n        collectionSlug: collection,\n        mode: 'history',\n        table: this.tables[tableName],\n      })\n    : undefined\n  const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere\n\n  const db = await getTransaction(this, req)\n\n  const countResult = await this.countDistinct({\n    db,\n    joins,\n    tableName,\n    where,\n  })\n\n  return { totalDocs: countResult }\n}\n"],"names":["and","buildVersionCollectionFields","resolveBranchReadState","resolveBranchVersionHistoryQuery","rewriteBranchVersionParents","toSnakeCase","buildBranchVisibility","buildQuery","getTransaction","countVersions","branch","collection","locale","req","where","whereArg","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","versionsSuffix","fields","branchReadState","collectionSlug","branchedWhere","useBranching","joins","queryWhere","adapter","branchVisibilityWhere","canonicalIDExpression","undefined","mode","table","tables","db","countResult","countDistinct","totalDocs"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SACEC,4BAA4B,EAC5BC,sBAAsB,EACtBC,gCAAgC,EAChCC,2BAA2B,QACtB,UAAS;AAChB,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,qBAAqB,QAAQ,qCAAoC;AAC1E,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,MAAM,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAEpD,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEjB,YAAYW,iBAAiBO,IAAI,IAAI,IAAI,CAACC,cAAc,EAAE;IAGhE,MAAMC,SAASxB,6BAA6B,IAAI,CAACgB,OAAO,CAACE,MAAM,EAAEH,kBAAkB;IACnF,MAAMU,kBAAkBxB,uBAAuB;QAAEQ;QAAQiB,gBAAgBhB;QAAYE;IAAI;IAEzF,yEAAyE;IACzE,6DAA6D;IAC7D,MAAMe,gBAAgBF,gBAAgBG,YAAY,GAC9CzB,4BAA4BW,YAC5B,MAAMZ,iCAAiC;QACrCO;QACAiB,gBAAgBhB;QAChBE;QACAC,OAAOC;IACT;IAEJ,MAAM,EAAEe,KAAK,EAAEhB,OAAOiB,UAAU,EAAE,GAAGxB,WAAW;QAC9CyB,SAAS,IAAI;QACbP;QACAb;QACAC;QACAO;QACAN,OAAOc;IACT;IACA,MAAMK,wBAAwBP,gBAAgBG,YAAY,GACtDvB,sBAAsB;QACpB0B,SAAS,IAAI;QACbtB,QAAQgB,gBAAgBhB,MAAM;QAC9BwB,uBAAuBC;QACvBR,gBAAgBhB;QAChByB,MAAM;QACNC,OAAO,IAAI,CAACC,MAAM,CAAClB,UAAU;IAC/B,KACAe;IACJ,MAAMrB,QAAQmB,wBAAwBjC,IAAI+B,YAAYE,yBAAyBF;IAE/E,MAAMQ,KAAK,MAAM/B,eAAe,IAAI,EAAEK;IAEtC,MAAM2B,cAAc,MAAM,IAAI,CAACC,aAAa,CAAC;QAC3CF;QACAT;QACAV;QACAN;IACF;IAEA,OAAO;QAAE4B,WAAWF;IAAY;AAClC,EAAC"}

package/dist/createGlobalVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAMhD,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EACzE,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,SAAS,EACT,UAAU,EACV,eAAe,EACf,GAAG,EACH,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,uBAAuB,GACzB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CA6C7B"}
+{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAMhD,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EACzE,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,SAAS,EACT,UAAU,EACV,eAAe,EACf,GAAG,EACH,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,uBAAuB,GACzB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CA2D7B"}

package/dist/createGlobalVersion.js

@@ -1,5 +1,5 @@
 import { sql } from 'drizzle-orm';
-import { buildVersionGlobalFields } from 'payload';
+import { buildVersionGlobalFields, MAIN_BRANCH, resolveBranch } from 'payload';
 import { hasDraftsEnabled } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { upsertRow } from './upsertRow/index.js';
@@ -9,12 +9,19 @@ export async function createGlobalVersion({ autosave, createdAt, globalSlug, pub
     const global = this.payload.globals.config.find(({ slug })=>slug === globalSlug);
     const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`);
     const db = getPrimaryDb(this, await getTransaction(this, req));
+    const isBranchable = Boolean(req?.payload?.config?.branching?.branchableGlobals?.has(globalSlug));
+    const versionBranch = isBranchable ? resolveBranch({
+        req: req
+    }) : MAIN_BRANCH;
     const result = await upsertRow({
         adapter: this,
         data: {
             autosave,
             createdAt,
             latest: true,
+            ...isBranchable ? {
+                _branch: versionBranch
+            } : {},
             publishedLocale,
             snapshot,
             updatedAt,
@@ -31,9 +38,17 @@ export async function createGlobalVersion({ autosave, createdAt, globalSlug, pub
     });
     const table = this.tables[tableName];
     if (hasDraftsEnabled(global)) {
+        // Scoped by `_branch` when the global is branchable. Global versions have no
+        // `parent` to separate streams by — every version of a global shares one —
+        // so an unscoped clear would wipe main's latest flag from a branch.
         await this.execute({
             db,
-            sql: sql`
+            sql: isBranchable ? sql`
+          UPDATE ${table}
+          SET latest = false
+          WHERE ${table.id} != ${result.id}
+            AND ${table._branch} = ${versionBranch};
+        ` : sql`
           UPDATE ${table}
           SET latest = false
           WHERE ${table.id} != ${result.id};

package/dist/createGlobalVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import type { CreateGlobalVersionArgs, JsonObject, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionGlobalFields } from 'payload'\nimport { hasDraftsEnabled } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport async function createGlobalVersion<T extends JsonObject = JsonObject>(\n  this: DrizzleAdapter,\n  {\n    autosave,\n    createdAt,\n    globalSlug,\n    publishedLocale,\n    req,\n    returning,\n    select,\n    snapshot,\n    updatedAt,\n    versionData,\n  }: CreateGlobalVersionArgs,\n): Promise<TypeWithVersion<T>> {\n  const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n  const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`)\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const result = await upsertRow<TypeWithVersion<T>>({\n    adapter: this,\n    data: {\n      autosave,\n      createdAt,\n      latest: true,\n      publishedLocale,\n      snapshot,\n      updatedAt,\n      version: versionData,\n    },\n    db,\n    fields: buildVersionGlobalFields(this.payload.config, global, true),\n    globalSlug,\n    ignoreResult: returning === false ? 'idOnly' : false,\n    operation: 'create',\n    req,\n    select,\n    tableName,\n  })\n\n  const table = this.tables[tableName]\n  if (hasDraftsEnabled(global)) {\n    await this.execute({\n      db,\n      sql: sql`\n          UPDATE ${table}\n          SET latest = false\n          WHERE ${table.id} != ${result.id};\n        `,\n    })\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["sql","buildVersionGlobalFields","hasDraftsEnabled","toSnakeCase","upsertRow","getPrimaryDb","getTransaction","createGlobalVersion","autosave","createdAt","globalSlug","publishedLocale","req","returning","select","snapshot","updatedAt","versionData","global","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","db","result","adapter","data","latest","version","fields","ignoreResult","operation","table","tables","execute","id"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,wBAAwB,QAAQ,UAAS;AAClD,SAASC,gBAAgB,QAAQ,iBAAgB;AACjD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,eAAeC,oBAEpB,EACEC,QAAQ,EACRC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACa;IAE1B,MAAMC,SAAS,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASb;IAEvE,MAAMc,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEvB,YAAYe,OAAOK,IAAI,IAAI,IAAI,CAACI,cAAc,EAAE;IAE5F,MAAMC,KAAKvB,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEM;IAEzD,MAAMiB,SAAS,MAAMzB,UAA8B;QACjD0B,SAAS,IAAI;QACbC,MAAM;YACJvB;YACAC;YACAuB,QAAQ;YACRrB;YACAI;YACAC;YACAiB,SAAShB;QACX;QACAW;QACAM,QAAQjC,yBAAyB,IAAI,CAACkB,OAAO,CAACE,MAAM,EAAEH,QAAQ;QAC9DR;QACAyB,cAActB,cAAc,QAAQ,WAAW;QAC/CuB,WAAW;QACXxB;QACAE;QACAU;IACF;IAEA,MAAMa,QAAQ,IAAI,CAACC,MAAM,CAACd,UAAU;IACpC,IAAItB,iBAAiBgB,SAAS;QAC5B,MAAM,IAAI,CAACqB,OAAO,CAAC;YACjBX;YACA5B,KAAKA,GAAG,CAAC;iBACE,EAAEqC,MAAM;;gBAET,EAAEA,MAAMG,EAAE,CAAC,IAAI,EAAEX,OAAOW,EAAE,CAAC;QACnC,CAAC;QACL;IACF;IAEA,IAAI3B,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAOgB;AACT"}
+{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import type { CreateGlobalVersionArgs, JsonObject, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionGlobalFields, MAIN_BRANCH, resolveBranch } from 'payload'\nimport { hasDraftsEnabled } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport async function createGlobalVersion<T extends JsonObject = JsonObject>(\n  this: DrizzleAdapter,\n  {\n    autosave,\n    createdAt,\n    globalSlug,\n    publishedLocale,\n    req,\n    returning,\n    select,\n    snapshot,\n    updatedAt,\n    versionData,\n  }: CreateGlobalVersionArgs,\n): Promise<TypeWithVersion<T>> {\n  const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n  const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`)\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const isBranchable = Boolean(req?.payload?.config?.branching?.branchableGlobals?.has(globalSlug))\n  const versionBranch = isBranchable ? resolveBranch({ req: req as never }) : MAIN_BRANCH\n\n  const result = await upsertRow<TypeWithVersion<T>>({\n    adapter: this,\n    data: {\n      autosave,\n      createdAt,\n      latest: true,\n      ...(isBranchable ? { _branch: versionBranch } : {}),\n      publishedLocale,\n      snapshot,\n      updatedAt,\n      version: versionData,\n    },\n    db,\n    fields: buildVersionGlobalFields(this.payload.config, global, true),\n    globalSlug,\n    ignoreResult: returning === false ? 'idOnly' : false,\n    operation: 'create',\n    req,\n    select,\n    tableName,\n  })\n\n  const table = this.tables[tableName]\n  if (hasDraftsEnabled(global)) {\n    // Scoped by `_branch` when the global is branchable. Global versions have no\n    // `parent` to separate streams by — every version of a global shares one —\n    // so an unscoped clear would wipe main's latest flag from a branch.\n    await this.execute({\n      db,\n      sql: isBranchable\n        ? sql`\n          UPDATE ${table}\n          SET latest = false\n          WHERE ${table.id} != ${result.id}\n            AND ${table._branch} = ${versionBranch};\n        `\n        : sql`\n          UPDATE ${table}\n          SET latest = false\n          WHERE ${table.id} != ${result.id};\n        `,\n    })\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["sql","buildVersionGlobalFields","MAIN_BRANCH","resolveBranch","hasDraftsEnabled","toSnakeCase","upsertRow","getPrimaryDb","getTransaction","createGlobalVersion","autosave","createdAt","globalSlug","publishedLocale","req","returning","select","snapshot","updatedAt","versionData","global","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","db","isBranchable","Boolean","branching","branchableGlobals","has","versionBranch","result","adapter","data","latest","_branch","version","fields","ignoreResult","operation","table","tables","execute","id"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,wBAAwB,EAAEC,WAAW,EAAEC,aAAa,QAAQ,UAAS;AAC9E,SAASC,gBAAgB,QAAQ,iBAAgB;AACjD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,eAAeC,oBAEpB,EACEC,QAAQ,EACRC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACa;IAE1B,MAAMC,SAAS,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASb;IAEvE,MAAMc,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEvB,YAAYe,OAAOK,IAAI,IAAI,IAAI,CAACI,cAAc,EAAE;IAE5F,MAAMC,KAAKvB,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEM;IAEzD,MAAMiB,eAAeC,QAAQlB,KAAKO,SAASE,QAAQU,WAAWC,mBAAmBC,IAAIvB;IACrF,MAAMwB,gBAAgBL,eAAe5B,cAAc;QAAEW,KAAKA;IAAa,KAAKZ;IAE5E,MAAMmC,SAAS,MAAM/B,UAA8B;QACjDgC,SAAS,IAAI;QACbC,MAAM;YACJ7B;YACAC;YACA6B,QAAQ;YACR,GAAIT,eAAe;gBAAEU,SAASL;YAAc,IAAI,CAAC,CAAC;YAClDvB;YACAI;YACAC;YACAwB,SAASvB;QACX;QACAW;QACAa,QAAQ1C,yBAAyB,IAAI,CAACoB,OAAO,CAACE,MAAM,EAAEH,QAAQ;QAC9DR;QACAgC,cAAc7B,cAAc,QAAQ,WAAW;QAC/C8B,WAAW;QACX/B;QACAE;QACAU;IACF;IAEA,MAAMoB,QAAQ,IAAI,CAACC,MAAM,CAACrB,UAAU;IACpC,IAAItB,iBAAiBgB,SAAS;QAC5B,6EAA6E;QAC7E,2EAA2E;QAC3E,oEAAoE;QACpE,MAAM,IAAI,CAAC4B,OAAO,CAAC;YACjBlB;YACA9B,KAAK+B,eACD/B,GAAG,CAAC;iBACG,EAAE8C,MAAM;;gBAET,EAAEA,MAAMG,EAAE,CAAC,IAAI,EAAEZ,OAAOY,EAAE,CAAC;gBAC3B,EAAEH,MAAML,OAAO,CAAC,GAAG,EAAEL,cAAc;QAC3C,CAAC,GACCpC,GAAG,CAAC;iBACG,EAAE8C,MAAM;;gBAET,EAAEA,MAAMG,EAAE,CAAC,IAAI,EAAEZ,OAAOY,EAAE,CAAC;QACnC,CAAC;QACL;IACF;IAEA,IAAIlC,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAOsB;AACT"}

package/dist/createTableName.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTableName.d.ts","sourceRoot":"","sources":["../src/createTableName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAK/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IAChE,8CAA8C;IAC9C,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,mGAAmG;IACnG,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,uHAAuH;IACvH,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,mIAAmI;IACnI,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,mHAAmH;IACnH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,sIAUzB,IAAI,KAAG,MA2CT,CAAA"}
+{"version":3,"file":"createTableName.d.ts","sourceRoot":"","sources":["../src/createTableName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IAChE,8CAA8C;IAC9C,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,mGAAmG;IACnG,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,uHAAuH;IACvH,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,mIAAmI;IACnI,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,mHAAmH;IACnH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,sIAUzB,IAAI,KAAG,MAmCT,CAAA"}

package/dist/createTableName.js

@@ -1,5 +1,5 @@
-import { APIError } from 'payload';
 import toSnakeCase from 'to-snake-case';
+import { validateIdentifierLength } from './utilities/validateIdentifierLength.js';
 /**
  * Used to name database enums and tables
  * Returns the table or enum name for a given entity
@@ -26,12 +26,7 @@ import toSnakeCase from 'to-snake-case';
     if (!throwValidationError) {
         return result;
     }
-    if (result.length > 63) {
-        throw new APIError(`Exceeded max identifier length for table or enum name of 63 characters. Invalid name: ${result}.
-Tip: You can use the dbName property to reduce the table name length.
-      `);
-    }
-    return result;
+    return validateIdentifierLength(result);
 };
 
 //# sourceMappingURL=createTableName.js.map

package/dist/createTableName.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createTableName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\nimport { APIError } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\ntype Args = {\n  adapter: Pick<DrizzleAdapter, 'tableNameMap' | 'versionsSuffix'>\n  /** The collection, global or field config **/\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  /** For nested tables passed for the user custom dbName functions to handle their own iterations */\n  parentTableName?: string\n  /** For sub tables (array for example) this needs to include the parentTableName */\n  prefix?: string\n  /** For tables based on fields that could have both enumName and dbName (ie: select with hasMany), default: 'dbName' */\n  target?: 'dbName' | 'enumName'\n  /** Throws error if true for postgres when table and enum names exceed 63 characters */\n  throwValidationError?: boolean\n  /** Adds the versions suffix to the default table name - should only be used on the base collection to avoid duplicate suffixing */\n  versions?: boolean\n  /** Adds the versions suffix to custom dbName only - this is used while creating blocks / selects / arrays / etc */\n  versionsCustomName?: boolean\n}\n\n/**\n * Used to name database enums and tables\n * Returns the table or enum name for a given entity\n */\nexport const createTableName = ({\n  adapter,\n  config: { name, slug },\n  config,\n  parentTableName,\n  prefix = '',\n  target = 'dbName',\n  throwValidationError = false,\n  versions = false,\n  versionsCustomName = false,\n}: Args): string => {\n  let customNameDefinition = config[target]\n\n  let defaultTableName = `${prefix}${toSnakeCase(name ?? slug)}`\n\n  if (versions) {\n    defaultTableName = `_${defaultTableName}${adapter.versionsSuffix}`\n  }\n\n  let customTableNameResult: string\n\n  if (!customNameDefinition && target === 'enumName') {\n    customNameDefinition = config['dbName']\n  }\n\n  if (customNameDefinition) {\n    customTableNameResult =\n      typeof customNameDefinition === 'function'\n        ? customNameDefinition({ tableName: parentTableName })\n        : customNameDefinition\n\n    if (versionsCustomName) {\n      customTableNameResult = `_${customTableNameResult}${adapter.versionsSuffix}`\n    }\n  }\n\n  const result = customTableNameResult || defaultTableName\n\n  adapter.tableNameMap.set(defaultTableName, result)\n\n  if (!throwValidationError) {\n    return result\n  }\n\n  if (result.length > 63) {\n    throw new APIError(\n      `Exceeded max identifier length for table or enum name of 63 characters. Invalid name: ${result}.\nTip: You can use the dbName property to reduce the table name length.\n      `,\n    )\n  }\n\n  return result\n}\n"],"names":["APIError","toSnakeCase","createTableName","adapter","config","name","slug","parentTableName","prefix","target","throwValidationError","versions","versionsCustomName","customNameDefinition","defaultTableName","versionsSuffix","customTableNameResult","tableName","result","tableNameMap","set","length"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAClC,OAAOC,iBAAiB,gBAAe;AA2BvC;;;CAGC,GACD,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,OAAO,EACPC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,eAAe,EACfC,SAAS,EAAE,EACXC,SAAS,QAAQ,EACjBC,uBAAuB,KAAK,EAC5BC,WAAW,KAAK,EAChBC,qBAAqB,KAAK,EACrB;IACL,IAAIC,uBAAuBT,MAAM,CAACK,OAAO;IAEzC,IAAIK,mBAAmB,GAAGN,SAASP,YAAYI,QAAQC,OAAO;IAE9D,IAAIK,UAAU;QACZG,mBAAmB,CAAC,CAAC,EAAEA,mBAAmBX,QAAQY,cAAc,EAAE;IACpE;IAEA,IAAIC;IAEJ,IAAI,CAACH,wBAAwBJ,WAAW,YAAY;QAClDI,uBAAuBT,MAAM,CAAC,SAAS;IACzC;IAEA,IAAIS,sBAAsB;QACxBG,wBACE,OAAOH,yBAAyB,aAC5BA,qBAAqB;YAAEI,WAAWV;QAAgB,KAClDM;QAEN,IAAID,oBAAoB;YACtBI,wBAAwB,CAAC,CAAC,EAAEA,wBAAwBb,QAAQY,cAAc,EAAE;QAC9E;IACF;IAEA,MAAMG,SAASF,yBAAyBF;IAExCX,QAAQgB,YAAY,CAACC,GAAG,CAACN,kBAAkBI;IAE3C,IAAI,CAACR,sBAAsB;QACzB,OAAOQ;IACT;IAEA,IAAIA,OAAOG,MAAM,GAAG,IAAI;QACtB,MAAM,IAAIrB,SACR,CAAC,sFAAsF,EAAEkB,OAAO;;MAEhG,CAAC;IAEL;IAEA,OAAOA;AACT,EAAC"}
+{"version":3,"sources":["../src/createTableName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { validateIdentifierLength } from './utilities/validateIdentifierLength.js'\n\ntype Args = {\n  adapter: Pick<DrizzleAdapter, 'tableNameMap' | 'versionsSuffix'>\n  /** The collection, global or field config **/\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  /** For nested tables passed for the user custom dbName functions to handle their own iterations */\n  parentTableName?: string\n  /** For sub tables (array for example) this needs to include the parentTableName */\n  prefix?: string\n  /** For tables based on fields that could have both enumName and dbName (ie: select with hasMany), default: 'dbName' */\n  target?: 'dbName' | 'enumName'\n  /** Throws error if true for postgres when table and enum names exceed 63 characters */\n  throwValidationError?: boolean\n  /** Adds the versions suffix to the default table name - should only be used on the base collection to avoid duplicate suffixing */\n  versions?: boolean\n  /** Adds the versions suffix to custom dbName only - this is used while creating blocks / selects / arrays / etc */\n  versionsCustomName?: boolean\n}\n\n/**\n * Used to name database enums and tables\n * Returns the table or enum name for a given entity\n */\nexport const createTableName = ({\n  adapter,\n  config: { name, slug },\n  config,\n  parentTableName,\n  prefix = '',\n  target = 'dbName',\n  throwValidationError = false,\n  versions = false,\n  versionsCustomName = false,\n}: Args): string => {\n  let customNameDefinition = config[target]\n\n  let defaultTableName = `${prefix}${toSnakeCase(name ?? slug)}`\n\n  if (versions) {\n    defaultTableName = `_${defaultTableName}${adapter.versionsSuffix}`\n  }\n\n  let customTableNameResult: string\n\n  if (!customNameDefinition && target === 'enumName') {\n    customNameDefinition = config['dbName']\n  }\n\n  if (customNameDefinition) {\n    customTableNameResult =\n      typeof customNameDefinition === 'function'\n        ? customNameDefinition({ tableName: parentTableName })\n        : customNameDefinition\n\n    if (versionsCustomName) {\n      customTableNameResult = `_${customTableNameResult}${adapter.versionsSuffix}`\n    }\n  }\n\n  const result = customTableNameResult || defaultTableName\n\n  adapter.tableNameMap.set(defaultTableName, result)\n\n  if (!throwValidationError) {\n    return result\n  }\n\n  return validateIdentifierLength(result)\n}\n"],"names":["toSnakeCase","validateIdentifierLength","createTableName","adapter","config","name","slug","parentTableName","prefix","target","throwValidationError","versions","versionsCustomName","customNameDefinition","defaultTableName","versionsSuffix","customTableNameResult","tableName","result","tableNameMap","set"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,wBAAwB,QAAQ,0CAAyC;AAyBlF;;;CAGC,GACD,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,OAAO,EACPC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,eAAe,EACfC,SAAS,EAAE,EACXC,SAAS,QAAQ,EACjBC,uBAAuB,KAAK,EAC5BC,WAAW,KAAK,EAChBC,qBAAqB,KAAK,EACrB;IACL,IAAIC,uBAAuBT,MAAM,CAACK,OAAO;IAEzC,IAAIK,mBAAmB,GAAGN,SAASR,YAAYK,QAAQC,OAAO;IAE9D,IAAIK,UAAU;QACZG,mBAAmB,CAAC,CAAC,EAAEA,mBAAmBX,QAAQY,cAAc,EAAE;IACpE;IAEA,IAAIC;IAEJ,IAAI,CAACH,wBAAwBJ,WAAW,YAAY;QAClDI,uBAAuBT,MAAM,CAAC,SAAS;IACzC;IAEA,IAAIS,sBAAsB;QACxBG,wBACE,OAAOH,yBAAyB,aAC5BA,qBAAqB;YAAEI,WAAWV;QAAgB,KAClDM;QAEN,IAAID,oBAAoB;YACtBI,wBAAwB,CAAC,CAAC,EAAEA,wBAAwBb,QAAQY,cAAc,EAAE;QAC9E;IACF;IAEA,MAAMG,SAASF,yBAAyBF;IAExCX,QAAQgB,YAAY,CAACC,GAAG,CAACN,kBAAkBI;IAE3C,IAAI,CAACR,sBAAsB;QACzB,OAAOQ;IACT;IAEA,OAAOjB,yBAAyBiB;AAClC,EAAC"}

package/dist/createVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAMhD,wBAAsB,aAAa,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EACnE,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,cAAc,EACd,SAAS,EACT,MAAM,EACN,eAAe,EACf,GAAG,EACH,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CA8D7B"}
+{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAMhD,wBAAsB,aAAa,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EACnE,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,cAAc,EACd,SAAS,EACT,MAAM,EACN,eAAe,EACf,GAAG,EACH,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CA6E7B"}

package/dist/createVersion.js

@@ -1,5 +1,5 @@
 import { sql } from 'drizzle-orm';
-import { buildVersionCollectionFields } from 'payload';
+import { buildVersionCollectionFields, resolveBranchVersionParent } from 'payload';
 import { hasDraftsEnabled } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { upsertRow } from './upsertRow/index.js';
@@ -14,6 +14,13 @@ export async function createVersion({ autosave, collectionSlug, createdAt, paren
     }
     const defaultTableName = toSnakeCase(collection.slug);
     const tableName = this.tableNameMap.get(`_${defaultTableName}${this.versionsSuffix}`);
+    const branched = await resolveBranchVersionParent({
+        collectionSlug,
+        parent,
+        req,
+        versionData: versionData
+    });
+    parent = branched.parent;
     const version = {
         ...versionData
     };
@@ -25,6 +32,10 @@ export async function createVersion({ autosave, collectionSlug, createdAt, paren
         createdAt,
         latest: true,
         parent,
+        ...branched.versionData._branch ? {
+            _branch: branched.versionData._branch,
+            _branchParent: branched.versionData._branchParent
+        } : {},
         publishedLocale,
         snapshot,
         updatedAt,

package/dist/createVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import type { CreateVersionArgs, JsonObject, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionCollectionFields } from 'payload'\nimport { hasDraftsEnabled } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport async function createVersion<T extends JsonObject = JsonObject>(\n  this: DrizzleAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    returning,\n    select,\n    snapshot,\n    updatedAt,\n    versionData,\n  }: CreateVersionArgs<T>,\n): Promise<TypeWithVersion<T>> {\n  const collection = this.payload.collections[collectionSlug].config\n  if (collection.versions.drafts) {\n    if (typeof select === 'object') {\n      select.updatedAt = true\n    }\n  }\n\n  const defaultTableName = toSnakeCase(collection.slug)\n  const tableName = this.tableNameMap.get(`_${defaultTableName}${this.versionsSuffix}`)\n\n  const version = { ...versionData }\n  if (version.id) {\n    delete version.id\n  }\n\n  const data: Record<string, unknown> = {\n    autosave,\n    createdAt,\n    latest: true,\n    parent,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version,\n  }\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const result = await upsertRow<TypeWithVersion<T>>({\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: buildVersionCollectionFields(this.payload.config, collection, true),\n    ignoreResult: returning === false ? 'idOnly' : undefined,\n    operation: 'create',\n    req,\n    select,\n    tableName,\n  })\n\n  const table = this.tables[tableName]\n\n  if (hasDraftsEnabled(collection)) {\n    await this.execute({\n      db,\n      sql: sql`\n        UPDATE ${table}\n        SET latest = false\n        WHERE ${table.id} != ${result.id}\n          AND ${table.parent} = ${parent}\n          AND ${table.updatedAt} < ${result.updatedAt || updatedAt}\n      `,\n    })\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["sql","buildVersionCollectionFields","hasDraftsEnabled","toSnakeCase","upsertRow","getPrimaryDb","getTransaction","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","returning","select","snapshot","updatedAt","versionData","collection","payload","collections","config","versions","drafts","defaultTableName","slug","tableName","tableNameMap","get","versionsSuffix","version","id","data","latest","db","result","adapter","fields","ignoreResult","undefined","operation","table","tables","execute"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,4BAA4B,QAAQ,UAAS;AACtD,SAASC,gBAAgB,QAAQ,iBAAgB;AACjD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,eAAeC,cAEpB,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACU;IAEvB,MAAMC,aAAa,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,eAAe,CAACa,MAAM;IAClE,IAAIH,WAAWI,QAAQ,CAACC,MAAM,EAAE;QAC9B,IAAI,OAAOT,WAAW,UAAU;YAC9BA,OAAOE,SAAS,GAAG;QACrB;IACF;IAEA,MAAMQ,mBAAmBtB,YAAYgB,WAAWO,IAAI;IACpD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEJ,mBAAmB,IAAI,CAACK,cAAc,EAAE;IAEpF,MAAMC,UAAU;QAAE,GAAGb,WAAW;IAAC;IACjC,IAAIa,QAAQC,EAAE,EAAE;QACd,OAAOD,QAAQC,EAAE;IACnB;IAEA,MAAMC,OAAgC;QACpCzB;QACAE;QACAwB,QAAQ;QACRvB;QACAC;QACAI;QACAC;QACAc;IACF;IAEA,MAAMI,KAAK9B,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEO;IAEzD,MAAMuB,SAAS,MAAMhC,UAA8B;QACjDiC,SAAS,IAAI;QACb5B;QACAwB;QACAE;QACAG,QAAQrC,6BAA6B,IAAI,CAACmB,OAAO,CAACE,MAAM,EAAEH,YAAY;QACtEoB,cAAczB,cAAc,QAAQ,WAAW0B;QAC/CC,WAAW;QACX5B;QACAE;QACAY;IACF;IAEA,MAAMe,QAAQ,IAAI,CAACC,MAAM,CAAChB,UAAU;IAEpC,IAAIzB,iBAAiBiB,aAAa;QAChC,MAAM,IAAI,CAACyB,OAAO,CAAC;YACjBT;YACAnC,KAAKA,GAAG,CAAC;eACA,EAAE0C,MAAM;;cAET,EAAEA,MAAMV,EAAE,CAAC,IAAI,EAAEI,OAAOJ,EAAE,CAAC;cAC3B,EAAEU,MAAM/B,MAAM,CAAC,GAAG,EAAEA,OAAO;cAC3B,EAAE+B,MAAMzB,SAAS,CAAC,GAAG,EAAEmB,OAAOnB,SAAS,IAAIA,UAAU;MAC7D,CAAC;QACH;IACF;IAEA,IAAIH,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAOsB;AACT"}
+{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import type { CreateVersionArgs, JsonObject, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionCollectionFields, resolveBranchVersionParent } from 'payload'\nimport { hasDraftsEnabled } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport async function createVersion<T extends JsonObject = JsonObject>(\n  this: DrizzleAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    returning,\n    select,\n    snapshot,\n    updatedAt,\n    versionData,\n  }: CreateVersionArgs<T>,\n): Promise<TypeWithVersion<T>> {\n  const collection = this.payload.collections[collectionSlug].config\n  if (collection.versions.drafts) {\n    if (typeof select === 'object') {\n      select.updatedAt = true\n    }\n  }\n\n  const defaultTableName = toSnakeCase(collection.slug)\n  const tableName = this.tableNameMap.get(`_${defaultTableName}${this.versionsSuffix}`)\n\n  const branched = await resolveBranchVersionParent({\n    collectionSlug,\n    parent,\n    req,\n    versionData: versionData as Record<string, unknown>,\n  })\n\n  parent = branched.parent\n\n  const version = { ...versionData }\n  if (version.id) {\n    delete version.id\n  }\n\n  const data: Record<string, unknown> = {\n    autosave,\n    createdAt,\n    latest: true,\n    parent,\n    ...(branched.versionData._branch\n      ? {\n          _branch: branched.versionData._branch,\n          _branchParent: branched.versionData._branchParent,\n        }\n      : {}),\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version,\n  }\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const result = await upsertRow<TypeWithVersion<T>>({\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: buildVersionCollectionFields(this.payload.config, collection, true),\n    ignoreResult: returning === false ? 'idOnly' : undefined,\n    operation: 'create',\n    req,\n    select,\n    tableName,\n  })\n\n  const table = this.tables[tableName]\n\n  if (hasDraftsEnabled(collection)) {\n    await this.execute({\n      db,\n      sql: sql`\n        UPDATE ${table}\n        SET latest = false\n        WHERE ${table.id} != ${result.id}\n          AND ${table.parent} = ${parent}\n          AND ${table.updatedAt} < ${result.updatedAt || updatedAt}\n      `,\n    })\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["sql","buildVersionCollectionFields","resolveBranchVersionParent","hasDraftsEnabled","toSnakeCase","upsertRow","getPrimaryDb","getTransaction","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","returning","select","snapshot","updatedAt","versionData","collection","payload","collections","config","versions","drafts","defaultTableName","slug","tableName","tableNameMap","get","versionsSuffix","branched","version","id","data","latest","_branch","_branchParent","db","result","adapter","fields","ignoreResult","undefined","operation","table","tables","execute"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,4BAA4B,EAAEC,0BAA0B,QAAQ,UAAS;AAClF,SAASC,gBAAgB,QAAQ,iBAAgB;AACjD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,eAAeC,cAEpB,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACU;IAEvB,MAAMC,aAAa,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,eAAe,CAACa,MAAM;IAClE,IAAIH,WAAWI,QAAQ,CAACC,MAAM,EAAE;QAC9B,IAAI,OAAOT,WAAW,UAAU;YAC9BA,OAAOE,SAAS,GAAG;QACrB;IACF;IAEA,MAAMQ,mBAAmBtB,YAAYgB,WAAWO,IAAI;IACpD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEJ,mBAAmB,IAAI,CAACK,cAAc,EAAE;IAEpF,MAAMC,WAAW,MAAM9B,2BAA2B;QAChDQ;QACAE;QACAE;QACAK,aAAaA;IACf;IAEAP,SAASoB,SAASpB,MAAM;IAExB,MAAMqB,UAAU;QAAE,GAAGd,WAAW;IAAC;IACjC,IAAIc,QAAQC,EAAE,EAAE;QACd,OAAOD,QAAQC,EAAE;IACnB;IAEA,MAAMC,OAAgC;QACpC1B;QACAE;QACAyB,QAAQ;QACRxB;QACA,GAAIoB,SAASb,WAAW,CAACkB,OAAO,GAC5B;YACEA,SAASL,SAASb,WAAW,CAACkB,OAAO;YACrCC,eAAeN,SAASb,WAAW,CAACmB,aAAa;QACnD,IACA,CAAC,CAAC;QACNzB;QACAI;QACAC;QACAe;IACF;IAEA,MAAMM,KAAKjC,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEO;IAEzD,MAAM0B,SAAS,MAAMnC,UAA8B;QACjDoC,SAAS,IAAI;QACb/B;QACAyB;QACAI;QACAG,QAAQzC,6BAA6B,IAAI,CAACoB,OAAO,CAACE,MAAM,EAAEH,YAAY;QACtEuB,cAAc5B,cAAc,QAAQ,WAAW6B;QAC/CC,WAAW;QACX/B;QACAE;QACAY;IACF;IAEA,MAAMkB,QAAQ,IAAI,CAACC,MAAM,CAACnB,UAAU;IAEpC,IAAIzB,iBAAiBiB,aAAa;QAChC,MAAM,IAAI,CAAC4B,OAAO,CAAC;YACjBT;YACAvC,KAAKA,GAAG,CAAC;eACA,EAAE8C,MAAM;;cAET,EAAEA,MAAMZ,EAAE,CAAC,IAAI,EAAEM,OAAON,EAAE,CAAC;cAC3B,EAAEY,MAAMlC,MAAM,CAAC,GAAG,EAAEA,OAAO;cAC3B,EAAEkC,MAAM5B,SAAS,CAAC,GAAG,EAAEsB,OAAOtB,SAAS,IAAIA,UAAU;MAC7D,CAAC;QACH;IACF;IAEA,IAAIH,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAOyB;AACT"}

package/dist/deleteBranchGlobal.d.ts

@@ -0,0 +1,10 @@
+import type { DeleteBranchGlobal } from 'payload';
+/**
+ * Drops a branch's copy of a global.
+ *
+ * Each global has its own table holding one row per branch, so this deletes by the branch
+ * column. Main's row uses the `main` sentinel, and `branch` is always a real non-main
+ * branch by the time this is called, so main's row can never match.
+ */
+export declare const deleteBranchGlobal: DeleteBranchGlobal;
+//# sourceMappingURL=deleteBranchGlobal.d.ts.map

package/dist/deleteBranchGlobal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteBranchGlobal.d.ts","sourceRoot":"","sources":["../src/deleteBranchGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAUjD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAqBhC,CAAA"}

package/dist/deleteBranchGlobal.js

@@ -0,0 +1,27 @@
+import { eq } from 'drizzle-orm';
+import toSnakeCase from 'to-snake-case';
+import { getTransaction } from './utilities/getTransaction.js';
+import { markWrite } from './utilities/readAfterWrite.js';
+/**
+ * Drops a branch's copy of a global.
+ *
+ * Each global has its own table holding one row per branch, so this deletes by the branch
+ * column. Main's row uses the `main` sentinel, and `branch` is always a real non-main
+ * branch by the time this is called, so main's row can never match.
+ */ export const deleteBranchGlobal = async function deleteBranchGlobal({ branch, globalSlug, req }) {
+    const tableName = this.tableNameMap.get(toSnakeCase(globalSlug));
+    const table = this.tables[tableName];
+    // Absent when branching is off for this global, in which case there is no copy to drop.
+    if (!table?._branch) {
+        return;
+    }
+    const db = await getTransaction(this, req);
+    await this.deleteWhere({
+        db,
+        tableName,
+        where: eq(table._branch, branch)
+    });
+    markWrite(this);
+};
+
+//# sourceMappingURL=deleteBranchGlobal.js.map

package/dist/deleteBranchGlobal.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/deleteBranchGlobal.ts"],"sourcesContent":["import type { DeleteBranchGlobal } from 'payload'\n\nimport { eq } from 'drizzle-orm'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\n/**\n * Drops a branch's copy of a global.\n *\n * Each global has its own table holding one row per branch, so this deletes by the branch\n * column. Main's row uses the `main` sentinel, and `branch` is always a real non-main\n * branch by the time this is called, so main's row can never match.\n */\nexport const deleteBranchGlobal: DeleteBranchGlobal = async function deleteBranchGlobal(\n  this: DrizzleAdapter,\n  { branch, globalSlug, req },\n) {\n  const tableName = this.tableNameMap.get(toSnakeCase(globalSlug))\n  const table = this.tables[tableName]\n\n  // Absent when branching is off for this global, in which case there is no copy to drop.\n  if (!table?._branch) {\n    return\n  }\n\n  const db = await getTransaction(this, req)\n\n  await this.deleteWhere({\n    db,\n    tableName,\n    where: eq(table._branch, branch),\n  })\n\n  markWrite(this)\n}\n"],"names":["eq","toSnakeCase","getTransaction","markWrite","deleteBranchGlobal","branch","globalSlug","req","tableName","tableNameMap","get","table","tables","_branch","db","deleteWhere","where"],"mappings":"AAEA,SAASA,EAAE,QAAQ,cAAa;AAChC,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,SAAS,QAAQ,gCAA+B;AAEzD;;;;;;CAMC,GACD,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EAAEC,MAAM,EAAEC,UAAU,EAAEC,GAAG,EAAE;IAE3B,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACT,YAAYK;IACpD,MAAMK,QAAQ,IAAI,CAACC,MAAM,CAACJ,UAAU;IAEpC,wFAAwF;IACxF,IAAI,CAACG,OAAOE,SAAS;QACnB;IACF;IAEA,MAAMC,KAAK,MAAMZ,eAAe,IAAI,EAAEK;IAEtC,MAAM,IAAI,CAACQ,WAAW,CAAC;QACrBD;QACAN;QACAQ,OAAOhB,GAAGW,MAAME,OAAO,EAAER;IAC3B;IAEAF,UAAU,IAAI;AAChB,EAAC"}

package/dist/deleteOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAexC,eAAO,MAAM,SAAS,EAAE,SA0EvB,CAAA"}
+{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAgBxC,eAAO,MAAM,SAAS,EAAE,SA4FvB,CAAA"}

package/dist/deleteOne.js

@@ -1,4 +1,5 @@
 import { eq } from 'drizzle-orm';
+import { resolveBranchDelete, resolveBranchQuery } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { buildFindManyArgs } from './find/buildFindManyArgs.js';
 import { buildQuery } from './queries/buildQuery.js';
@@ -7,14 +8,37 @@ import { transform } from './transform/read/index.js';
 import { getPrimaryDb } from './utilities/getPrimaryDb.js';
 import { getTransaction } from './utilities/getTransaction.js';
 import { markWrite } from './utilities/readAfterWrite.js';
-export const deleteOne = async function deleteOne({ collection: collectionSlug, req, returning, select, where: whereArg }) {
+export const deleteOne = async function deleteOne({ branch, collection: collectionSlug, req, returning, select, where: whereArg }) {
     const collection = this.payload.collections[collectionSlug].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collection.slug));
+    const branchDelete = await resolveBranchDelete({
+        branch,
+        collectionSlug,
+        req,
+        where: whereArg
+    });
+    if (branchDelete.tombstoned) {
+        return returning === false ? null : branchDelete.doc;
+    }
+    if (branchDelete.deleteRowID !== undefined) {
+        whereArg = {
+            id: {
+                equals: branchDelete.deleteRowID
+            }
+        };
+    }
+    whereArg = await resolveBranchQuery({
+        branch,
+        collectionSlug,
+        req,
+        where: whereArg
+    });
     let docToDelete;
     const { joins, selectFields, where } = buildQuery({
         adapter: this,
         fields: collection.flattenedFields,
         locale: req?.locale,
+        req,
         tableName,
         where: whereArg
     });

package/dist/deleteOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { DeleteOne } from 'payload'\n\nimport { eq } from 'drizzle-orm'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildFindManyArgs } from './find/buildFindManyArgs.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { transform } from './transform/read/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: DrizzleAdapter,\n  { collection: collectionSlug, req, returning, select, where: whereArg },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n  let docToDelete: Record<string, unknown>\n\n  const { joins, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collection.flattenedFields,\n    locale: req?.locale,\n    tableName,\n    where: whereArg,\n  })\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    joins,\n    query: ({ query }) => query.limit(1),\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult?.[0]?.id) {\n    docToDelete = await db.query[tableName].findFirst({\n      where: eq(this.tables[tableName].id, selectDistinctResult[0].id),\n    })\n  } else {\n    const findManyArgs = buildFindManyArgs({\n      adapter: this,\n      depth: 0,\n      fields: collection.flattenedFields,\n      joinQuery: false,\n      select,\n      tableName,\n    })\n\n    findManyArgs.where = where\n\n    docToDelete = await db.query[tableName].findFirst(findManyArgs)\n  }\n\n  if (!docToDelete) {\n    return null\n  }\n\n  const result =\n    returning === false\n      ? null\n      : transform({\n          adapter: this,\n          config: this.payload.config,\n          data: docToDelete,\n          fields: collection.flattenedFields,\n          joinQuery: false,\n          tableName,\n        })\n\n  await this.deleteWhere({\n    db,\n    tableName,\n    where: eq(this.tables[tableName].id, docToDelete.id),\n  })\n\n  markWrite(this)\n\n  return result\n}\n"],"names":["eq","toSnakeCase","buildFindManyArgs","buildQuery","selectDistinct","transform","getPrimaryDb","getTransaction","markWrite","deleteOne","collection","collectionSlug","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","docToDelete","joins","selectFields","adapter","fields","flattenedFields","locale","db","selectDistinctResult","query","limit","id","findFirst","tables","findManyArgs","depth","joinQuery","result","data","deleteWhere"],"mappings":"AAEA,SAASA,EAAE,QAAQ,cAAa;AAChC,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,iBAAiB,QAAQ,8BAA6B;AAC/D,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,SAAS,QAAQ,4BAA2B;AACrD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,SAAS,QAAQ,gCAA+B;AAEzD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAEC,OAAOC,QAAQ,EAAE;IAEvE,MAAMN,aAAa,IAAI,CAACO,OAAO,CAACC,WAAW,CAACP,eAAe,CAACQ,MAAM;IAElE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACrB,YAAYS,WAAWa,IAAI;IAEnE,IAAIC;IAEJ,MAAM,EAAEC,KAAK,EAAEC,YAAY,EAAEX,KAAK,EAAE,GAAGZ,WAAW;QAChDwB,SAAS,IAAI;QACbC,QAAQlB,WAAWmB,eAAe;QAClCC,QAAQlB,KAAKkB;QACbV;QACAL,OAAOC;IACT;IAEA,MAAMe,KAAKzB,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEK;IAEzD,MAAMoB,uBAAuB,MAAM5B,eAAe;QAChDuB,SAAS,IAAI;QACbI;QACAN;QACAQ,OAAO,CAAC,EAAEA,KAAK,EAAE,GAAKA,MAAMC,KAAK,CAAC;QAClCR;QACAN;QACAL;IACF;IAEA,IAAIiB,sBAAsB,CAAC,EAAE,EAAEG,IAAI;QACjCX,cAAc,MAAMO,GAAGE,KAAK,CAACb,UAAU,CAACgB,SAAS,CAAC;YAChDrB,OAAOf,GAAG,IAAI,CAACqC,MAAM,CAACjB,UAAU,CAACe,EAAE,EAAEH,oBAAoB,CAAC,EAAE,CAACG,EAAE;QACjE;IACF,OAAO;QACL,MAAMG,eAAepC,kBAAkB;YACrCyB,SAAS,IAAI;YACbY,OAAO;YACPX,QAAQlB,WAAWmB,eAAe;YAClCW,WAAW;YACX1B;YACAM;QACF;QAEAkB,aAAavB,KAAK,GAAGA;QAErBS,cAAc,MAAMO,GAAGE,KAAK,CAACb,UAAU,CAACgB,SAAS,CAACE;IACpD;IAEA,IAAI,CAACd,aAAa;QAChB,OAAO;IACT;IAEA,MAAMiB,SACJ5B,cAAc,QACV,OACAR,UAAU;QACRsB,SAAS,IAAI;QACbR,QAAQ,IAAI,CAACF,OAAO,CAACE,MAAM;QAC3BuB,MAAMlB;QACNI,QAAQlB,WAAWmB,eAAe;QAClCW,WAAW;QACXpB;IACF;IAEN,MAAM,IAAI,CAACuB,WAAW,CAAC;QACrBZ;QACAX;QACAL,OAAOf,GAAG,IAAI,CAACqC,MAAM,CAACjB,UAAU,CAACe,EAAE,EAAEX,YAAYW,EAAE;IACrD;IAEA3B,UAAU,IAAI;IAEd,OAAOiC;AACT,EAAC"}
+{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { DeleteOne } from 'payload'\n\nimport { eq } from 'drizzle-orm'\nimport { resolveBranchDelete, resolveBranchQuery } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildFindManyArgs } from './find/buildFindManyArgs.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { transform } from './transform/read/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: DrizzleAdapter,\n  { branch, collection: collectionSlug, req, returning, select, where: whereArg },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n  const branchDelete = await resolveBranchDelete({\n    branch,\n    collectionSlug,\n    req,\n    where: whereArg,\n  })\n\n  if (branchDelete.tombstoned) {\n    return returning === false ? null : (branchDelete.doc as Awaited<ReturnType<DeleteOne>>)\n  }\n\n  if (branchDelete.deleteRowID !== undefined) {\n    whereArg = { id: { equals: branchDelete.deleteRowID } }\n  }\n\n  whereArg = await resolveBranchQuery({ branch, collectionSlug, req, where: whereArg })\n\n  let docToDelete: Record<string, unknown>\n\n  const { joins, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collection.flattenedFields,\n    locale: req?.locale,\n    req,\n    tableName,\n    where: whereArg,\n  })\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    joins,\n    query: ({ query }) => query.limit(1),\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult?.[0]?.id) {\n    docToDelete = await db.query[tableName].findFirst({\n      where: eq(this.tables[tableName].id, selectDistinctResult[0].id),\n    })\n  } else {\n    const findManyArgs = buildFindManyArgs({\n      adapter: this,\n      depth: 0,\n      fields: collection.flattenedFields,\n      joinQuery: false,\n      select,\n      tableName,\n    })\n\n    findManyArgs.where = where\n\n    docToDelete = await db.query[tableName].findFirst(findManyArgs)\n  }\n\n  if (!docToDelete) {\n    return null\n  }\n\n  const result =\n    returning === false\n      ? null\n      : transform({\n          adapter: this,\n          config: this.payload.config,\n          data: docToDelete,\n          fields: collection.flattenedFields,\n          joinQuery: false,\n          tableName,\n        })\n\n  await this.deleteWhere({\n    db,\n    tableName,\n    where: eq(this.tables[tableName].id, docToDelete.id),\n  })\n\n  markWrite(this)\n\n  return result\n}\n"],"names":["eq","resolveBranchDelete","resolveBranchQuery","toSnakeCase","buildFindManyArgs","buildQuery","selectDistinct","transform","getPrimaryDb","getTransaction","markWrite","deleteOne","branch","collection","collectionSlug","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","branchDelete","tombstoned","doc","deleteRowID","undefined","id","equals","docToDelete","joins","selectFields","adapter","fields","flattenedFields","locale","db","selectDistinctResult","query","limit","findFirst","tables","findManyArgs","depth","joinQuery","result","data","deleteWhere"],"mappings":"AAEA,SAASA,EAAE,QAAQ,cAAa;AAChC,SAASC,mBAAmB,EAAEC,kBAAkB,QAAQ,UAAS;AACjE,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,iBAAiB,QAAQ,8BAA6B;AAC/D,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,SAAS,QAAQ,4BAA2B;AACrD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,SAAS,QAAQ,gCAA+B;AAEzD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,MAAM,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAEC,OAAOC,QAAQ,EAAE;IAE/E,MAAMN,aAAa,IAAI,CAACO,OAAO,CAACC,WAAW,CAACP,eAAe,CAACQ,MAAM;IAElE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACtB,YAAYU,WAAWa,IAAI;IAEnE,MAAMC,eAAe,MAAM1B,oBAAoB;QAC7CW;QACAE;QACAC;QACAG,OAAOC;IACT;IAEA,IAAIQ,aAAaC,UAAU,EAAE;QAC3B,OAAOZ,cAAc,QAAQ,OAAQW,aAAaE,GAAG;IACvD;IAEA,IAAIF,aAAaG,WAAW,KAAKC,WAAW;QAC1CZ,WAAW;YAAEa,IAAI;gBAAEC,QAAQN,aAAaG,WAAW;YAAC;QAAE;IACxD;IAEAX,WAAW,MAAMjB,mBAAmB;QAAEU;QAAQE;QAAgBC;QAAKG,OAAOC;IAAS;IAEnF,IAAIe;IAEJ,MAAM,EAAEC,KAAK,EAAEC,YAAY,EAAElB,KAAK,EAAE,GAAGb,WAAW;QAChDgC,SAAS,IAAI;QACbC,QAAQzB,WAAW0B,eAAe;QAClCC,QAAQzB,KAAKyB;QACbzB;QACAQ;QACAL,OAAOC;IACT;IAEA,MAAMsB,KAAKjC,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEM;IAEzD,MAAM2B,uBAAuB,MAAMpC,eAAe;QAChD+B,SAAS,IAAI;QACbI;QACAN;QACAQ,OAAO,CAAC,EAAEA,KAAK,EAAE,GAAKA,MAAMC,KAAK,CAAC;QAClCR;QACAb;QACAL;IACF;IAEA,IAAIwB,sBAAsB,CAAC,EAAE,EAAEV,IAAI;QACjCE,cAAc,MAAMO,GAAGE,KAAK,CAACpB,UAAU,CAACsB,SAAS,CAAC;YAChD3B,OAAOlB,GAAG,IAAI,CAAC8C,MAAM,CAACvB,UAAU,CAACS,EAAE,EAAEU,oBAAoB,CAAC,EAAE,CAACV,EAAE;QACjE;IACF,OAAO;QACL,MAAMe,eAAe3C,kBAAkB;YACrCiC,SAAS,IAAI;YACbW,OAAO;YACPV,QAAQzB,WAAW0B,eAAe;YAClCU,WAAW;YACXhC;YACAM;QACF;QAEAwB,aAAa7B,KAAK,GAAGA;QAErBgB,cAAc,MAAMO,GAAGE,KAAK,CAACpB,UAAU,CAACsB,SAAS,CAACE;IACpD;IAEA,IAAI,CAACb,aAAa;QAChB,OAAO;IACT;IAEA,MAAMgB,SACJlC,cAAc,QACV,OACAT,UAAU;QACR8B,SAAS,IAAI;QACbf,QAAQ,IAAI,CAACF,OAAO,CAACE,MAAM;QAC3B6B,MAAMjB;QACNI,QAAQzB,WAAW0B,eAAe;QAClCU,WAAW;QACX1B;IACF;IAEN,MAAM,IAAI,CAAC6B,WAAW,CAAC;QACrBX;QACAlB;QACAL,OAAOlB,GAAG,IAAI,CAAC8C,MAAM,CAACvB,UAAU,CAACS,EAAE,EAAEE,YAAYF,EAAE;IACrD;IAEAtB,UAAU,IAAI;IAEd,OAAOwC;AACT,EAAC"}

package/dist/exports/postgres.d.ts

@@ -10,8 +10,11 @@ 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 { requireDrizzleKit } from '../postgres/requireDrizzleKit.js';
+export { assertOperatorHandlerExtensionsInstalled } from '../postgres/query/assertOperatorHandlerExtensionsInstalled.js';
+export { postgresUnaccent } from '../postgres/query/postgresUnaccent.js';
+export { createRequireDrizzleKit, requireDrizzleKit } from '../postgres/requireDrizzleKit.js';
 export { geometryColumn } from '../postgres/schema/geometryColumn.js';
 export * from '../postgres/types.js';
 //# sourceMappingURL=postgres.d.ts.map

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,6BAA6B,EAAE,MAAM,2DAA2D,CAAA;AACzG,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,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,cAAc,sBAAsB,CAAA"}

package/dist/exports/postgres.js

@@ -10,8 +10,11 @@ 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 { requireDrizzleKit } from '../postgres/requireDrizzleKit.js';
+export { assertOperatorHandlerExtensionsInstalled } from '../postgres/query/assertOperatorHandlerExtensionsInstalled.js';
+export { postgresUnaccent } from '../postgres/query/postgresUnaccent.js';
+export { createRequireDrizzleKit, 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 { migratePostgresLocalizeStatus } from '../postgres/predefinedMigrations/localize-status/index.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","migratePostgresLocalizeStatus","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,6BAA6B,QAAQ,4DAA2D;AACzG,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 { createRequireDrizzleKit, 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","createRequireDrizzleKit","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,uBAAuB,EAAEC,iBAAiB,QAAQ,mCAAkC;AAC7F,SAASC,cAAc,QAAQ,uCAAsC;AACrE,cAAc,uBAAsB"}

package/dist/exports/sqlite.d.ts

@@ -2,6 +2,7 @@ export { columnToCodeConverter } from '../sqlite/columnToCodeConverter.js';
 export { countDistinct } from '../sqlite/countDistinct.js';
 export { convertPathToJSONTraversal } from '../sqlite/createJSONQuery/convertPathToJSONTraversal.js';
 export { createJSONQuery } from '../sqlite/createJSONQuery/index.js';
+export { createRequireDrizzleKit } from '../sqlite/createRequireDrizzleKit.js';
 export { defaultDrizzleSnapshot } from '../sqlite/defaultSnapshot.js';
 export { deleteWhere } from '../sqlite/deleteWhere.js';
 export { dropDatabase } from '../sqlite/dropDatabase.js';
@@ -9,6 +10,6 @@ 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 { requireDrizzleKit } from '../sqlite/requireDrizzleKit.js';
+export { migrateSqliteSizesToVariants } from '../sqlite/predefinedMigrations/sizes-to-variants/index.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,2BAA2B,EAAE,MAAM,yDAAyD,CAAA;AACrG,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,uBAAuB,EAAE,MAAM,sCAAsC,CAAA;AAC9E,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,cAAc,oBAAoB,CAAA"}