@payloadcms/drizzle 3.0.0-canary.51be7be → 3.0.0-canary.5624723

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.
Files changed (179) hide show
  1. package/dist/countGlobalVersions.d.ts +3 -0
  2. package/dist/countGlobalVersions.d.ts.map +1 -0
  3. package/dist/countGlobalVersions.js +27 -0
  4. package/dist/countGlobalVersions.js.map +1 -0
  5. package/dist/countVersions.d.ts +3 -0
  6. package/dist/countVersions.d.ts.map +1 -0
  7. package/dist/countVersions.js +27 -0
  8. package/dist/countVersions.js.map +1 -0
  9. package/dist/create.d.ts.map +1 -1
  10. package/dist/create.js +2 -1
  11. package/dist/create.js.map +1 -1
  12. package/dist/createGlobalVersion.d.ts +1 -1
  13. package/dist/createGlobalVersion.d.ts.map +1 -1
  14. package/dist/createGlobalVersion.js +2 -1
  15. package/dist/createGlobalVersion.js.map +1 -1
  16. package/dist/createVersion.d.ts +1 -1
  17. package/dist/createVersion.d.ts.map +1 -1
  18. package/dist/createVersion.js +2 -1
  19. package/dist/createVersion.js.map +1 -1
  20. package/dist/deleteOne.d.ts.map +1 -1
  21. package/dist/deleteOne.js +2 -1
  22. package/dist/deleteOne.js.map +1 -1
  23. package/dist/exports/postgres.d.ts +1 -1
  24. package/dist/exports/postgres.d.ts.map +1 -1
  25. package/dist/exports/postgres.js +1 -1
  26. package/dist/exports/postgres.js.map +1 -1
  27. package/dist/find/buildFindManyArgs.d.ts +4 -2
  28. package/dist/find/buildFindManyArgs.d.ts.map +1 -1
  29. package/dist/find/buildFindManyArgs.js +38 -21
  30. package/dist/find/buildFindManyArgs.js.map +1 -1
  31. package/dist/find/findMany.d.ts +2 -1
  32. package/dist/find/findMany.d.ts.map +1 -1
  33. package/dist/find/findMany.js +7 -5
  34. package/dist/find/findMany.js.map +1 -1
  35. package/dist/find/traverseFields.d.ts +13 -3
  36. package/dist/find/traverseFields.d.ts.map +1 -1
  37. package/dist/find/traverseFields.js +298 -139
  38. package/dist/find/traverseFields.js.map +1 -1
  39. package/dist/find.d.ts.map +1 -1
  40. package/dist/find.js +3 -2
  41. package/dist/find.js.map +1 -1
  42. package/dist/findGlobal.d.ts.map +1 -1
  43. package/dist/findGlobal.js +2 -1
  44. package/dist/findGlobal.js.map +1 -1
  45. package/dist/findGlobalVersions.d.ts.map +1 -1
  46. package/dist/findGlobalVersions.js +3 -2
  47. package/dist/findGlobalVersions.js.map +1 -1
  48. package/dist/findOne.d.ts +1 -1
  49. package/dist/findOne.d.ts.map +1 -1
  50. package/dist/findOne.js +2 -1
  51. package/dist/findOne.js.map +1 -1
  52. package/dist/findVersions.d.ts.map +1 -1
  53. package/dist/findVersions.js +3 -2
  54. package/dist/findVersions.js.map +1 -1
  55. package/dist/index.d.ts +2 -0
  56. package/dist/index.d.ts.map +1 -1
  57. package/dist/index.js +2 -0
  58. package/dist/index.js.map +1 -1
  59. package/dist/migrate.d.ts.map +1 -1
  60. package/dist/migrate.js +3 -0
  61. package/dist/migrate.js.map +1 -1
  62. package/dist/migrateFresh.d.ts.map +1 -1
  63. package/dist/migrateFresh.js +3 -0
  64. package/dist/migrateFresh.js.map +1 -1
  65. package/dist/postgres/countDistinct.d.ts.map +1 -1
  66. package/dist/postgres/countDistinct.js +2 -3
  67. package/dist/postgres/countDistinct.js.map +1 -1
  68. package/dist/postgres/createDatabase.d.ts.map +1 -1
  69. package/dist/postgres/createDatabase.js +3 -3
  70. package/dist/postgres/createDatabase.js.map +1 -1
  71. package/dist/postgres/createExtensions.d.ts +3 -0
  72. package/dist/postgres/createExtensions.d.ts.map +1 -0
  73. package/dist/postgres/createExtensions.js +16 -0
  74. package/dist/postgres/createExtensions.js.map +1 -0
  75. package/dist/postgres/createJSONQuery/index.d.ts +2 -9
  76. package/dist/postgres/createJSONQuery/index.d.ts.map +1 -1
  77. package/dist/postgres/createJSONQuery/index.js +34 -46
  78. package/dist/postgres/createJSONQuery/index.js.map +1 -1
  79. package/dist/postgres/createMigration.d.ts.map +1 -1
  80. package/dist/postgres/createMigration.js +1 -5
  81. package/dist/postgres/createMigration.js.map +1 -1
  82. package/dist/postgres/defaultSnapshot.d.ts.map +1 -1
  83. package/dist/postgres/defaultSnapshot.js +2 -0
  84. package/dist/postgres/defaultSnapshot.js.map +1 -1
  85. package/dist/postgres/init.d.ts.map +1 -1
  86. package/dist/postgres/init.js +0 -1
  87. package/dist/postgres/init.js.map +1 -1
  88. package/dist/postgres/schema/build.d.ts +2 -3
  89. package/dist/postgres/schema/build.d.ts.map +1 -1
  90. package/dist/postgres/schema/build.js +1 -2
  91. package/dist/postgres/schema/build.js.map +1 -1
  92. package/dist/postgres/schema/geometryColumn.d.ts +12 -0
  93. package/dist/postgres/schema/geometryColumn.d.ts.map +1 -0
  94. package/dist/postgres/schema/geometryColumn.js +18 -0
  95. package/dist/postgres/schema/geometryColumn.js.map +1 -0
  96. package/dist/postgres/schema/traverseFields.d.ts +2 -3
  97. package/dist/postgres/schema/traverseFields.d.ts.map +1 -1
  98. package/dist/postgres/schema/traverseFields.js +244 -266
  99. package/dist/postgres/schema/traverseFields.js.map +1 -1
  100. package/dist/postgres/schema/withDefault.d.ts.map +1 -1
  101. package/dist/postgres/schema/withDefault.js +3 -0
  102. package/dist/postgres/schema/withDefault.js.map +1 -1
  103. package/dist/postgres/types.d.ts +3 -0
  104. package/dist/postgres/types.d.ts.map +1 -1
  105. package/dist/postgres/types.js.map +1 -1
  106. package/dist/queries/addJoinTable.d.ts +11 -0
  107. package/dist/queries/addJoinTable.d.ts.map +1 -0
  108. package/dist/queries/addJoinTable.js +13 -0
  109. package/dist/queries/addJoinTable.js.map +1 -0
  110. package/dist/queries/buildOrderBy.d.ts +2 -2
  111. package/dist/queries/buildOrderBy.d.ts.map +1 -1
  112. package/dist/queries/buildOrderBy.js +32 -28
  113. package/dist/queries/buildOrderBy.js.map +1 -1
  114. package/dist/queries/buildQuery.d.ts +3 -3
  115. package/dist/queries/buildQuery.d.ts.map +1 -1
  116. package/dist/queries/buildQuery.js.map +1 -1
  117. package/dist/queries/getTableColumnFromPath.d.ts +1 -2
  118. package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
  119. package/dist/queries/getTableColumnFromPath.js +218 -221
  120. package/dist/queries/getTableColumnFromPath.js.map +1 -1
  121. package/dist/queries/operatorMap.d.ts.map +1 -1
  122. package/dist/queries/operatorMap.js +0 -4
  123. package/dist/queries/operatorMap.js.map +1 -1
  124. package/dist/queries/parseParams.d.ts.map +1 -1
  125. package/dist/queries/parseParams.js +38 -5
  126. package/dist/queries/parseParams.js.map +1 -1
  127. package/dist/queries/sanitizeQueryValue.js +8 -2
  128. package/dist/queries/sanitizeQueryValue.js.map +1 -1
  129. package/dist/queryDrafts.d.ts.map +1 -1
  130. package/dist/queryDrafts.js +4 -1
  131. package/dist/queryDrafts.js.map +1 -1
  132. package/dist/transform/read/traverseFields.d.ts.map +1 -1
  133. package/dist/transform/read/traverseFields.js +16 -16
  134. package/dist/transform/read/traverseFields.js.map +1 -1
  135. package/dist/transform/write/traverseFields.d.ts.map +1 -1
  136. package/dist/transform/write/traverseFields.js +4 -0
  137. package/dist/transform/write/traverseFields.js.map +1 -1
  138. package/dist/types.d.ts +4 -3
  139. package/dist/types.d.ts.map +1 -1
  140. package/dist/types.js.map +1 -1
  141. package/dist/update.d.ts.map +1 -1
  142. package/dist/update.js +2 -1
  143. package/dist/update.js.map +1 -1
  144. package/dist/updateGlobal.d.ts +1 -1
  145. package/dist/updateGlobal.d.ts.map +1 -1
  146. package/dist/updateGlobal.js +2 -1
  147. package/dist/updateGlobal.js.map +1 -1
  148. package/dist/updateGlobalVersion.d.ts +1 -1
  149. package/dist/updateGlobalVersion.d.ts.map +1 -1
  150. package/dist/updateGlobalVersion.js +2 -1
  151. package/dist/updateGlobalVersion.js.map +1 -1
  152. package/dist/updateVersion.d.ts +1 -1
  153. package/dist/updateVersion.d.ts.map +1 -1
  154. package/dist/updateVersion.js +2 -1
  155. package/dist/updateVersion.js.map +1 -1
  156. package/dist/upsertRow/index.d.ts +1 -1
  157. package/dist/upsertRow/index.d.ts.map +1 -1
  158. package/dist/upsertRow/index.js +4 -3
  159. package/dist/upsertRow/index.js.map +1 -1
  160. package/dist/upsertRow/types.d.ts +3 -1
  161. package/dist/upsertRow/types.d.ts.map +1 -1
  162. package/dist/upsertRow/types.js.map +1 -1
  163. package/dist/utilities/getNameFromDrizzleTable.d.ts +3 -0
  164. package/dist/utilities/getNameFromDrizzleTable.d.ts.map +1 -0
  165. package/dist/utilities/getNameFromDrizzleTable.js +6 -0
  166. package/dist/utilities/getNameFromDrizzleTable.js.map +1 -0
  167. package/dist/utilities/pushDevSchema.d.ts.map +1 -1
  168. package/dist/utilities/pushDevSchema.js +5 -0
  169. package/dist/utilities/pushDevSchema.js.map +1 -1
  170. package/license.md +22 -0
  171. package/package.json +13 -6
  172. package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.d.ts +0 -2
  173. package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.d.ts.map +0 -1
  174. package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.js +0 -16
  175. package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.js.map +0 -1
  176. package/dist/postgres/createJSONQuery/formatJSONPathSegment.d.ts +0 -2
  177. package/dist/postgres/createJSONQuery/formatJSONPathSegment.d.ts.map +0 -1
  178. package/dist/postgres/createJSONQuery/formatJSONPathSegment.js +0 -5
  179. package/dist/postgres/createJSONQuery/formatJSONPathSegment.js.map +0 -1
@@ -1,4 +1,4 @@
1
- import type { Field, JoinQuery } from 'payload';
1
+ import type { Field, JoinQuery, SelectMode, SelectType, TabAsField } from 'payload';
2
2
  import type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js';
3
3
  import type { Result } from './buildFindManyArgs.js';
4
4
  type TraverseFieldArgs = {
@@ -7,15 +7,25 @@ type TraverseFieldArgs = {
7
7
  currentArgs: Result;
8
8
  currentTableName: string;
9
9
  depth?: number;
10
- fields: Field[];
10
+ fields: (Field | TabAsField)[];
11
11
  joinQuery: JoinQuery;
12
12
  joins?: BuildQueryJoinAliases;
13
13
  locale?: string;
14
14
  path: string;
15
+ select?: SelectType;
16
+ selectAllOnCurrentLevel?: boolean;
17
+ selectMode?: SelectMode;
15
18
  tablePath: string;
16
19
  topLevelArgs: Record<string, unknown>;
17
20
  topLevelTableName: string;
21
+ versions?: boolean;
22
+ withinLocalizedField?: boolean;
23
+ withTabledFields: {
24
+ numbers?: boolean;
25
+ rels?: boolean;
26
+ texts?: boolean;
27
+ };
18
28
  };
19
- export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery, joins, locale, path, tablePath, topLevelArgs, topLevelTableName, }: TraverseFieldArgs) => Record<string, unknown>;
29
+ export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery, joins, locale, path, select, selectAllOnCurrentLevel, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withinLocalizedField, withTabledFields, }: TraverseFieldArgs) => Record<string, unknown>;
20
30
  export {};
21
31
  //# sourceMappingURL=traverseFields.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,qJAcxB,iBAAiB,4BA8UnB,CAAA"}
1
+ {"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAOnF,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,oPAoBxB,iBAAiB,4BA6lBnB,CAAA"}
@@ -3,7 +3,7 @@ import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared';
3
3
  import toSnakeCase from 'to-snake-case';
4
4
  import buildQuery from '../queries/buildQuery.js';
5
5
  import { chainMethods } from './chainMethods.js';
6
- export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, tablePath, topLevelArgs, topLevelTableName })=>{
6
+ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, select, selectAllOnCurrentLevel = false, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withinLocalizedField = false, withTabledFields })=>{
7
7
  fields.forEach((field)=>{
8
8
  if (fieldIsVirtual(field)) {
9
9
  return;
@@ -16,7 +16,7 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
16
16
  currentArgs.with[`${path}${field.name}`] = true;
17
17
  }
18
18
  }
19
- if (field.type === 'collapsible' || field.type === 'row') {
19
+ if (field.type === 'collapsible' || field.type === 'row' || field.type === 'tab' && !tabHasName(field)) {
20
20
  traverseFields({
21
21
  _locales,
22
22
  adapter,
@@ -27,30 +27,37 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
27
27
  joinQuery,
28
28
  joins,
29
29
  path,
30
+ select,
31
+ selectMode,
30
32
  tablePath,
31
33
  topLevelArgs,
32
- topLevelTableName
34
+ topLevelTableName,
35
+ withTabledFields
33
36
  });
34
37
  return;
35
38
  }
36
39
  if (field.type === 'tabs') {
37
- field.tabs.forEach((tab)=>{
38
- const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path;
39
- const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath;
40
- traverseFields({
41
- _locales,
42
- adapter,
43
- currentArgs,
44
- currentTableName,
45
- depth,
46
- fields: tab.fields,
47
- joinQuery,
48
- joins,
49
- path: tabPath,
50
- tablePath: tabTablePath,
51
- topLevelArgs,
52
- topLevelTableName
53
- });
40
+ traverseFields({
41
+ _locales,
42
+ adapter,
43
+ currentArgs,
44
+ currentTableName,
45
+ depth,
46
+ fields: field.tabs.map((tab)=>({
47
+ ...tab,
48
+ type: 'tab'
49
+ })),
50
+ joinQuery,
51
+ joins,
52
+ path,
53
+ select,
54
+ selectAllOnCurrentLevel,
55
+ selectMode,
56
+ tablePath,
57
+ topLevelArgs,
58
+ topLevelTableName,
59
+ versions,
60
+ withTabledFields
54
61
  });
55
62
  return;
56
63
  }
@@ -58,8 +65,17 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
58
65
  switch(field.type){
59
66
  case 'array':
60
67
  {
68
+ const arraySelect = selectAllOnCurrentLevel ? true : select?.[field.name];
69
+ if (select) {
70
+ if (selectMode === 'include' && typeof arraySelect === 'undefined' || selectMode === 'exclude' && arraySelect === false) {
71
+ break;
72
+ }
73
+ }
61
74
  const withArray = {
62
- columns: {
75
+ columns: typeof arraySelect === 'object' ? {
76
+ id: true,
77
+ _order: true
78
+ } : {
63
79
  _parentID: false
64
80
  },
65
81
  orderBy: ({ _order }, { asc })=>[
@@ -68,10 +84,20 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
68
84
  with: {}
69
85
  };
70
86
  const arrayTableName = adapter.tableNameMap.get(`${currentTableName}_${tablePath}${toSnakeCase(field.name)}`);
87
+ if (typeof arraySelect === 'object') {
88
+ if (adapter.tables[arrayTableName]._locale) {
89
+ withArray.columns._locale = true;
90
+ }
91
+ if (adapter.tables[arrayTableName]._uuid) {
92
+ withArray.columns._uuid = true;
93
+ }
94
+ }
71
95
  const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`;
72
96
  if (adapter.tables[arrayTableNameWithLocales]) {
73
97
  withArray.with._locales = {
74
- columns: {
98
+ columns: typeof arraySelect === 'object' ? {
99
+ _locale: true
100
+ } : {
75
101
  id: false,
76
102
  _parentID: false
77
103
  },
@@ -88,67 +114,109 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
88
114
  fields: field.fields,
89
115
  joinQuery,
90
116
  path: '',
117
+ select: typeof arraySelect === 'object' ? arraySelect : undefined,
118
+ selectMode,
91
119
  tablePath: '',
92
120
  topLevelArgs,
93
- topLevelTableName
121
+ topLevelTableName,
122
+ withinLocalizedField: withinLocalizedField || field.localized,
123
+ withTabledFields
94
124
  });
95
- break;
96
- }
97
- case 'select':
98
- {
99
- if (field.hasMany) {
100
- const withSelect = {
101
- columns: {
102
- id: false,
103
- order: false,
104
- parent: false
105
- },
106
- orderBy: ({ order }, { asc })=>[
107
- asc(order)
108
- ]
109
- };
110
- currentArgs.with[`${path}${field.name}`] = withSelect;
125
+ if (typeof arraySelect === 'object' && withArray.with._locales && Object.keys(withArray.with._locales).length === 1) {
126
+ delete withArray.with._locales;
111
127
  }
112
128
  break;
113
129
  }
114
130
  case 'blocks':
115
- field.blocks.forEach((block)=>{
116
- const blockKey = `_blocks_${block.slug}`;
117
- if (!topLevelArgs[blockKey]) {
118
- const withBlock = {
119
- columns: {
120
- _parentID: false
121
- },
122
- orderBy: ({ _order }, { asc })=>[
123
- asc(_order)
124
- ],
125
- with: {}
126
- };
127
- const tableName = adapter.tableNameMap.get(`${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`);
128
- if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
129
- withBlock.with._locales = {
131
+ {
132
+ const blocksSelect = selectAllOnCurrentLevel ? true : select?.[field.name];
133
+ if (select) {
134
+ if (selectMode === 'include' && !blocksSelect || selectMode === 'exclude' && blocksSelect === false) {
135
+ break;
136
+ }
137
+ }
138
+ field.blocks.forEach((block)=>{
139
+ const blockKey = `_blocks_${block.slug}`;
140
+ let blockSelect;
141
+ let blockSelectMode = selectMode;
142
+ if (selectMode === 'include' && blocksSelect === true) {
143
+ blockSelect = true;
144
+ }
145
+ if (typeof blocksSelect === 'object') {
146
+ if (typeof blocksSelect[block.slug] === 'object') {
147
+ blockSelect = blocksSelect[block.slug];
148
+ } else if (selectMode === 'include' && typeof blocksSelect[block.slug] === 'undefined' || selectMode === 'exclude' && blocksSelect[block.slug] === false) {
149
+ blockSelect = {};
150
+ blockSelectMode = 'include';
151
+ } else if (selectMode === 'include' && blocksSelect[block.slug] === true) {
152
+ blockSelect = true;
153
+ }
154
+ }
155
+ if (!topLevelArgs[blockKey]) {
156
+ const withBlock = {
157
+ columns: typeof blockSelect === 'object' ? {
158
+ id: true,
159
+ _order: true,
160
+ _path: true
161
+ } : {
162
+ _parentID: false
163
+ },
164
+ orderBy: ({ _order }, { asc })=>[
165
+ asc(_order)
166
+ ],
130
167
  with: {}
131
168
  };
169
+ const tableName = adapter.tableNameMap.get(`${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`);
170
+ if (typeof blockSelect === 'object') {
171
+ if (adapter.tables[tableName]._locale) {
172
+ withBlock.columns._locale = true;
173
+ }
174
+ if (adapter.tables[tableName]._uuid) {
175
+ withBlock.columns._uuid = true;
176
+ }
177
+ }
178
+ if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
179
+ withBlock.with._locales = {
180
+ with: {}
181
+ };
182
+ if (typeof blockSelect === 'object') {
183
+ withBlock.with._locales.columns = {
184
+ _locale: true
185
+ };
186
+ }
187
+ }
188
+ topLevelArgs.with[blockKey] = withBlock;
189
+ traverseFields({
190
+ _locales: withBlock.with._locales,
191
+ adapter,
192
+ currentArgs: withBlock,
193
+ currentTableName: tableName,
194
+ depth,
195
+ fields: block.fields,
196
+ joinQuery,
197
+ path: '',
198
+ select: typeof blockSelect === 'object' ? blockSelect : undefined,
199
+ selectMode: blockSelectMode,
200
+ tablePath: '',
201
+ topLevelArgs,
202
+ topLevelTableName,
203
+ withinLocalizedField: withinLocalizedField || field.localized,
204
+ withTabledFields
205
+ });
206
+ if (typeof blockSelect === 'object' && withBlock.with._locales && Object.keys(withBlock.with._locales.columns).length === 1) {
207
+ delete withBlock.with._locales;
208
+ }
132
209
  }
133
- topLevelArgs.with[blockKey] = withBlock;
134
- traverseFields({
135
- _locales: withBlock.with._locales,
136
- adapter,
137
- currentArgs: withBlock,
138
- currentTableName: tableName,
139
- depth,
140
- fields: block.fields,
141
- joinQuery,
142
- path: '',
143
- tablePath: '',
144
- topLevelArgs,
145
- topLevelTableName
146
- });
147
- }
148
- });
149
- break;
210
+ });
211
+ break;
212
+ }
150
213
  case 'group':
214
+ case 'tab':
151
215
  {
216
+ const fieldSelect = select?.[field.name];
217
+ if (fieldSelect === false) {
218
+ break;
219
+ }
152
220
  traverseFields({
153
221
  _locales,
154
222
  adapter,
@@ -159,9 +227,15 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
159
227
  joinQuery,
160
228
  joins,
161
229
  path: `${path}${field.name}_`,
230
+ select: typeof fieldSelect === 'object' ? fieldSelect : undefined,
231
+ selectAllOnCurrentLevel: selectAllOnCurrentLevel || fieldSelect === true || selectMode === 'exclude' && typeof fieldSelect === 'undefined',
232
+ selectMode,
162
233
  tablePath: `${tablePath}${toSnakeCase(field.name)}_`,
163
234
  topLevelArgs,
164
- topLevelTableName
235
+ topLevelTableName,
236
+ versions,
237
+ withinLocalizedField: withinLocalizedField || field.localized,
238
+ withTabledFields
165
239
  });
166
240
  break;
167
241
  }
@@ -171,7 +245,14 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
171
245
  if (joinQuery === false) {
172
246
  break;
173
247
  }
174
- const { limit: limitArg = 10, sort, where } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {};
248
+ if (select && selectMode === 'include' && !select[field.name] || selectMode === 'exclude' && select[field.name] === false) {
249
+ break;
250
+ }
251
+ const joinSchemaPath = `${path.replaceAll('_', '.')}${field.name}`;
252
+ if (joinQuery[joinSchemaPath] === false) {
253
+ break;
254
+ }
255
+ const { limit: limitArg = field.defaultLimit ?? 10, sort = field.defaultSort, where } = joinQuery[joinSchemaPath] || {};
175
256
  let limit = limitArg;
176
257
  if (limit !== 0) {
177
258
  // get an additional document and slice it later to determine if there is a next page
@@ -179,52 +260,89 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
179
260
  }
180
261
  const fields = adapter.payload.collections[field.collection].config.fields;
181
262
  const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
182
- let joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''}`;
263
+ const joins = [];
264
+ const buildQueryResult = buildQuery({
265
+ adapter,
266
+ fields,
267
+ joins,
268
+ locale,
269
+ sort,
270
+ tableName: joinCollectionTableName,
271
+ where
272
+ });
273
+ let subQueryWhere = buildQueryResult.where;
274
+ const orderBy = buildQueryResult.orderBy;
275
+ let joinLocalesCollectionTableName;
276
+ const currentIDColumn = versions ? adapter.tables[currentTableName].parent : adapter.tables[currentTableName].id;
277
+ // Handle hasMany _rels table
183
278
  if (field.hasMany) {
184
- const db = adapter.drizzle;
279
+ const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`;
185
280
  if (field.localized) {
186
- joinTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
281
+ joinLocalesCollectionTableName = joinRelsCollectionTableName;
187
282
  }
188
- const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`;
189
- const joins = [
190
- {
191
- type: 'innerJoin',
192
- condition: and(eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id), eq(sql.raw(`"${joinTable}"."${topLevelTableName}_id"`), adapter.tables[currentTableName].id), eq(adapter.tables[joinTable].path, field.on)),
193
- table: adapter.tables[joinTable]
194
- }
195
- ];
196
- const { orderBy, where: subQueryWhere } = buildQuery({
197
- adapter,
198
- fields,
199
- joins,
200
- locale,
201
- sort,
202
- tableName: joinCollectionTableName,
203
- where: {}
283
+ let columnReferenceToCurrentID;
284
+ if (versions) {
285
+ columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`;
286
+ } else {
287
+ columnReferenceToCurrentID = `${topLevelTableName}_id`;
288
+ }
289
+ joins.push({
290
+ type: 'innerJoin',
291
+ condition: and(eq(adapter.tables[joinRelsCollectionTableName].parent, adapter.tables[joinCollectionTableName].id), eq(sql.raw(`"${joinRelsCollectionTableName}"."${columnReferenceToCurrentID}"`), currentIDColumn), eq(adapter.tables[joinRelsCollectionTableName].path, field.on)),
292
+ table: adapter.tables[joinRelsCollectionTableName]
204
293
  });
205
- const chainedMethods = [];
206
- joins.forEach(({ type, condition, table })=>{
207
- chainedMethods.push({
208
- args: [
209
- table,
210
- condition
211
- ],
212
- method: type ?? 'leftJoin'
294
+ } else {
295
+ // Handle localized without hasMany
296
+ const foreignColumn = field.on.replaceAll('.', '_');
297
+ if (field.localized) {
298
+ joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`;
299
+ joins.push({
300
+ type: 'innerJoin',
301
+ condition: and(eq(adapter.tables[joinLocalesCollectionTableName]._parentID, adapter.tables[joinCollectionTableName].id), eq(adapter.tables[joinLocalesCollectionTableName][foreignColumn], currentIDColumn)),
302
+ table: adapter.tables[joinLocalesCollectionTableName]
213
303
  });
304
+ // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.
305
+ } else {
306
+ const constraint = eq(adapter.tables[joinCollectionTableName][foreignColumn], currentIDColumn);
307
+ if (subQueryWhere) {
308
+ subQueryWhere = and(subQueryWhere, constraint);
309
+ } else {
310
+ subQueryWhere = constraint;
311
+ }
312
+ }
313
+ }
314
+ const chainedMethods = [];
315
+ joins.forEach(({ type, condition, table })=>{
316
+ chainedMethods.push({
317
+ args: [
318
+ table,
319
+ condition
320
+ ],
321
+ method: type ?? 'leftJoin'
214
322
  });
215
- const subQuery = chainMethods({
216
- methods: chainedMethods,
217
- query: db.select({
218
- id: adapter.tables[joinTableName].id,
219
- ...field.localized && {
220
- locale: adapter.tables[joinTable].locale
221
- }
222
- }).from(adapter.tables[joinTableName]).where(subQueryWhere).orderBy(orderBy.order(orderBy.column)).limit(limit)
323
+ });
324
+ if (limit !== 0) {
325
+ chainedMethods.push({
326
+ args: [
327
+ limit
328
+ ],
329
+ method: 'limit'
223
330
  });
224
- const columnName = `${path.replaceAll('.', '_')}${field.name}`;
225
- const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "locale"`) : sql.raw(`'id', "id"`);
226
- if (adapter.name === 'sqlite') {
227
- currentArgs.extras[columnName] = sql`
331
+ }
332
+ const db = adapter.drizzle;
333
+ const subQuery = chainMethods({
334
+ methods: chainedMethods,
335
+ query: db.select({
336
+ id: adapter.tables[joinCollectionTableName].id,
337
+ ...joinLocalesCollectionTableName && {
338
+ locale: adapter.tables[joinLocalesCollectionTableName].locale || adapter.tables[joinLocalesCollectionTableName]._locale
339
+ }
340
+ }).from(adapter.tables[joinCollectionTableName]).where(subQueryWhere).orderBy(()=>orderBy.map(({ column, order })=>order(column)))
341
+ });
342
+ const columnName = `${path.replaceAll('.', '_')}${field.name}`;
343
+ const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}"`) : sql.raw(`'id', "id"`);
344
+ if (adapter.name === 'sqlite') {
345
+ currentArgs.extras[columnName] = sql`
228
346
  COALESCE((
229
347
  SELECT json_group_array(json_object(${jsonObjectSelect}))
230
348
  FROM (
@@ -232,8 +350,8 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
232
350
  ) AS ${sql.raw(`${columnName}_sub`)}
233
351
  ), '[]')
234
352
  `.as(columnName);
235
- } else {
236
- currentArgs.extras[columnName] = sql`
353
+ } else {
354
+ currentArgs.extras[columnName] = sql`
237
355
  COALESCE((
238
356
  SELECT json_agg(json_build_object(${jsonObjectSelect}))
239
357
  FROM (
@@ -241,41 +359,82 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
241
359
  ) AS ${sql.raw(`${columnName}_sub`)}
242
360
  ), '[]'::json)
243
361
  `.as(columnName);
244
- }
362
+ }
363
+ break;
364
+ }
365
+ case 'point':
366
+ {
367
+ if (adapter.name === 'sqlite') {
245
368
  break;
246
369
  }
247
- const selectFields = {};
248
- const withJoin = {
249
- columns: selectFields
250
- };
251
- if (limit) {
252
- withJoin.limit = limit;
370
+ const args = field.localized ? _locales : currentArgs;
371
+ if (!args.columns) {
372
+ args.columns = {};
373
+ }
374
+ if (!args.extras) {
375
+ args.extras = {};
253
376
  }
254
- if (field.localized) {
255
- withJoin.columns._locale = true;
256
- withJoin.columns._parentID = true;
377
+ const name = `${path}${field.name}`;
378
+ // Drizzle handles that poorly. See https://github.com/drizzle-team/drizzle-orm/issues/2526
379
+ // Additionally, this way we format the column value straight in the database using ST_AsGeoJSON
380
+ args.columns[name] = false;
381
+ let shouldSelect = false;
382
+ if (select || selectAllOnCurrentLevel) {
383
+ if (selectAllOnCurrentLevel || selectMode === 'include' && select[field.name] === true || selectMode === 'exclude' && typeof select[field.name] === 'undefined') {
384
+ shouldSelect = true;
385
+ }
257
386
  } else {
258
- withJoin.columns.id = true;
259
- withJoin.columns.parent = true;
387
+ shouldSelect = true;
260
388
  }
261
- const { orderBy, where: joinWhere } = buildQuery({
262
- adapter,
263
- fields,
264
- joins,
265
- locale,
266
- sort,
267
- tableName: joinTableName,
268
- where
269
- });
270
- if (joinWhere) {
271
- withJoin.where = ()=>joinWhere;
389
+ if (shouldSelect) {
390
+ args.extras[name] = sql.raw(`ST_AsGeoJSON(${toSnakeCase(name)})::jsonb`).as(name);
391
+ }
392
+ break;
393
+ }
394
+ case 'select':
395
+ {
396
+ if (field.hasMany) {
397
+ if (select) {
398
+ if (selectMode === 'include' && !select[field.name] || selectMode === 'exclude' && select[field.name] === false) {
399
+ break;
400
+ }
401
+ }
402
+ const withSelect = {
403
+ columns: {
404
+ id: false,
405
+ order: false,
406
+ parent: false
407
+ },
408
+ orderBy: ({ order }, { asc })=>[
409
+ asc(order)
410
+ ]
411
+ };
412
+ currentArgs.with[`${path}${field.name}`] = withSelect;
272
413
  }
273
- withJoin.orderBy = orderBy.order(orderBy.column);
274
- currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin;
275
414
  break;
276
415
  }
277
416
  default:
278
417
  {
418
+ if (!select && !selectAllOnCurrentLevel) {
419
+ break;
420
+ }
421
+ if (selectAllOnCurrentLevel || selectMode === 'include' && select[field.name] === true || selectMode === 'exclude' && typeof select[field.name] === 'undefined') {
422
+ const fieldPath = `${path}${field.name}`;
423
+ if ((field.localized || withinLocalizedField) && _locales) {
424
+ _locales.columns[fieldPath] = true;
425
+ } else if (adapter.tables[currentTableName]?.[fieldPath]) {
426
+ currentArgs.columns[fieldPath] = true;
427
+ }
428
+ if (!withTabledFields.rels && field.type === 'relationship' && (field.hasMany || Array.isArray(field.relationTo))) {
429
+ withTabledFields.rels = true;
430
+ }
431
+ if (!withTabledFields.numbers && field.type === 'number' && field.hasMany) {
432
+ withTabledFields.numbers = true;
433
+ }
434
+ if (!withTabledFields.texts && field.type === 'text' && field.hasMany) {
435
+ withTabledFields.texts = true;
436
+ }
437
+ }
279
438
  break;
280
439
  }
281
440
  }