@payloadcms/drizzle 4.0.0-internal.9496957 → 4.0.0-internal.952ed66

package/dist/queries/buildBranchVisibility.d.ts

@@ -0,0 +1,11 @@
+import type { SQL } from 'drizzle-orm';
+import type { DrizzleAdapter, GenericTable } from '../types.js';
+export declare const buildBranchVisibility: ({ adapter, branch, canonicalIDExpression, collectionSlug, mode, table, }: {
+    adapter: DrizzleAdapter;
+    branch: string;
+    canonicalIDExpression?: SQL;
+    collectionSlug: string;
+    mode?: 'documents' | 'history';
+    table: GenericTable;
+}) => SQL;
+//# sourceMappingURL=buildBranchVisibility.d.ts.map

package/dist/queries/buildBranchVisibility.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildBranchVisibility.d.ts","sourceRoot":"","sources":["../../src/queries/buildBranchVisibility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAMtC,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/D,eAAO,MAAM,qBAAqB,6EAO/B;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,CAAC,EAAE,GAAG,CAAA;IAC3B,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;IAC9B,KAAK,EAAE,YAAY,CAAA;CACpB,KAAG,GA8DH,CAAA"}

package/dist/queries/buildBranchVisibility.js

@@ -0,0 +1,48 @@
+import { and, eq, exists, notExists, or, sql } from 'drizzle-orm';
+import { branchChangesCollectionSlug, MAIN_BRANCH } from 'payload';
+import toSnakeCase from 'to-snake-case';
+export const buildBranchVisibility = ({ adapter, branch, canonicalIDExpression, collectionSlug, mode = 'documents', table })=>{
+    const branchChangesTableName = adapter.tableNameMap.get(toSnakeCase(branchChangesCollectionSlug));
+    const branchChangesTable = adapter.tables[branchChangesTableName];
+    const canonicalDocumentID = canonicalIDExpression ?? (mode === 'history' ? sql`COALESCE(${table['_branchParent']}, ${table['parent']})` : sql`COALESCE(${table['_branchDocID']}, ${table['id']})`);
+    const documentIDAsText = sql`CAST(${canonicalDocumentID} AS TEXT)`;
+    const branchChangesTableIdentifier = adapter.schemaName ? sql`${sql.identifier(adapter.schemaName)}.${sql.identifier(branchChangesTableName)}` : sql.identifier(branchChangesTableName);
+    const branchColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.branch.name)}`;
+    const collectionSlugColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.collectionSlug.name)}`;
+    const documentIDColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.documentID.name)}`;
+    const operationColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.operation.name)}`;
+    const baseVersionIDColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.baseVersionID.name)}`;
+    const baseVersionUpdatedAtColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.baseVersionUpdatedAt.name)}`;
+    const matchingChange = sql`(
+    SELECT 1 FROM ${branchChangesTableIdentifier}
+    WHERE ${branchColumn} = ${branch}
+      AND ${collectionSlugColumn} = ${collectionSlug}
+      AND ${documentIDColumn} = ${documentIDAsText}
+  )`;
+    const matchingDelete = sql`(
+    SELECT 1 FROM ${branchChangesTableIdentifier}
+    WHERE ${branchColumn} = ${branch}
+      AND ${collectionSlugColumn} = ${collectionSlug}
+      AND ${documentIDColumn} = ${documentIDAsText}
+      AND ${operationColumn} = ${'delete'}
+  )`;
+    const matchingHistory = sql`(
+    SELECT 1 FROM ${branchChangesTableIdentifier}
+    WHERE ${branchColumn} = ${branch}
+      AND ${collectionSlugColumn} = ${collectionSlug}
+      AND ${documentIDColumn} = ${documentIDAsText}
+      AND ${operationColumn} <> ${'create'}
+      AND (
+        (${baseVersionIDColumn} IS NULL AND ${baseVersionUpdatedAtColumn} IS NULL)
+        OR CAST(${table['id']} AS TEXT) = ${baseVersionIDColumn}
+        OR ${table['updatedAt']} <= ${baseVersionUpdatedAtColumn}
+      )
+  )`;
+    const visibility = mode === 'history' ? or(and(eq(table['_branch'], MAIN_BRANCH), or(notExists(matchingChange), exists(matchingHistory))), eq(table['_branch'], branch)) : or(and(eq(table['_branch'], MAIN_BRANCH), notExists(matchingChange)), and(eq(table['_branch'], branch), notExists(matchingDelete)));
+    if (!visibility) {
+        throw new Error('Could not build branch visibility query');
+    }
+    return visibility;
+};
+
+//# sourceMappingURL=buildBranchVisibility.js.map

package/dist/queries/buildBranchVisibility.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/buildBranchVisibility.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\n\nimport { and, eq, exists, notExists, or, sql } from 'drizzle-orm'\nimport { branchChangesCollectionSlug, MAIN_BRANCH } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\n\nexport const buildBranchVisibility = ({\n  adapter,\n  branch,\n  canonicalIDExpression,\n  collectionSlug,\n  mode = 'documents',\n  table,\n}: {\n  adapter: DrizzleAdapter\n  branch: string\n  canonicalIDExpression?: SQL\n  collectionSlug: string\n  mode?: 'documents' | 'history'\n  table: GenericTable\n}): SQL => {\n  const branchChangesTableName = adapter.tableNameMap.get(toSnakeCase(branchChangesCollectionSlug))\n  const branchChangesTable = adapter.tables[branchChangesTableName]\n  const canonicalDocumentID =\n    canonicalIDExpression ??\n    (mode === 'history'\n      ? sql`COALESCE(${table['_branchParent']}, ${table['parent']})`\n      : sql`COALESCE(${table['_branchDocID']}, ${table['id']})`)\n  const documentIDAsText = sql`CAST(${canonicalDocumentID} AS TEXT)`\n  const branchChangesTableIdentifier = adapter.schemaName\n    ? sql`${sql.identifier(adapter.schemaName)}.${sql.identifier(branchChangesTableName)}`\n    : sql.identifier(branchChangesTableName)\n  const branchColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.branch.name)}`\n  const collectionSlugColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.collectionSlug.name)}`\n  const documentIDColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.documentID.name)}`\n  const operationColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.operation.name)}`\n  const baseVersionIDColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.baseVersionID.name)}`\n  const baseVersionUpdatedAtColumn = sql`${branchChangesTableIdentifier}.${sql.identifier(branchChangesTable.baseVersionUpdatedAt.name)}`\n  const matchingChange = sql`(\n    SELECT 1 FROM ${branchChangesTableIdentifier}\n    WHERE ${branchColumn} = ${branch}\n      AND ${collectionSlugColumn} = ${collectionSlug}\n      AND ${documentIDColumn} = ${documentIDAsText}\n  )`\n  const matchingDelete = sql`(\n    SELECT 1 FROM ${branchChangesTableIdentifier}\n    WHERE ${branchColumn} = ${branch}\n      AND ${collectionSlugColumn} = ${collectionSlug}\n      AND ${documentIDColumn} = ${documentIDAsText}\n      AND ${operationColumn} = ${'delete'}\n  )`\n  const matchingHistory = sql`(\n    SELECT 1 FROM ${branchChangesTableIdentifier}\n    WHERE ${branchColumn} = ${branch}\n      AND ${collectionSlugColumn} = ${collectionSlug}\n      AND ${documentIDColumn} = ${documentIDAsText}\n      AND ${operationColumn} <> ${'create'}\n      AND (\n        (${baseVersionIDColumn} IS NULL AND ${baseVersionUpdatedAtColumn} IS NULL)\n        OR CAST(${table['id']} AS TEXT) = ${baseVersionIDColumn}\n        OR ${table['updatedAt']} <= ${baseVersionUpdatedAtColumn}\n      )\n  )`\n  const visibility =\n    mode === 'history'\n      ? or(\n          and(\n            eq(table['_branch'], MAIN_BRANCH),\n            or(notExists(matchingChange), exists(matchingHistory)),\n          ),\n          eq(table['_branch'], branch),\n        )\n      : or(\n          and(eq(table['_branch'], MAIN_BRANCH), notExists(matchingChange)),\n          and(eq(table['_branch'], branch), notExists(matchingDelete)),\n        )\n\n  if (!visibility) {\n    throw new Error('Could not build branch visibility query')\n  }\n\n  return visibility\n}\n"],"names":["and","eq","exists","notExists","or","sql","branchChangesCollectionSlug","MAIN_BRANCH","toSnakeCase","buildBranchVisibility","adapter","branch","canonicalIDExpression","collectionSlug","mode","table","branchChangesTableName","tableNameMap","get","branchChangesTable","tables","canonicalDocumentID","documentIDAsText","branchChangesTableIdentifier","schemaName","identifier","branchColumn","name","collectionSlugColumn","documentIDColumn","documentID","operationColumn","operation","baseVersionIDColumn","baseVersionID","baseVersionUpdatedAtColumn","baseVersionUpdatedAt","matchingChange","matchingDelete","matchingHistory","visibility","Error"],"mappings":"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"}

package/dist/queries/buildOrderBy.d.ts

@@ -1,5 +1,5 @@
 import type { SQL, Table } from 'drizzle-orm';
-import type { FlattenedField, Sort } from 'payload';
+import type { FlattenedField, PayloadRequest, Sort } from 'payload';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js';
 type Args = {
@@ -10,6 +10,7 @@ type Args = {
     locale?: string;
     parentIsLocalized: boolean;
     rawSort?: SQL;
+    req?: Partial<PayloadRequest>;
     selectFields: Record<string, GenericColumn>;
     sort?: Sort;
     tableName: string;
@@ -17,6 +18,6 @@ type Args = {
 /**
  * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary
  */
-export declare const buildOrderBy: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, rawSort, selectFields, sort, tableName, }: Args) => BuildQueryResult['orderBy'];
+export declare const buildOrderBy: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, rawSort, req, selectFields, sort, tableName, }: Args) => BuildQueryResult['orderBy'];
 export {};
 //# sourceMappingURL=buildOrderBy.d.ts.map

package/dist/queries/buildOrderBy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAInD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAK9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,CAAC,EAAE,GAAG,CAAA;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,+GAWtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAgFnC,CAAA"}
+{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAInE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAK9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,CAAC,EAAE,GAAG,CAAA;IACb,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,oHAYtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAiFnC,CAAA"}

package/dist/queries/buildOrderBy.js

@@ -3,7 +3,7 @@ import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js
 import { getTableColumnFromPath } from './getTableColumnFromPath.js';
 /**
  * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary
- */ export const buildOrderBy = ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, rawSort, selectFields, sort, tableName })=>{
+ */ export const buildOrderBy = ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, rawSort, req, selectFields, sort, tableName })=>{
     const orderBy = [];
     const createdAt = adapter.tables[tableName]?.createdAt;
     if (!sort) {
@@ -46,6 +46,7 @@ import { getTableColumnFromPath } from './getTableColumnFromPath.js';
                 locale,
                 parentIsLocalized,
                 pathSegments: sortProperty.replace(/__/g, '.').split('.'),
+                req,
                 selectFields,
                 tableName,
                 value: sortProperty

package/dist/queries/buildOrderBy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { SQL, Table } from 'drizzle-orm'\nimport type { FlattenedField, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized: boolean\n  rawSort?: SQL\n  selectFields: Record<string, GenericColumn>\n  sort?: Sort\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  aliasTable,\n  fields,\n  joins,\n  locale,\n  parentIsLocalized,\n  rawSort,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  const createdAt = adapter.tables[tableName]?.createdAt\n\n  if (!sort) {\n    if (createdAt) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (createdAt) {\n    fallbackSort = '-createdAt'\n  }\n\n  if (!(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))) {\n    sort.push(fallbackSort)\n  }\n\n  for (const sortItem of sort) {\n    let sortProperty: string\n    let sortDirection: 'asc' | 'desc'\n    if (sortItem[0] === '-') {\n      sortProperty = sortItem.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = sortItem\n      sortDirection = 'asc'\n    }\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortProperty,\n        fields,\n        joins,\n        locale,\n        parentIsLocalized,\n        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        let order = sortDirection === 'asc' ? asc : desc\n\n        if (rawSort) {\n          order = () => rawSort\n        }\n\n        orderBy.push({\n          column:\n            aliasTable && tableName === getNameFromDrizzleTable(sortTable)\n              ? aliasTable[sortTableColumnName]\n              : sortTable[sortTableColumnName],\n          order,\n        })\n\n        // Only add to selectFields if not already present (avoid duplicates from getTableColumnFromPath)\n        const columnToAdd = sortTable[sortTableColumnName]\n        const alreadyExists = Object.values(selectFields).some((col) => col === columnToAdd)\n        if (!alreadyExists) {\n          selectFields[sortTableColumnName] = columnToAdd\n        }\n      }\n    } catch (_) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getNameFromDrizzleTable","getTableColumnFromPath","buildOrderBy","adapter","aliasTable","fields","joins","locale","parentIsLocalized","rawSort","selectFields","sort","tableName","orderBy","createdAt","tables","fallbackSort","includes","replace","push","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","split","value","order","column","columnToAdd","alreadyExists","Object","values","some","col","_"],"mappings":"AAGA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,sBAAsB,QAAQ,8BAA6B;AAepE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,MAAMC,YAAYX,QAAQY,MAAM,CAACH,UAAU,EAAEE;IAE7C,IAAI,CAACH,MAAM;QACT,IAAIG,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,sIAAsI;IACtI,qFAAqF;IACrF,IAAIK,eAAe;IAEnB,IAAIF,WAAW;QACbE,eAAe;IACjB;IAEA,IAAI,CAAEL,CAAAA,KAAKM,QAAQ,CAACD,iBAAiBL,KAAKM,QAAQ,CAACD,aAAaE,OAAO,CAAC,KAAK,IAAG,GAAI;QAClFP,KAAKQ,IAAI,CAACH;IACZ;IAEA,KAAK,MAAMI,YAAYT,KAAM;QAC3B,IAAIU;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAG1B,uBAAuB;gBACnFE;gBACAyB,gBAAgBP;gBAChBhB;gBACAC;gBACAC;gBACAC;gBACAqB,cAAcR,aAAaH,OAAO,CAAC,OAAO,KAAKY,KAAK,CAAC;gBACrDpB;gBACAE;gBACAmB,OAAOV;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpC,IAAIO,QAAQV,kBAAkB,QAAQxB,MAAMC;gBAE5C,IAAIU,SAAS;oBACXuB,QAAQ,IAAMvB;gBAChB;gBAEAI,QAAQM,IAAI,CAAC;oBACXc,QACE7B,cAAcQ,cAAcZ,wBAAwB2B,aAChDvB,UAAU,CAACqB,oBAAoB,GAC/BE,SAAS,CAACF,oBAAoB;oBACpCO;gBACF;gBAEA,iGAAiG;gBACjG,MAAME,cAAcP,SAAS,CAACF,oBAAoB;gBAClD,MAAMU,gBAAgBC,OAAOC,MAAM,CAAC3B,cAAc4B,IAAI,CAAC,CAACC,MAAQA,QAAQL;gBACxE,IAAI,CAACC,eAAe;oBAClBzB,YAAY,CAACe,oBAAoB,GAAGS;gBACtC;YACF;QACF,EAAE,OAAOM,GAAG;QACV,WAAW;QACb;IACF;IAEA,OAAO3B;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { SQL, Table } from 'drizzle-orm'\nimport type { FlattenedField, PayloadRequest, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized: boolean\n  rawSort?: SQL\n  req?: Partial<PayloadRequest>\n  selectFields: Record<string, GenericColumn>\n  sort?: Sort\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  aliasTable,\n  fields,\n  joins,\n  locale,\n  parentIsLocalized,\n  rawSort,\n  req,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  const createdAt = adapter.tables[tableName]?.createdAt\n\n  if (!sort) {\n    if (createdAt) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (createdAt) {\n    fallbackSort = '-createdAt'\n  }\n\n  if (!(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))) {\n    sort.push(fallbackSort)\n  }\n\n  for (const sortItem of sort) {\n    let sortProperty: string\n    let sortDirection: 'asc' | 'desc'\n    if (sortItem[0] === '-') {\n      sortProperty = sortItem.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = sortItem\n      sortDirection = 'asc'\n    }\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortProperty,\n        fields,\n        joins,\n        locale,\n        parentIsLocalized,\n        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        req,\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        let order = sortDirection === 'asc' ? asc : desc\n\n        if (rawSort) {\n          order = () => rawSort\n        }\n\n        orderBy.push({\n          column:\n            aliasTable && tableName === getNameFromDrizzleTable(sortTable)\n              ? aliasTable[sortTableColumnName]\n              : sortTable[sortTableColumnName],\n          order,\n        })\n\n        // Only add to selectFields if not already present (avoid duplicates from getTableColumnFromPath)\n        const columnToAdd = sortTable[sortTableColumnName]\n        const alreadyExists = Object.values(selectFields).some((col) => col === columnToAdd)\n        if (!alreadyExists) {\n          selectFields[sortTableColumnName] = columnToAdd\n        }\n      }\n    } catch (_) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getNameFromDrizzleTable","getTableColumnFromPath","buildOrderBy","adapter","aliasTable","fields","joins","locale","parentIsLocalized","rawSort","req","selectFields","sort","tableName","orderBy","createdAt","tables","fallbackSort","includes","replace","push","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","split","value","order","column","columnToAdd","alreadyExists","Object","values","some","col","_"],"mappings":"AAGA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,sBAAsB,QAAQ,8BAA6B;AAgBpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,GAAG,EACHC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,MAAMC,YAAYZ,QAAQa,MAAM,CAACH,UAAU,EAAEE;IAE7C,IAAI,CAACH,MAAM;QACT,IAAIG,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,sIAAsI;IACtI,qFAAqF;IACrF,IAAIK,eAAe;IAEnB,IAAIF,WAAW;QACbE,eAAe;IACjB;IAEA,IAAI,CAAEL,CAAAA,KAAKM,QAAQ,CAACD,iBAAiBL,KAAKM,QAAQ,CAACD,aAAaE,OAAO,CAAC,KAAK,IAAG,GAAI;QAClFP,KAAKQ,IAAI,CAACH;IACZ;IAEA,KAAK,MAAMI,YAAYT,KAAM;QAC3B,IAAIU;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAG3B,uBAAuB;gBACnFE;gBACA0B,gBAAgBP;gBAChBjB;gBACAC;gBACAC;gBACAC;gBACAsB,cAAcR,aAAaH,OAAO,CAAC,OAAO,KAAKY,KAAK,CAAC;gBACrDrB;gBACAC;gBACAE;gBACAmB,OAAOV;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpC,IAAIO,QAAQV,kBAAkB,QAAQzB,MAAMC;gBAE5C,IAAIU,SAAS;oBACXwB,QAAQ,IAAMxB;gBAChB;gBAEAK,QAAQM,IAAI,CAAC;oBACXc,QACE9B,cAAcS,cAAcb,wBAAwB4B,aAChDxB,UAAU,CAACsB,oBAAoB,GAC/BE,SAAS,CAACF,oBAAoB;oBACpCO;gBACF;gBAEA,iGAAiG;gBACjG,MAAME,cAAcP,SAAS,CAACF,oBAAoB;gBAClD,MAAMU,gBAAgBC,OAAOC,MAAM,CAAC3B,cAAc4B,IAAI,CAAC,CAACC,MAAQA,QAAQL;gBACxE,IAAI,CAACC,eAAe;oBAClBzB,YAAY,CAACe,oBAAoB,GAAGS;gBACtC;YACF;QACF,EAAE,OAAOM,GAAG;QACV,WAAW;QACb;IACF;IAEA,OAAO3B;AACT,EAAC"}

package/dist/queries/buildQuery.d.ts

@@ -1,6 +1,6 @@
 import type { asc, desc, SQL, Table } from 'drizzle-orm';
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import type { FlattenedField, Sort, Where } from 'payload';
+import type { FlattenedField, PayloadRequest, Sort, Where } from 'payload';
 import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
 export type BuildQueryJoinAliases = {
     condition: SQL;
@@ -16,6 +16,7 @@ type BuildQueryArgs = {
     joins?: BuildQueryJoinAliases;
     locale?: string;
     parentIsLocalized?: boolean;
+    req?: Partial<PayloadRequest>;
     selectLocale?: boolean;
     sort?: Sort;
     tableName: string;
@@ -30,6 +31,6 @@ export type BuildQueryResult = {
     selectFields: Record<string, GenericColumn>;
     where: SQL;
 };
-export declare const buildQuery: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, selectLocale, sort, tableName, where: incomingWhere, }: BuildQueryArgs) => BuildQueryResult;
+export declare const buildQuery: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, req, selectLocale, sort, tableName, where: incomingWhere, }: BuildQueryArgs) => BuildQueryResult;
 export {};
 //# sourceMappingURL=buildQuery.d.ts.map

package/dist/queries/buildQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IAEd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED,eAAO,MAAM,UAAU,4HAWpB,cAAc,KAAG,gBA2CnB,CAAA"}
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IAEd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED,eAAO,MAAM,UAAU,iIAYpB,cAAc,KAAG,gBA6CnB,CAAA"}

package/dist/queries/buildQuery.js

@@ -1,8 +1,8 @@
 import { buildOrderBy } from './buildOrderBy.js';
 import { parseParams } from './parseParams.js';
-export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joins = [], locale, parentIsLocalized, selectLocale, sort, tableName, where: incomingWhere }) {
+export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joins = [], locale, parentIsLocalized, req, selectLocale, sort, tableName, where: incomingWhere }) {
     const selectFields = {
-        id: adapter.tables[tableName].id
+        id: (aliasTable ?? adapter.tables[tableName])['id']
     };
     let where;
     const context = {
@@ -17,6 +17,7 @@ export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joi
             joins,
             locale,
             parentIsLocalized,
+            req,
             selectFields,
             selectLocale,
             tableName,
@@ -31,6 +32,7 @@ export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joi
         locale,
         parentIsLocalized,
         rawSort: context.rawSort,
+        req,
         selectFields,
         sort: context.sort,
         tableName

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL, Table } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\nimport type { QueryContext } from './parseParams.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  // with parent\n  isOneToMany?: boolean\n  queryPath?: string\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized?: boolean\n  selectLocale?: boolean\n  sort?: Sort\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }[]\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\n\nexport const buildQuery = function buildQuery({\n  adapter,\n  aliasTable,\n  fields,\n  joins = [],\n  locale,\n  parentIsLocalized,\n  selectLocale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n\n  let where: SQL\n\n  const context: QueryContext = { sort }\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      aliasTable,\n      context,\n      fields,\n      joins,\n      locale,\n      parentIsLocalized,\n      selectFields,\n      selectLocale,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    aliasTable,\n    fields,\n    joins,\n    locale,\n    parentIsLocalized,\n    rawSort: context.rawSort,\n    selectFields,\n    sort: context.sort,\n    tableName,\n  })\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","aliasTable","fields","joins","locale","parentIsLocalized","selectLocale","sort","tableName","where","incomingWhere","selectFields","id","tables","context","Object","keys","length","orderBy","rawSort"],"mappings":"AAOA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AAkC9C,OAAO,MAAMC,aAAa,SAASA,WAAW,EAC5CC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,iBAAiB,EACjBC,YAAY,EACZC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIZ,QAAQa,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,IAAIH;IAEJ,MAAMK,UAAwB;QAAEP;IAAK;IACrC,IAAIG,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQX,YAAY;YAClBE;YACAC;YACAa;YACAZ;YACAC;YACAC;YACAC;YACAM;YACAL;YACAE;YACAC,OAAOC;QACT;IACF;IAEA,MAAMQ,UAAUrB,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAC;QACAC;QACAc,SAASL,QAAQK,OAAO;QACxBR;QACAJ,MAAMO,QAAQP,IAAI;QAClBC;IACF;IAEA,OAAO;QACLL;QACAe;QACAP;QACAF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL, Table } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, PayloadRequest, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\nimport type { QueryContext } from './parseParams.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  // with parent\n  isOneToMany?: boolean\n  queryPath?: string\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized?: boolean\n  req?: Partial<PayloadRequest>\n  selectLocale?: boolean\n  sort?: Sort\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }[]\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\n\nexport const buildQuery = function buildQuery({\n  adapter,\n  aliasTable,\n  fields,\n  joins = [],\n  locale,\n  parentIsLocalized,\n  req,\n  selectLocale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: (aliasTable ?? adapter.tables[tableName])['id'],\n  }\n\n  let where: SQL\n\n  const context: QueryContext = { sort }\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      aliasTable,\n      context,\n      fields,\n      joins,\n      locale,\n      parentIsLocalized,\n      req,\n      selectFields,\n      selectLocale,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    aliasTable,\n    fields,\n    joins,\n    locale,\n    parentIsLocalized,\n    rawSort: context.rawSort,\n    req,\n    selectFields,\n    sort: context.sort,\n    tableName,\n  })\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","aliasTable","fields","joins","locale","parentIsLocalized","req","selectLocale","sort","tableName","where","incomingWhere","selectFields","id","tables","context","Object","keys","length","orderBy","rawSort"],"mappings":"AAOA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AAmC9C,OAAO,MAAMC,aAAa,SAASA,WAAW,EAC5CC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,iBAAiB,EACjBC,GAAG,EACHC,YAAY,EACZC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAI,AAACZ,CAAAA,cAAcD,QAAQc,MAAM,CAACL,UAAU,AAAD,CAAE,CAAC,KAAK;IACrD;IAEA,IAAIC;IAEJ,MAAMK,UAAwB;QAAEP;IAAK;IACrC,IAAIG,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQZ,YAAY;YAClBE;YACAC;YACAc;YACAb;YACAC;YACAC;YACAC;YACAC;YACAM;YACAL;YACAE;YACAC,OAAOC;QACT;IACF;IAEA,MAAMQ,UAAUtB,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAC;QACAC;QACAe,SAASL,QAAQK,OAAO;QACxBd;QACAM;QACAJ,MAAMO,QAAQP,IAAI;QAClBC;IACF;IAEA,OAAO;QACLN;QACAgB;QACAP;QACAF;IACF;AACF,EAAC"}

package/dist/queries/getTableColumnFromPath.d.ts

@@ -1,6 +1,6 @@
 import type { SQL } from 'drizzle-orm';
 import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
-import type { FlattenedField } from 'payload';
+import type { FlattenedField, PayloadRequest } from 'payload';
 import { type PgTableWithColumns } from 'drizzle-orm/pg-core';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases } from './buildQuery.js';
@@ -37,6 +37,7 @@ type Args = {
     parentAliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
     parentIsLocalized: boolean;
     pathSegments: string[];
+    req?: Partial<PayloadRequest>;
     rootTableName?: string;
     selectFields: Record<string, GenericColumn>;
     selectLocale?: boolean;
@@ -62,6 +63,6 @@ type Args = {
  *
  * @returns The final field and column, plus any extra constraints discovered while resolving it.
  */
-export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix, value, }: Args) => TableColumn;
+export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, req, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix, value, }: Args) => TableColumn;
 export {};
 //# sourceMappingURL=getTableColumnFromPath.d.ts.map

package/dist/queries/getTableColumnFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAEV,cAAc,EAIf,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAW5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,8FAA8F;IAC9F,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACxE,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,iUAmBhC,IAAI,KAAG,WA08BT,CAAA"}
+{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAEV,cAAc,EAEd,cAAc,EAIf,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAY5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,8FAA8F;IAC9F,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACxE,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAsGD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,sUAoBhC,IAAI,KAAG,WAsiCT,CAAA"}