@payloadcms/drizzle 3.0.0-beta.106 → 3.0.0-beta.107
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/queries/getTableColumnFromPath.d.ts +6 -2
- package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
- package/dist/queries/getTableColumnFromPath.js +28 -11
- package/dist/queries/getTableColumnFromPath.js.map +1 -1
- package/dist/queries/parseParams.d.ts.map +1 -1
- package/dist/queries/parseParams.js +28 -2
- package/dist/queries/parseParams.js.map +1 -1
- package/dist/queries/sanitizeQueryValue.d.ts +11 -1
- package/dist/queries/sanitizeQueryValue.d.ts.map +1 -1
- package/dist/queries/sanitizeQueryValue.js +19 -5
- package/dist/queries/sanitizeQueryValue.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { SQL } from 'drizzle-orm';
|
|
2
|
-
import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
|
|
3
2
|
import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
|
|
4
3
|
import type { Field, FieldAffectingData, TabAsField } from 'payload';
|
|
4
|
+
import { type PgTableWithColumns } from 'drizzle-orm/pg-core';
|
|
5
5
|
import type { DrizzleAdapter, GenericColumn } from '../types.js';
|
|
6
6
|
import type { BuildQueryJoinAliases } from './buildQuery.js';
|
|
7
7
|
type Constraint = {
|
|
@@ -11,6 +11,10 @@ type Constraint = {
|
|
|
11
11
|
};
|
|
12
12
|
type TableColumn = {
|
|
13
13
|
columnName?: string;
|
|
14
|
+
columns?: {
|
|
15
|
+
idType: 'number' | 'text';
|
|
16
|
+
rawColumn: SQL<unknown>;
|
|
17
|
+
}[];
|
|
14
18
|
constraints: Constraint[];
|
|
15
19
|
field: FieldAffectingData;
|
|
16
20
|
getNotNullColumnByValue?: (val: unknown) => string;
|
|
@@ -42,7 +46,7 @@ type Args = {
|
|
|
42
46
|
value: unknown;
|
|
43
47
|
};
|
|
44
48
|
/**
|
|
45
|
-
* Transforms path to table and column name
|
|
49
|
+
* Transforms path to table and column name or to a list of OR columns
|
|
46
50
|
* Adds tables to `join`
|
|
47
51
|
* @returns TableColumn
|
|
48
52
|
*/
|
|
@@ -1 +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,
|
|
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,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,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;AAI5D,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,CAAA;QACzB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,kBAAkB,CAAA;IACzB,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,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,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WAgnBT,CAAA"}
|
|
@@ -2,9 +2,10 @@ import { and, eq, like, sql } from 'drizzle-orm';
|
|
|
2
2
|
import { APIError, flattenTopLevelFields } from 'payload';
|
|
3
3
|
import { fieldAffectsData, tabHasName } from 'payload/shared';
|
|
4
4
|
import toSnakeCase from 'to-snake-case';
|
|
5
|
+
import { validate as uuidValidate } from 'uuid';
|
|
5
6
|
import { getTableAlias } from './getTableAlias.js';
|
|
6
7
|
/**
|
|
7
|
-
* Transforms path to table and column name
|
|
8
|
+
* Transforms path to table and column name or to a list of OR columns
|
|
8
9
|
* Adds tables to `join`
|
|
9
10
|
* @returns TableColumn
|
|
10
11
|
*/ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '', value })=>{
|
|
@@ -401,20 +402,36 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
401
402
|
};
|
|
402
403
|
}
|
|
403
404
|
} else if (newCollectionPath === 'value') {
|
|
404
|
-
const
|
|
405
|
+
const hasCustomCollectionWithCustomID = field.relationTo.some((relationTo)=>!!adapter.payload.collections[relationTo].customIDType);
|
|
406
|
+
const columns = field.relationTo.map((relationTo)=>{
|
|
407
|
+
let idType = adapter.idType === 'uuid' ? 'text' : 'number';
|
|
408
|
+
const { customIDType } = adapter.payload.collections[relationTo];
|
|
409
|
+
if (customIDType) {
|
|
410
|
+
idType = customIDType;
|
|
411
|
+
}
|
|
412
|
+
// Do not add the column to OR if we know that it can't match by the type
|
|
413
|
+
// We can't do the same with idType: 'number' because `value` can be from the REST search query params
|
|
414
|
+
if (typeof value === 'number' && idType === 'text') {
|
|
415
|
+
return null;
|
|
416
|
+
}
|
|
417
|
+
// Do not add the UUID type column if incoming query value doesn't match UUID. If there aren't any collections with
|
|
418
|
+
// a custom ID type, we skip this check
|
|
419
|
+
// We need this because Postgres throws an error if querying by UUID column with a value that isn't a valid UUID.
|
|
420
|
+
if (value && !customIDType && adapter.idType === 'uuid' && hasCustomCollectionWithCustomID) {
|
|
421
|
+
if (!uuidValidate(value)) {
|
|
422
|
+
return null;
|
|
423
|
+
}
|
|
424
|
+
}
|
|
405
425
|
const relationTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[relationTo].config.slug));
|
|
406
|
-
return
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
} else {
|
|
412
|
-
column = `COALESCE(${tableColumnsNames.join(', ')})`;
|
|
413
|
-
}
|
|
426
|
+
return {
|
|
427
|
+
idType,
|
|
428
|
+
rawColumn: sql.raw(`"${aliasRelationshipTableName}"."${relationTableName}_id"`)
|
|
429
|
+
};
|
|
430
|
+
}).filter(Boolean);
|
|
414
431
|
return {
|
|
432
|
+
columns,
|
|
415
433
|
constraints,
|
|
416
434
|
field,
|
|
417
|
-
rawColumn: sql.raw(`${column}`),
|
|
418
435
|
table: aliasRelationshipTable
|
|
419
436
|
};
|
|
420
437
|
} else if (newCollectionPath === 'relationTo') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { APIError, flattenTopLevelFields } from 'payload'\nimport { fieldAffectsData, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { getTableAlias } from './getTableAlias.js'\n\ntype Constraint = {\n columnName: string\n table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n value: unknown\n}\n\ntype TableColumn = {\n columnName?: string\n constraints: Constraint[]\n field: FieldAffectingData\n getNotNullColumnByValue?: (val: unknown) => string\n pathSegments?: string[]\n rawColumn?: SQL\n table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n}\n\ntype Args = {\n adapter: DrizzleAdapter\n aliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n collectionPath: string\n columnPrefix?: string\n constraintPath?: string\n constraints?: Constraint[]\n fields: (Field | TabAsField)[]\n joins: BuildQueryJoinAliases\n locale?: string\n pathSegments: string[]\n rootTableName?: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n /**\n * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n */\n tableNameSuffix?: string\n /**\n * The raw value of the query before sanitization\n */\n value: unknown\n}\n/**\n * Transforms path to table and column name\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix = '',\n constraintPath: incomingConstraintPath,\n constraints = [],\n fields,\n joins,\n locale: incomingLocale,\n pathSegments: incomingSegments,\n rootTableName: incomingRootTableName,\n selectFields,\n tableName,\n tableNameSuffix = '',\n value,\n}: Args): TableColumn => {\n const fieldPath = incomingSegments[0]\n let locale = incomingLocale\n const rootTableName = incomingRootTableName || tableName\n let constraintPath = incomingConstraintPath || ''\n\n const field = flattenTopLevelFields(fields as Field[]).find(\n (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n ) as Field | TabAsField\n let newTableName = tableName\n\n if (!field && fieldPath === 'id') {\n selectFields.id = adapter.tables[newTableName].id\n return {\n columnName: 'id',\n constraints,\n field: {\n name: 'id',\n type: adapter.idType === 'uuid' ? 'text' : 'number',\n } as NumberField | TextField,\n table: adapter.tables[newTableName],\n }\n }\n\n if (field) {\n const pathSegments = [...incomingSegments]\n\n // If next segment is a locale,\n // we need to take it out and use it as the locale from this point on\n if ('localized' in field && field.localized && adapter.payload.config.localization) {\n const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n (locale) => locale === pathSegments[1],\n )\n\n if (matchedLocale) {\n locale = matchedLocale\n pathSegments.splice(1, 1)\n }\n }\n\n switch (field.type) {\n case 'tabs': {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.tabs.map((tab) => ({\n ...tab,\n type: 'tab',\n })),\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n case 'tab': {\n if (tabHasName(field)) {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n\n case 'group': {\n if (locale && field.localized && adapter.payload.config.localization) {\n newTableName = `${tableName}${adapter.localesSuffix}`\n\n joins.push({\n condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n\n case 'select': {\n if (field.hasMany) {\n const newTableName = adapter.tableNameMap.get(\n `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n )\n\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n table: adapter.tables[newTableName],\n })\n }\n\n return {\n columnName: 'value',\n constraints,\n field,\n table: adapter.tables[newTableName],\n }\n }\n break\n }\n\n case 'text':\n case 'number': {\n if (field.hasMany) {\n let tableType = 'texts'\n let columnName = 'text'\n if (field.type === 'number') {\n tableType = 'numbers'\n columnName = 'number'\n }\n newTableName = `${rootTableName}_${tableType}`\n const joinConstraints = [\n eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),\n like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`),\n ]\n\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: 'locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: and(...joinConstraints),\n table: adapter.tables[newTableName],\n })\n }\n\n return {\n columnName,\n constraints,\n field,\n table: adapter.tables[newTableName],\n }\n }\n break\n }\n\n case 'array': {\n newTableName = adapter.tableNameMap.get(\n `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n )\n\n const arrayParentTable = aliasTable || adapter.tables[tableName]\n\n constraintPath = `${constraintPath}${field.name}.%.`\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n }\n return getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n case 'blocks': {\n let blockTableColumn: TableColumn\n let newTableName: string\n\n // handle blockType queries\n if (pathSegments[1] === 'blockType') {\n // find the block config using the value\n const blockTypes = Array.isArray(value) ? value : [value]\n blockTypes.forEach((blockType) => {\n const block = field.blocks.find((block) => block.slug === blockType)\n newTableName = adapter.tableNameMap.get(\n `${tableName}_blocks_${toSnakeCase(block.slug)}`,\n )\n\n const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n joins.push({\n condition: eq(adapter.tables[tableName].id, newAliasTable._parentID),\n table: newAliasTable,\n })\n constraints.push({\n columnName: '_path',\n table: newAliasTable,\n value: pathSegments[0],\n })\n })\n return {\n constraints,\n field,\n getNotNullColumnByValue: () => 'id',\n table: adapter.tables[tableName],\n }\n }\n\n const hasBlockField = field.blocks.some((block) => {\n newTableName = adapter.tableNameMap.get(`${tableName}_blocks_${toSnakeCase(block.slug)}`)\n constraintPath = `${constraintPath}${field.name}.%.`\n\n let result\n const blockConstraints = []\n const blockSelectFields = {}\n try {\n result = getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints: blockConstraints,\n fields: block.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields: blockSelectFields,\n tableName: newTableName,\n value,\n })\n } catch (error) {\n // this is fine, not every block will have the field\n }\n if (!result) {\n return\n }\n blockTableColumn = result\n constraints = constraints.concat(blockConstraints)\n selectFields = { ...selectFields, ...blockSelectFields }\n if (field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(\n (aliasTable || adapter.tables[tableName]).id,\n adapter.tables[newTableName]._parentID,\n ),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale) {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(\n (aliasTable || adapter.tables[tableName]).id,\n adapter.tables[newTableName]._parentID,\n ),\n table: adapter.tables[newTableName],\n })\n }\n return true\n })\n if (hasBlockField) {\n return {\n columnName: blockTableColumn.columnName,\n constraints,\n field: blockTableColumn.field,\n pathSegments: pathSegments.slice(1),\n rawColumn: blockTableColumn.rawColumn,\n table: blockTableColumn.table,\n }\n }\n break\n }\n\n case 'relationship':\n case 'upload': {\n const newCollectionPath = pathSegments.slice(1).join('.')\n if (Array.isArray(field.relationTo) || field.hasMany) {\n let relationshipFields\n const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`\n const {\n newAliasTable: aliasRelationshipTable,\n newAliasTableName: aliasRelationshipTableName,\n } = getTableAlias({ adapter, tableName: relationTableName })\n\n // Join in the relationships table\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n eq(aliasRelationshipTable.locale, locale),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: 'locale',\n table: aliasRelationshipTable,\n value: locale,\n })\n }\n } else {\n // Join in the relationships table\n joins.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n }\n\n selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n let newAliasTable\n\n if (typeof field.relationTo === 'string') {\n const relationshipConfig = adapter.payload.collections[field.relationTo].config\n\n newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug))\n\n // parent to relationship join table\n relationshipFields = relationshipConfig.fields\n ;({ newAliasTable } = getTableAlias({ adapter, tableName: newTableName }))\n\n joins.push({\n condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n table: newAliasTable,\n })\n\n if (newCollectionPath === '' || newCollectionPath === 'id') {\n return {\n columnName: `${field.relationTo}ID`,\n constraints,\n field,\n table: aliasRelationshipTable,\n }\n }\n } else if (newCollectionPath === 'value') {\n const tableColumnsNames = field.relationTo.map((relationTo) => {\n const relationTableName = adapter.tableNameMap.get(\n toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n )\n\n return `\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`\n })\n\n let column: string\n if (tableColumnsNames.length === 1) {\n column = tableColumnsNames[0]\n } else {\n column = `COALESCE(${tableColumnsNames.join(', ')})`\n }\n\n return {\n constraints,\n field,\n rawColumn: sql.raw(`${column}`),\n table: aliasRelationshipTable,\n }\n } else if (newCollectionPath === 'relationTo') {\n const relationTo = Array.isArray(field.relationTo)\n ? field.relationTo\n : [field.relationTo]\n\n return {\n constraints,\n field,\n getNotNullColumnByValue: (val) => {\n const matchedRelation = relationTo.find((relation) => relation === val)\n if (matchedRelation) {\n return `${matchedRelation}ID`\n }\n return undefined\n },\n table: aliasRelationshipTable,\n }\n } else {\n throw new APIError('Not supported')\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraints,\n fields: relationshipFields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName: newTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n } else if (\n pathSegments.length > 1 &&\n !(pathSegments.length === 2 && pathSegments[1] === 'id')\n ) {\n // simple relationships\n const columnName = `${columnPrefix}${field.name}`\n const newTableName = adapter.tableNameMap.get(\n toSnakeCase(adapter.payload.collections[field.relationTo].config.slug),\n )\n const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n if (field.localized && adapter.payload.config.localization) {\n const { newAliasTable: aliasLocaleTable } = getTableAlias({\n adapter,\n tableName: `${rootTableName}${adapter.localesSuffix}`,\n })\n\n joins.push({\n condition: and(\n eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id),\n eq(aliasLocaleTable._locale, locale),\n ),\n table: aliasLocaleTable,\n })\n joins.push({\n condition: eq(aliasLocaleTable[columnName], newAliasTable.id),\n table: newAliasTable,\n })\n } else {\n joins.push({\n condition: eq(\n newAliasTable.id,\n aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName],\n ),\n table: newAliasTable,\n })\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraintPath: '',\n constraints,\n fields: adapter.payload.collections[field.relationTo].config.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n break\n }\n\n default: {\n // fall through\n break\n }\n }\n\n if (fieldAffectsData(field)) {\n if (field.localized && adapter.payload.config.localization) {\n // If localized, we go to localized table and set aliasTable to undefined\n // so it is not picked up below to be used as targetTable\n const parentTable = aliasTable || adapter.tables[tableName]\n newTableName = `${tableName}${adapter.localesSuffix}`\n\n joins.push({\n condition: eq(parentTable.id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n\n aliasTable = undefined\n\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n\n const targetTable = aliasTable || adapter.tables[newTableName]\n\n selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n targetTable[`${columnPrefix}${field.name}`]\n\n return {\n columnName: `${columnPrefix}${field.name}`,\n constraints,\n field,\n pathSegments,\n table: targetTable,\n }\n }\n }\n\n throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","APIError","flattenTopLevelFields","fieldAffectsData","tabHasName","toSnakeCase","getTableAlias","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","localesSuffix","push","condition","_parentID","hasMany","tableNameMap","get","parent","_locale","tableType","joinConstraints","path","arrayParentTable","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","newAliasTable","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","newCollectionPath","join","relationTo","relationshipFields","relationTableName","relationshipsSuffix","aliasRelationshipTable","newAliasTableName","aliasRelationshipTableName","relationshipConfig","collections","tableColumnsNames","column","length","raw","val","matchedRelation","relation","undefined","aliasLocaleTable","parentTable","targetTable"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { type PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport { APIError, flattenTopLevelFields } from 'payload'\nimport { fieldAffectsData, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\nimport { validate as uuidValidate } from 'uuid'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { getTableAlias } from './getTableAlias.js'\n\ntype Constraint = {\n columnName: string\n table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n value: unknown\n}\n\ntype TableColumn = {\n columnName?: string\n columns?: {\n idType: 'number' | 'text'\n rawColumn: SQL<unknown>\n }[]\n constraints: Constraint[]\n field: FieldAffectingData\n getNotNullColumnByValue?: (val: unknown) => string\n pathSegments?: string[]\n rawColumn?: SQL\n table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n}\n\ntype Args = {\n adapter: DrizzleAdapter\n aliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n collectionPath: string\n columnPrefix?: string\n constraintPath?: string\n constraints?: Constraint[]\n fields: (Field | TabAsField)[]\n joins: BuildQueryJoinAliases\n locale?: string\n pathSegments: string[]\n rootTableName?: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n /**\n * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n */\n tableNameSuffix?: string\n /**\n * The raw value of the query before sanitization\n */\n value: unknown\n}\n/**\n * Transforms path to table and column name or to a list of OR columns\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix = '',\n constraintPath: incomingConstraintPath,\n constraints = [],\n fields,\n joins,\n locale: incomingLocale,\n pathSegments: incomingSegments,\n rootTableName: incomingRootTableName,\n selectFields,\n tableName,\n tableNameSuffix = '',\n value,\n}: Args): TableColumn => {\n const fieldPath = incomingSegments[0]\n let locale = incomingLocale\n const rootTableName = incomingRootTableName || tableName\n let constraintPath = incomingConstraintPath || ''\n\n const field = flattenTopLevelFields(fields as Field[]).find(\n (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n ) as Field | TabAsField\n let newTableName = tableName\n\n if (!field && fieldPath === 'id') {\n selectFields.id = adapter.tables[newTableName].id\n return {\n columnName: 'id',\n constraints,\n field: {\n name: 'id',\n type: adapter.idType === 'uuid' ? 'text' : 'number',\n } as NumberField | TextField,\n table: adapter.tables[newTableName],\n }\n }\n\n if (field) {\n const pathSegments = [...incomingSegments]\n\n // If next segment is a locale,\n // we need to take it out and use it as the locale from this point on\n if ('localized' in field && field.localized && adapter.payload.config.localization) {\n const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n (locale) => locale === pathSegments[1],\n )\n\n if (matchedLocale) {\n locale = matchedLocale\n pathSegments.splice(1, 1)\n }\n }\n\n switch (field.type) {\n case 'tabs': {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.tabs.map((tab) => ({\n ...tab,\n type: 'tab',\n })),\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n case 'tab': {\n if (tabHasName(field)) {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n\n case 'group': {\n if (locale && field.localized && adapter.payload.config.localization) {\n newTableName = `${tableName}${adapter.localesSuffix}`\n\n joins.push({\n condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n\n case 'select': {\n if (field.hasMany) {\n const newTableName = adapter.tableNameMap.get(\n `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n )\n\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n table: adapter.tables[newTableName],\n })\n }\n\n return {\n columnName: 'value',\n constraints,\n field,\n table: adapter.tables[newTableName],\n }\n }\n break\n }\n\n case 'text':\n case 'number': {\n if (field.hasMany) {\n let tableType = 'texts'\n let columnName = 'text'\n if (field.type === 'number') {\n tableType = 'numbers'\n columnName = 'number'\n }\n newTableName = `${rootTableName}_${tableType}`\n const joinConstraints = [\n eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),\n like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`),\n ]\n\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: 'locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: and(...joinConstraints),\n table: adapter.tables[newTableName],\n })\n }\n\n return {\n columnName,\n constraints,\n field,\n table: adapter.tables[newTableName],\n }\n }\n break\n }\n\n case 'array': {\n newTableName = adapter.tableNameMap.get(\n `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n )\n\n const arrayParentTable = aliasTable || adapter.tables[tableName]\n\n constraintPath = `${constraintPath}${field.name}.%.`\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n }\n return getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints,\n fields: field.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n case 'blocks': {\n let blockTableColumn: TableColumn\n let newTableName: string\n\n // handle blockType queries\n if (pathSegments[1] === 'blockType') {\n // find the block config using the value\n const blockTypes = Array.isArray(value) ? value : [value]\n blockTypes.forEach((blockType) => {\n const block = field.blocks.find((block) => block.slug === blockType)\n newTableName = adapter.tableNameMap.get(\n `${tableName}_blocks_${toSnakeCase(block.slug)}`,\n )\n\n const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n joins.push({\n condition: eq(adapter.tables[tableName].id, newAliasTable._parentID),\n table: newAliasTable,\n })\n constraints.push({\n columnName: '_path',\n table: newAliasTable,\n value: pathSegments[0],\n })\n })\n return {\n constraints,\n field,\n getNotNullColumnByValue: () => 'id',\n table: adapter.tables[tableName],\n }\n }\n\n const hasBlockField = field.blocks.some((block) => {\n newTableName = adapter.tableNameMap.get(`${tableName}_blocks_${toSnakeCase(block.slug)}`)\n constraintPath = `${constraintPath}${field.name}.%.`\n\n let result\n const blockConstraints = []\n const blockSelectFields = {}\n try {\n result = getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints: blockConstraints,\n fields: block.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields: blockSelectFields,\n tableName: newTableName,\n value,\n })\n } catch (error) {\n // this is fine, not every block will have the field\n }\n if (!result) {\n return\n }\n blockTableColumn = result\n constraints = constraints.concat(blockConstraints)\n selectFields = { ...selectFields, ...blockSelectFields }\n if (field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq(\n (aliasTable || adapter.tables[tableName]).id,\n adapter.tables[newTableName]._parentID,\n ),\n eq(adapter.tables[newTableName]._locale, locale),\n ),\n table: adapter.tables[newTableName],\n })\n if (locale) {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins.push({\n condition: eq(\n (aliasTable || adapter.tables[tableName]).id,\n adapter.tables[newTableName]._parentID,\n ),\n table: adapter.tables[newTableName],\n })\n }\n return true\n })\n if (hasBlockField) {\n return {\n columnName: blockTableColumn.columnName,\n constraints,\n field: blockTableColumn.field,\n pathSegments: pathSegments.slice(1),\n rawColumn: blockTableColumn.rawColumn,\n table: blockTableColumn.table,\n }\n }\n break\n }\n\n case 'relationship':\n case 'upload': {\n const newCollectionPath = pathSegments.slice(1).join('.')\n if (Array.isArray(field.relationTo) || field.hasMany) {\n let relationshipFields\n const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`\n const {\n newAliasTable: aliasRelationshipTable,\n newAliasTableName: aliasRelationshipTableName,\n } = getTableAlias({ adapter, tableName: relationTableName })\n\n // Join in the relationships table\n if (locale && field.localized && adapter.payload.config.localization) {\n joins.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n eq(aliasRelationshipTable.locale, locale),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: 'locale',\n table: aliasRelationshipTable,\n value: locale,\n })\n }\n } else {\n // Join in the relationships table\n joins.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n }\n\n selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n let newAliasTable\n\n if (typeof field.relationTo === 'string') {\n const relationshipConfig = adapter.payload.collections[field.relationTo].config\n\n newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug))\n\n // parent to relationship join table\n relationshipFields = relationshipConfig.fields\n ;({ newAliasTable } = getTableAlias({ adapter, tableName: newTableName }))\n\n joins.push({\n condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n table: newAliasTable,\n })\n\n if (newCollectionPath === '' || newCollectionPath === 'id') {\n return {\n columnName: `${field.relationTo}ID`,\n constraints,\n field,\n table: aliasRelationshipTable,\n }\n }\n } else if (newCollectionPath === 'value') {\n const hasCustomCollectionWithCustomID = field.relationTo.some(\n (relationTo) => !!adapter.payload.collections[relationTo].customIDType,\n )\n\n const columns: TableColumn['columns'] = field.relationTo\n .map((relationTo) => {\n let idType: 'number' | 'text' = adapter.idType === 'uuid' ? 'text' : 'number'\n\n const { customIDType } = adapter.payload.collections[relationTo]\n\n if (customIDType) {\n idType = customIDType\n }\n\n // Do not add the column to OR if we know that it can't match by the type\n // We can't do the same with idType: 'number' because `value` can be from the REST search query params\n if (typeof value === 'number' && idType === 'text') {\n return null\n }\n\n // Do not add the UUID type column if incoming query value doesn't match UUID. If there aren't any collections with\n // a custom ID type, we skip this check\n // We need this because Postgres throws an error if querying by UUID column with a value that isn't a valid UUID.\n if (\n value &&\n !customIDType &&\n adapter.idType === 'uuid' &&\n hasCustomCollectionWithCustomID\n ) {\n if (!uuidValidate(value)) {\n return null\n }\n }\n\n const relationTableName = adapter.tableNameMap.get(\n toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n )\n\n return {\n idType,\n rawColumn: sql.raw(`\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`),\n }\n })\n .filter(Boolean)\n\n return {\n columns,\n constraints,\n field,\n table: aliasRelationshipTable,\n }\n } else if (newCollectionPath === 'relationTo') {\n const relationTo = Array.isArray(field.relationTo)\n ? field.relationTo\n : [field.relationTo]\n\n return {\n constraints,\n field,\n getNotNullColumnByValue: (val) => {\n const matchedRelation = relationTo.find((relation) => relation === val)\n if (matchedRelation) {\n return `${matchedRelation}ID`\n }\n return undefined\n },\n table: aliasRelationshipTable,\n }\n } else {\n throw new APIError('Not supported')\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraints,\n fields: relationshipFields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName: newTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n } else if (\n pathSegments.length > 1 &&\n !(pathSegments.length === 2 && pathSegments[1] === 'id')\n ) {\n // simple relationships\n const columnName = `${columnPrefix}${field.name}`\n const newTableName = adapter.tableNameMap.get(\n toSnakeCase(adapter.payload.collections[field.relationTo].config.slug),\n )\n const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n if (field.localized && adapter.payload.config.localization) {\n const { newAliasTable: aliasLocaleTable } = getTableAlias({\n adapter,\n tableName: `${rootTableName}${adapter.localesSuffix}`,\n })\n\n joins.push({\n condition: and(\n eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id),\n eq(aliasLocaleTable._locale, locale),\n ),\n table: aliasLocaleTable,\n })\n joins.push({\n condition: eq(aliasLocaleTable[columnName], newAliasTable.id),\n table: newAliasTable,\n })\n } else {\n joins.push({\n condition: eq(\n newAliasTable.id,\n aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName],\n ),\n table: newAliasTable,\n })\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraintPath: '',\n constraints,\n fields: adapter.payload.collections[field.relationTo].config.fields,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n break\n }\n\n default: {\n // fall through\n break\n }\n }\n\n if (fieldAffectsData(field)) {\n if (field.localized && adapter.payload.config.localization) {\n // If localized, we go to localized table and set aliasTable to undefined\n // so it is not picked up below to be used as targetTable\n const parentTable = aliasTable || adapter.tables[tableName]\n newTableName = `${tableName}${adapter.localesSuffix}`\n\n joins.push({\n condition: eq(parentTable.id, adapter.tables[newTableName]._parentID),\n table: adapter.tables[newTableName],\n })\n\n aliasTable = undefined\n\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n\n const targetTable = aliasTable || adapter.tables[newTableName]\n\n selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n targetTable[`${columnPrefix}${field.name}`]\n\n return {\n columnName: `${columnPrefix}${field.name}`,\n constraints,\n field,\n pathSegments,\n table: targetTable,\n }\n }\n }\n\n throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","APIError","flattenTopLevelFields","fieldAffectsData","tabHasName","toSnakeCase","validate","uuidValidate","getTableAlias","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","localesSuffix","push","condition","_parentID","hasMany","tableNameMap","get","parent","_locale","tableType","joinConstraints","path","arrayParentTable","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","newAliasTable","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","newCollectionPath","join","relationTo","relationshipFields","relationTableName","relationshipsSuffix","aliasRelationshipTable","newAliasTableName","aliasRelationshipTableName","relationshipConfig","collections","hasCustomCollectionWithCustomID","customIDType","columns","raw","filter","Boolean","val","matchedRelation","relation","undefined","length","aliasLocaleTable","parentTable","targetTable"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseParams.d.ts","sourceRoot":"","sources":["../../src/queries/parseParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,KAAK,EAAY,KAAK,EAAE,MAAM,SAAS,CAAA;AAMrD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAM5D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,SAAS,EACT,KAAK,GACN,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"parseParams.d.ts","sourceRoot":"","sources":["../../src/queries/parseParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,KAAK,EAAY,KAAK,EAAE,MAAM,SAAS,CAAA;AAMrD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAM5D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,SAAS,EACT,KAAK,GACN,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAmRrB"}
|
|
@@ -40,7 +40,7 @@ export async function parseParams({ adapter, fields, joins, locale, selectFields
|
|
|
40
40
|
for (let operator of Object.keys(pathOperators)){
|
|
41
41
|
if (validOperators.includes(operator)) {
|
|
42
42
|
const val = where[relationOrPath][operator];
|
|
43
|
-
const { columnName, constraints: queryConstraints, field, getNotNullColumnByValue, pathSegments, rawColumn, table } = getTableColumnFromPath({
|
|
43
|
+
const { columnName, columns, constraints: queryConstraints, field, getNotNullColumnByValue, pathSegments, rawColumn, table } = getTableColumnFromPath({
|
|
44
44
|
adapter,
|
|
45
45
|
collectionPath: relationOrPath,
|
|
46
46
|
fields,
|
|
@@ -154,6 +154,7 @@ export async function parseParams({ adapter, fields, joins, locale, selectFields
|
|
|
154
154
|
}
|
|
155
155
|
const sanitizedQueryValue = sanitizeQueryValue({
|
|
156
156
|
adapter,
|
|
157
|
+
columns,
|
|
157
158
|
field,
|
|
158
159
|
operator,
|
|
159
160
|
relationOrPath,
|
|
@@ -162,7 +163,32 @@ export async function parseParams({ adapter, fields, joins, locale, selectFields
|
|
|
162
163
|
if (sanitizedQueryValue === null) {
|
|
163
164
|
break;
|
|
164
165
|
}
|
|
165
|
-
const { operator: queryOperator, value: queryValue } = sanitizedQueryValue;
|
|
166
|
+
const { columns: queryColumns, operator: queryOperator, value: queryValue } = sanitizedQueryValue;
|
|
167
|
+
// Handle polymorphic relationships by value
|
|
168
|
+
if (queryColumns) {
|
|
169
|
+
if (!queryColumns.length) {
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
172
|
+
let wrapOperator = or;
|
|
173
|
+
if (queryValue === null && [
|
|
174
|
+
'equals',
|
|
175
|
+
'not_equals'
|
|
176
|
+
].includes(operator)) {
|
|
177
|
+
if (operator === 'equals') {
|
|
178
|
+
wrapOperator = and;
|
|
179
|
+
}
|
|
180
|
+
constraints.push(wrapOperator(...queryColumns.map(({ rawColumn })=>operator === 'equals' ? isNull(rawColumn) : isNotNull(rawColumn))));
|
|
181
|
+
break;
|
|
182
|
+
}
|
|
183
|
+
if ([
|
|
184
|
+
'not_equals',
|
|
185
|
+
'not_in'
|
|
186
|
+
].includes(operator)) {
|
|
187
|
+
wrapOperator = and;
|
|
188
|
+
}
|
|
189
|
+
constraints.push(wrapOperator(...queryColumns.map(({ rawColumn, value })=>adapter.operators[queryOperator](rawColumn, value))));
|
|
190
|
+
break;
|
|
191
|
+
}
|
|
166
192
|
if (queryOperator === 'not_equals' && queryValue !== null) {
|
|
167
193
|
constraints.push(or(isNull(rawColumn || table[columnName]), /* eslint-disable @typescript-eslint/no-explicit-any */ ne(rawColumn || table[columnName], queryValue)));
|
|
168
194
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/queries/parseParams.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { Field, Operator, Where } from 'payload'\n\nimport { and, isNotNull, isNull, ne, notInArray, or, sql } from 'drizzle-orm'\nimport { QueryError } from 'payload'\nimport { validOperators } from 'payload/shared'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { buildAndOrConditions } from './buildAndOrConditions.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { sanitizeQueryValue } from './sanitizeQueryValue.js'\n\ntype Args = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins: BuildQueryJoinAliases\n locale: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n where: Where\n}\n\nexport async function parseParams({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n tableName,\n where,\n}: Args): Promise<SQL> {\n let result: SQL\n const constraints: SQL[] = []\n\n if (typeof where === 'object' && Object.keys(where).length > 0) {\n // We need to determine if the whereKey is an AND, OR, or a schema path\n for (const relationOrPath of Object.keys(where)) {\n if (relationOrPath) {\n const condition = where[relationOrPath]\n let conditionOperator: typeof and | typeof or\n if (relationOrPath.toLowerCase() === 'and') {\n conditionOperator = and\n } else if (relationOrPath.toLowerCase() === 'or') {\n conditionOperator = or\n }\n if (Array.isArray(condition)) {\n const builtConditions = await buildAndOrConditions({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n tableName,\n where: condition,\n })\n if (builtConditions.length > 0) {\n result = conditionOperator(...builtConditions)\n }\n } else {\n // It's a path - and there can be multiple comparisons on a single path.\n // For example - title like 'test' and title not equal to 'tester'\n // So we need to loop on keys again here to handle each operator independently\n const pathOperators = where[relationOrPath]\n if (typeof pathOperators === 'object') {\n for (let operator of Object.keys(pathOperators)) {\n if (validOperators.includes(operator as Operator)) {\n const val = where[relationOrPath][operator]\n const {\n columnName,\n constraints: queryConstraints,\n field,\n getNotNullColumnByValue,\n pathSegments,\n rawColumn,\n table,\n } = getTableColumnFromPath({\n adapter,\n collectionPath: relationOrPath,\n fields,\n joins,\n locale,\n pathSegments: relationOrPath.replace(/__/g, '.').split('.'),\n selectFields,\n tableName,\n value: val,\n })\n\n queryConstraints.forEach(({ columnName: col, table: constraintTable, value }) => {\n if (typeof value === 'string' && value.indexOf('%') > -1) {\n constraints.push(adapter.operators.like(constraintTable[col], value))\n } else {\n constraints.push(adapter.operators.equals(constraintTable[col], value))\n }\n })\n\n if (\n ['json', 'richText'].includes(field.type) &&\n Array.isArray(pathSegments) &&\n pathSegments.length > 1\n ) {\n const segments = pathSegments.slice(1)\n segments.unshift(table[columnName].name)\n\n if (field.type === 'richText') {\n // use the table name from the nearest join to handle blocks, arrays, etc. or use the tableName arg\n const jsonTable =\n joins.length === 0\n ? tableName\n : joins[joins.length - 1].table[\n Object.getOwnPropertySymbols(joins[joins.length - 1].table)[0]\n ]\n const jsonQuery = adapter.createJSONQuery({\n operator,\n pathSegments: segments,\n table: jsonTable,\n treatAsArray: ['children'],\n treatRootAsArray: true,\n value: val,\n })\n\n constraints.push(sql.raw(jsonQuery))\n break\n }\n\n const jsonQuery = adapter.convertPathToJSONTraversal(pathSegments)\n const operatorKeys: Record<string, { operator: string; wildcard: string }> = {\n contains: { operator: 'like', wildcard: '%' },\n equals: { operator: '=', wildcard: '' },\n exists: { operator: val === true ? 'is not null' : 'is null', wildcard: '' },\n in: { operator: 'in', wildcard: '' },\n like: { operator: 'like', wildcard: '%' },\n not_equals: { operator: '<>', wildcard: '' },\n not_in: { operator: 'not in', wildcard: '' },\n }\n\n let formattedValue = val\n if (adapter.name === 'sqlite' && operator === 'equals' && !isNaN(val)) {\n formattedValue = val\n } else if (['in', 'not_in'].includes(operator) && Array.isArray(val)) {\n if (adapter.name === 'sqlite') {\n formattedValue = `(${val.map((v) => `${v}`).join(',')})`\n } else {\n formattedValue = `(${val.map((v) => `'${v}'`).join(', ')})`\n }\n } else {\n formattedValue = `'${operatorKeys[operator].wildcard}${val}${operatorKeys[operator].wildcard}'`\n }\n if (operator === 'exists') {\n formattedValue = ''\n }\n\n constraints.push(\n sql.raw(\n `${table[columnName].name}${jsonQuery} ${operatorKeys[operator].operator} ${formattedValue}`,\n ),\n )\n\n break\n }\n\n if (getNotNullColumnByValue) {\n const columnName = getNotNullColumnByValue(val)\n if (columnName) {\n constraints.push(isNotNull(table[columnName]))\n } else {\n throw new QueryError([{ path: relationOrPath }])\n }\n break\n }\n\n if (\n operator === 'like' &&\n (field.type === 'number' || table[columnName].columnType === 'PgUUID')\n ) {\n operator = 'equals'\n }\n\n if (operator === 'like') {\n constraints.push(\n and(\n ...val\n .split(' ')\n .map((word) => adapter.operators.like(table[columnName], `%${word}%`)),\n ),\n )\n break\n }\n\n const sanitizedQueryValue = sanitizeQueryValue({\n adapter,\n field,\n operator,\n relationOrPath,\n val,\n })\n\n if (sanitizedQueryValue === null) {\n break\n }\n\n const { operator: queryOperator, value: queryValue } = sanitizedQueryValue\n\n if (queryOperator === 'not_equals' && queryValue !== null) {\n constraints.push(\n or(\n isNull(rawColumn || table[columnName]),\n /* eslint-disable @typescript-eslint/no-explicit-any */\n ne<any>(rawColumn || table[columnName], queryValue),\n ),\n )\n break\n }\n\n if (\n (field.type === 'relationship' || field.type === 'upload') &&\n Array.isArray(queryValue) &&\n operator === 'not_in'\n ) {\n constraints.push(\n sql`(${notInArray(table[columnName], queryValue)} OR\n ${table[columnName]}\n IS\n NULL)`,\n )\n\n break\n }\n\n if (operator === 'equals' && queryValue === null) {\n constraints.push(isNull(rawColumn || table[columnName]))\n break\n }\n\n if (operator === 'not_equals' && queryValue === null) {\n constraints.push(isNotNull(rawColumn || table[columnName]))\n break\n }\n\n constraints.push(\n adapter.operators[queryOperator](rawColumn || table[columnName], queryValue),\n )\n }\n }\n }\n }\n }\n }\n }\n if (constraints.length > 0) {\n if (result) {\n result = and(result, ...constraints)\n } else {\n result = and(...constraints)\n }\n }\n if (constraints.length === 1 && !result) {\n ;[result] = constraints\n }\n\n return result\n}\n"],"names":["and","isNotNull","isNull","ne","notInArray","or","sql","QueryError","validOperators","buildAndOrConditions","getTableColumnFromPath","sanitizeQueryValue","parseParams","adapter","fields","joins","locale","selectFields","tableName","where","result","constraints","Object","keys","length","relationOrPath","condition","conditionOperator","toLowerCase","Array","isArray","builtConditions","pathOperators","operator","includes","val","columnName","queryConstraints","field","getNotNullColumnByValue","pathSegments","rawColumn","table","collectionPath","replace","split","value","forEach","col","constraintTable","indexOf","push","operators","like","equals","type","segments","slice","unshift","name","jsonTable","getOwnPropertySymbols","jsonQuery","createJSONQuery","treatAsArray","treatRootAsArray","raw","convertPathToJSONTraversal","operatorKeys","contains","wildcard","exists","in","not_equals","not_in","formattedValue","isNaN","map","v","join","path","columnType","word","sanitizedQueryValue","queryOperator","queryValue"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/queries/parseParams.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { Field, Operator, Where } from 'payload'\n\nimport { and, isNotNull, isNull, ne, notInArray, or, sql } from 'drizzle-orm'\nimport { QueryError } from 'payload'\nimport { validOperators } from 'payload/shared'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { buildAndOrConditions } from './buildAndOrConditions.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { sanitizeQueryValue } from './sanitizeQueryValue.js'\n\ntype Args = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins: BuildQueryJoinAliases\n locale: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n where: Where\n}\n\nexport async function parseParams({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n tableName,\n where,\n}: Args): Promise<SQL> {\n let result: SQL\n const constraints: SQL[] = []\n\n if (typeof where === 'object' && Object.keys(where).length > 0) {\n // We need to determine if the whereKey is an AND, OR, or a schema path\n for (const relationOrPath of Object.keys(where)) {\n if (relationOrPath) {\n const condition = where[relationOrPath]\n let conditionOperator: typeof and | typeof or\n if (relationOrPath.toLowerCase() === 'and') {\n conditionOperator = and\n } else if (relationOrPath.toLowerCase() === 'or') {\n conditionOperator = or\n }\n if (Array.isArray(condition)) {\n const builtConditions = await buildAndOrConditions({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n tableName,\n where: condition,\n })\n if (builtConditions.length > 0) {\n result = conditionOperator(...builtConditions)\n }\n } else {\n // It's a path - and there can be multiple comparisons on a single path.\n // For example - title like 'test' and title not equal to 'tester'\n // So we need to loop on keys again here to handle each operator independently\n const pathOperators = where[relationOrPath]\n if (typeof pathOperators === 'object') {\n for (let operator of Object.keys(pathOperators)) {\n if (validOperators.includes(operator as Operator)) {\n const val = where[relationOrPath][operator]\n\n const {\n columnName,\n columns,\n constraints: queryConstraints,\n field,\n getNotNullColumnByValue,\n pathSegments,\n rawColumn,\n table,\n } = getTableColumnFromPath({\n adapter,\n collectionPath: relationOrPath,\n fields,\n joins,\n locale,\n pathSegments: relationOrPath.replace(/__/g, '.').split('.'),\n selectFields,\n tableName,\n value: val,\n })\n\n queryConstraints.forEach(({ columnName: col, table: constraintTable, value }) => {\n if (typeof value === 'string' && value.indexOf('%') > -1) {\n constraints.push(adapter.operators.like(constraintTable[col], value))\n } else {\n constraints.push(adapter.operators.equals(constraintTable[col], value))\n }\n })\n\n if (\n ['json', 'richText'].includes(field.type) &&\n Array.isArray(pathSegments) &&\n pathSegments.length > 1\n ) {\n const segments = pathSegments.slice(1)\n segments.unshift(table[columnName].name)\n\n if (field.type === 'richText') {\n // use the table name from the nearest join to handle blocks, arrays, etc. or use the tableName arg\n const jsonTable =\n joins.length === 0\n ? tableName\n : joins[joins.length - 1].table[\n Object.getOwnPropertySymbols(joins[joins.length - 1].table)[0]\n ]\n const jsonQuery = adapter.createJSONQuery({\n operator,\n pathSegments: segments,\n table: jsonTable,\n treatAsArray: ['children'],\n treatRootAsArray: true,\n value: val,\n })\n\n constraints.push(sql.raw(jsonQuery))\n break\n }\n\n const jsonQuery = adapter.convertPathToJSONTraversal(pathSegments)\n const operatorKeys: Record<string, { operator: string; wildcard: string }> = {\n contains: { operator: 'like', wildcard: '%' },\n equals: { operator: '=', wildcard: '' },\n exists: { operator: val === true ? 'is not null' : 'is null', wildcard: '' },\n in: { operator: 'in', wildcard: '' },\n like: { operator: 'like', wildcard: '%' },\n not_equals: { operator: '<>', wildcard: '' },\n not_in: { operator: 'not in', wildcard: '' },\n }\n\n let formattedValue = val\n if (adapter.name === 'sqlite' && operator === 'equals' && !isNaN(val)) {\n formattedValue = val\n } else if (['in', 'not_in'].includes(operator) && Array.isArray(val)) {\n if (adapter.name === 'sqlite') {\n formattedValue = `(${val.map((v) => `${v}`).join(',')})`\n } else {\n formattedValue = `(${val.map((v) => `'${v}'`).join(', ')})`\n }\n } else {\n formattedValue = `'${operatorKeys[operator].wildcard}${val}${operatorKeys[operator].wildcard}'`\n }\n if (operator === 'exists') {\n formattedValue = ''\n }\n\n constraints.push(\n sql.raw(\n `${table[columnName].name}${jsonQuery} ${operatorKeys[operator].operator} ${formattedValue}`,\n ),\n )\n\n break\n }\n\n if (getNotNullColumnByValue) {\n const columnName = getNotNullColumnByValue(val)\n if (columnName) {\n constraints.push(isNotNull(table[columnName]))\n } else {\n throw new QueryError([{ path: relationOrPath }])\n }\n break\n }\n\n if (\n operator === 'like' &&\n (field.type === 'number' || table[columnName].columnType === 'PgUUID')\n ) {\n operator = 'equals'\n }\n\n if (operator === 'like') {\n constraints.push(\n and(\n ...val\n .split(' ')\n .map((word) => adapter.operators.like(table[columnName], `%${word}%`)),\n ),\n )\n break\n }\n\n const sanitizedQueryValue = sanitizeQueryValue({\n adapter,\n columns,\n field,\n operator,\n relationOrPath,\n val,\n })\n\n if (sanitizedQueryValue === null) {\n break\n }\n\n const {\n columns: queryColumns,\n operator: queryOperator,\n value: queryValue,\n } = sanitizedQueryValue\n\n // Handle polymorphic relationships by value\n if (queryColumns) {\n if (!queryColumns.length) {\n break\n }\n\n let wrapOperator = or\n\n if (queryValue === null && ['equals', 'not_equals'].includes(operator)) {\n if (operator === 'equals') {\n wrapOperator = and\n }\n\n constraints.push(\n wrapOperator(\n ...queryColumns.map(({ rawColumn }) =>\n operator === 'equals' ? isNull(rawColumn) : isNotNull(rawColumn),\n ),\n ),\n )\n break\n }\n\n if (['not_equals', 'not_in'].includes(operator)) {\n wrapOperator = and\n }\n\n constraints.push(\n wrapOperator(\n ...queryColumns.map(({ rawColumn, value }) =>\n adapter.operators[queryOperator](rawColumn, value),\n ),\n ),\n )\n\n break\n }\n\n if (queryOperator === 'not_equals' && queryValue !== null) {\n constraints.push(\n or(\n isNull(rawColumn || table[columnName]),\n /* eslint-disable @typescript-eslint/no-explicit-any */\n ne<any>(rawColumn || table[columnName], queryValue),\n ),\n )\n break\n }\n\n if (\n (field.type === 'relationship' || field.type === 'upload') &&\n Array.isArray(queryValue) &&\n operator === 'not_in'\n ) {\n constraints.push(\n sql`(${notInArray(table[columnName], queryValue)} OR\n ${table[columnName]}\n IS\n NULL)`,\n )\n\n break\n }\n\n if (operator === 'equals' && queryValue === null) {\n constraints.push(isNull(rawColumn || table[columnName]))\n break\n }\n\n if (operator === 'not_equals' && queryValue === null) {\n constraints.push(isNotNull(rawColumn || table[columnName]))\n break\n }\n\n constraints.push(\n adapter.operators[queryOperator](rawColumn || table[columnName], queryValue),\n )\n }\n }\n }\n }\n }\n }\n }\n if (constraints.length > 0) {\n if (result) {\n result = and(result, ...constraints)\n } else {\n result = and(...constraints)\n }\n }\n if (constraints.length === 1 && !result) {\n ;[result] = constraints\n }\n\n return result\n}\n"],"names":["and","isNotNull","isNull","ne","notInArray","or","sql","QueryError","validOperators","buildAndOrConditions","getTableColumnFromPath","sanitizeQueryValue","parseParams","adapter","fields","joins","locale","selectFields","tableName","where","result","constraints","Object","keys","length","relationOrPath","condition","conditionOperator","toLowerCase","Array","isArray","builtConditions","pathOperators","operator","includes","val","columnName","columns","queryConstraints","field","getNotNullColumnByValue","pathSegments","rawColumn","table","collectionPath","replace","split","value","forEach","col","constraintTable","indexOf","push","operators","like","equals","type","segments","slice","unshift","name","jsonTable","getOwnPropertySymbols","jsonQuery","createJSONQuery","treatAsArray","treatRootAsArray","raw","convertPathToJSONTraversal","operatorKeys","contains","wildcard","exists","in","not_equals","not_in","formattedValue","isNaN","map","v","join","path","columnType","word","sanitizedQueryValue","queryColumns","queryOperator","queryValue","wrapOperator"],"mappings":"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"}
|
|
@@ -1,13 +1,23 @@
|
|
|
1
|
+
import type { SQL } from 'drizzle-orm';
|
|
1
2
|
import { type Field, type TabAsField } from 'payload';
|
|
2
3
|
import type { DrizzleAdapter } from '../types.js';
|
|
3
4
|
type SanitizeQueryValueArgs = {
|
|
4
5
|
adapter: DrizzleAdapter;
|
|
6
|
+
columns?: {
|
|
7
|
+
idType: 'number' | 'text';
|
|
8
|
+
rawColumn: SQL<unknown>;
|
|
9
|
+
}[];
|
|
5
10
|
field: Field | TabAsField;
|
|
6
11
|
operator: string;
|
|
7
12
|
relationOrPath: string;
|
|
8
13
|
val: any;
|
|
9
14
|
};
|
|
10
|
-
|
|
15
|
+
type SanitizedColumn = {
|
|
16
|
+
rawColumn: SQL<unknown>;
|
|
17
|
+
value: unknown;
|
|
18
|
+
};
|
|
19
|
+
export declare const sanitizeQueryValue: ({ adapter, columns, field, operator: operatorArg, relationOrPath, val, }: SanitizeQueryValueArgs) => {
|
|
20
|
+
columns?: SanitizedColumn[];
|
|
11
21
|
operator: string;
|
|
12
22
|
value: unknown;
|
|
13
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAG/F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAA4C,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAG/F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,CAAA;QACzB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;IACvB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,eAAO,MAAM,kBAAkB,6EAO5B,sBAAsB,KAAG;IAC1B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CAyJf,CAAA"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { APIError, createArrayFromCommaDelineated } from 'payload';
|
|
2
2
|
import { fieldAffectsData } from 'payload/shared';
|
|
3
|
-
export const sanitizeQueryValue = ({ adapter, field, operator: operatorArg, relationOrPath, val })=>{
|
|
3
|
+
export const sanitizeQueryValue = ({ adapter, columns, field, operator: operatorArg, relationOrPath, val })=>{
|
|
4
4
|
let operator = operatorArg;
|
|
5
5
|
let formattedValue = val;
|
|
6
|
+
let formattedColumns;
|
|
6
7
|
if (!fieldAffectsData(field)) {
|
|
7
8
|
return {
|
|
8
9
|
operator,
|
|
@@ -79,10 +80,22 @@ export const sanitizeQueryValue = ({ adapter, field, operator: operatorArg, rela
|
|
|
79
80
|
};
|
|
80
81
|
idType = typeMap[mixedType];
|
|
81
82
|
} else {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
formattedColumns = columns.map(({ idType, rawColumn })=>{
|
|
84
|
+
let formattedValue;
|
|
85
|
+
if (idType === 'number') {
|
|
86
|
+
formattedValue = Number(val);
|
|
87
|
+
if (Number.isNaN(formattedValue)) {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
if (idType === 'text') {
|
|
92
|
+
formattedValue = String(val);
|
|
93
|
+
}
|
|
94
|
+
return {
|
|
95
|
+
rawColumn,
|
|
96
|
+
value: formattedValue
|
|
97
|
+
};
|
|
98
|
+
}).filter(Boolean);
|
|
86
99
|
}
|
|
87
100
|
if (Array.isArray(formattedValue)) {
|
|
88
101
|
formattedValue = formattedValue.map((value)=>{
|
|
@@ -120,6 +133,7 @@ export const sanitizeQueryValue = ({ adapter, field, operator: operatorArg, rela
|
|
|
120
133
|
}
|
|
121
134
|
}
|
|
122
135
|
return {
|
|
136
|
+
columns: formattedColumns,
|
|
123
137
|
operator,
|
|
124
138
|
value: formattedValue
|
|
125
139
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/queries/sanitizeQueryValue.ts"],"sourcesContent":["import { APIError, createArrayFromCommaDelineated, type Field, type TabAsField } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\nimport type { DrizzleAdapter } from '../types.js'\n\ntype SanitizeQueryValueArgs = {\n adapter: DrizzleAdapter\n field: Field | TabAsField\n operator: string\n relationOrPath: string\n val: any\n}\n\nexport const sanitizeQueryValue = ({\n adapter,\n field,\n operator: operatorArg,\n relationOrPath,\n val,\n}: SanitizeQueryValueArgs): { operator: string
|
|
1
|
+
{"version":3,"sources":["../../src/queries/sanitizeQueryValue.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\n\nimport { APIError, createArrayFromCommaDelineated, type Field, type TabAsField } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\nimport type { DrizzleAdapter } from '../types.js'\n\ntype SanitizeQueryValueArgs = {\n adapter: DrizzleAdapter\n columns?: {\n idType: 'number' | 'text'\n rawColumn: SQL<unknown>\n }[]\n field: Field | TabAsField\n operator: string\n relationOrPath: string\n val: any\n}\n\ntype SanitizedColumn = {\n rawColumn: SQL<unknown>\n value: unknown\n}\n\nexport const sanitizeQueryValue = ({\n adapter,\n columns,\n field,\n operator: operatorArg,\n relationOrPath,\n val,\n}: SanitizeQueryValueArgs): {\n columns?: SanitizedColumn[]\n operator: string\n value: unknown\n} => {\n let operator = operatorArg\n let formattedValue = val\n let formattedColumns: SanitizedColumn[]\n\n if (!fieldAffectsData(field)) {\n return { operator, value: formattedValue }\n }\n\n if (\n (field.type === 'relationship' || field.type === 'upload') &&\n !relationOrPath.endsWith('relationTo') &&\n Array.isArray(formattedValue)\n ) {\n const allPossibleIDTypes: (number | string)[] = []\n formattedValue.forEach((val) => {\n if (adapter.idType !== 'uuid' && typeof val === 'string') {\n allPossibleIDTypes.push(val, parseInt(val))\n } else if (typeof val === 'string') {\n allPossibleIDTypes.push(val)\n } else {\n allPossibleIDTypes.push(val, String(val))\n }\n })\n formattedValue = allPossibleIDTypes\n }\n\n // Cast incoming values as proper searchable types\n if (field.type === 'checkbox' && typeof val === 'string') {\n if (val.toLowerCase() === 'true') {\n formattedValue = true\n }\n if (val.toLowerCase() === 'false') {\n formattedValue = false\n }\n }\n\n if (['all', 'in', 'not_in'].includes(operator)) {\n if (typeof formattedValue === 'string') {\n formattedValue = createArrayFromCommaDelineated(formattedValue)\n\n if (field.type === 'number') {\n formattedValue = formattedValue.map((arrayVal) => parseFloat(arrayVal))\n }\n }\n\n if (!Array.isArray(formattedValue) || formattedValue.length === 0) {\n return null\n }\n }\n\n if (field.type === 'number' && typeof formattedValue === 'string') {\n formattedValue = Number(val)\n }\n\n if (field.type === 'date' && operator !== 'exists') {\n if (typeof val === 'string') {\n formattedValue = new Date(val).toISOString()\n if (Number.isNaN(Date.parse(formattedValue))) {\n return { operator, value: undefined }\n }\n } else if (typeof val === 'number') {\n formattedValue = new Date(val).toISOString()\n }\n }\n\n if (field.type === 'relationship' || field.type === 'upload') {\n if (val === 'null') {\n formattedValue = null\n } else if (!(formattedValue === null || typeof formattedValue === 'boolean')) {\n // convert the value to the idType of the relationship\n let idType: 'number' | 'text'\n if (typeof field.relationTo === 'string') {\n const collection = adapter.payload.collections[field.relationTo]\n const mixedType: 'number' | 'serial' | 'text' | 'uuid' =\n collection.customIDType || adapter.idType\n const typeMap: Record<string, 'number' | 'text'> = {\n number: 'number',\n serial: 'number',\n text: 'text',\n uuid: 'text',\n }\n idType = typeMap[mixedType]\n } else {\n formattedColumns = columns\n .map(({ idType, rawColumn }) => {\n let formattedValue: number | string\n if (idType === 'number') {\n formattedValue = Number(val)\n\n if (Number.isNaN(formattedValue)) {\n return null\n }\n }\n if (idType === 'text') {\n formattedValue = String(val)\n }\n\n return {\n rawColumn,\n value: formattedValue,\n }\n })\n .filter(Boolean)\n }\n if (Array.isArray(formattedValue)) {\n formattedValue = formattedValue.map((value) => {\n if (idType === 'number') {\n return Number(value)\n }\n if (idType === 'text') {\n return String(value)\n }\n return value\n })\n } else {\n if (idType === 'number') {\n formattedValue = Number(val)\n }\n if (idType === 'text') {\n formattedValue = String(val)\n }\n }\n }\n }\n\n if ('hasMany' in field && field.hasMany && operator === 'contains') {\n operator = 'equals'\n }\n\n if (operator === 'near' || operator === 'within' || operator === 'intersects') {\n throw new APIError(\n `Querying with '${operator}' is not supported with the postgres database adapter.`,\n )\n }\n\n if (operator === 'contains') {\n formattedValue = `%${formattedValue}%`\n }\n\n if (operator === 'exists') {\n formattedValue = formattedValue === 'true' || formattedValue === true\n if (formattedValue === false) {\n operator = 'isNull'\n }\n }\n\n return {\n columns: formattedColumns,\n operator,\n value: formattedValue,\n }\n}\n"],"names":["APIError","createArrayFromCommaDelineated","fieldAffectsData","sanitizeQueryValue","adapter","columns","field","operator","operatorArg","relationOrPath","val","formattedValue","formattedColumns","value","type","endsWith","Array","isArray","allPossibleIDTypes","forEach","idType","push","parseInt","String","toLowerCase","includes","map","arrayVal","parseFloat","length","Number","Date","toISOString","isNaN","parse","undefined","relationTo","collection","payload","collections","mixedType","customIDType","typeMap","number","serial","text","uuid","rawColumn","filter","Boolean","hasMany"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/drizzle",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.107",
|
|
4
4
|
"description": "A library of shared functions used by different payload database adapters",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -46,10 +46,10 @@
|
|
|
46
46
|
"@types/pg": "8.10.2",
|
|
47
47
|
"@types/to-snake-case": "1.0.0",
|
|
48
48
|
"@payloadcms/eslint-config": "3.0.0-beta.97",
|
|
49
|
-
"payload": "3.0.0-beta.
|
|
49
|
+
"payload": "3.0.0-beta.107"
|
|
50
50
|
},
|
|
51
51
|
"peerDependencies": {
|
|
52
|
-
"payload": "3.0.0-beta.
|
|
52
|
+
"payload": "3.0.0-beta.107"
|
|
53
53
|
},
|
|
54
54
|
"scripts": {
|
|
55
55
|
"build": "pnpm build:swc && pnpm build:types",
|