@lightdash/common 1.144.3 → 1.145.0

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 (163) hide show
  1. package/dist/cjs/.tsbuildinfo +1 -1
  2. package/dist/cjs/compiler/exploreCompiler.mock.d.ts.map +1 -1
  3. package/dist/cjs/compiler/exploreCompiler.mock.js +3 -0
  4. package/dist/cjs/compiler/exploreCompiler.mock.js.map +1 -1
  5. package/dist/cjs/ee/apps/types.d.ts +3 -0
  6. package/dist/cjs/ee/apps/types.d.ts.map +1 -1
  7. package/dist/cjs/ee/apps/types.js.map +1 -1
  8. package/dist/cjs/index.d.ts +2 -0
  9. package/dist/cjs/index.d.ts.map +1 -1
  10. package/dist/cjs/index.js +2 -0
  11. package/dist/cjs/index.js.map +1 -1
  12. package/dist/cjs/types/api/paginatedQuery.d.ts +7 -1
  13. package/dist/cjs/types/api/paginatedQuery.d.ts.map +1 -1
  14. package/dist/cjs/types/api/paginatedQuery.js.map +1 -1
  15. package/dist/cjs/types/api.d.ts +2 -1
  16. package/dist/cjs/types/api.d.ts.map +1 -1
  17. package/dist/cjs/types/api.js.map +1 -1
  18. package/dist/cjs/types/featureFlags.d.ts +2 -1
  19. package/dist/cjs/types/featureFlags.d.ts.map +1 -1
  20. package/dist/cjs/types/featureFlags.js +4 -0
  21. package/dist/cjs/types/featureFlags.js.map +1 -1
  22. package/dist/cjs/types/mergeQuery.d.ts +339 -0
  23. package/dist/cjs/types/mergeQuery.d.ts.map +1 -0
  24. package/dist/cjs/types/mergeQuery.js +339 -0
  25. package/dist/cjs/types/mergeQuery.js.map +1 -0
  26. package/dist/cjs/types/mergeQuery.test.d.ts +2 -0
  27. package/dist/cjs/types/mergeQuery.test.d.ts.map +1 -0
  28. package/dist/cjs/types/mergeQuery.test.js +230 -0
  29. package/dist/cjs/types/mergeQuery.test.js.map +1 -0
  30. package/dist/cjs/types/results.d.ts +2 -1
  31. package/dist/cjs/types/results.d.ts.map +1 -1
  32. package/dist/cjs/types/results.js.map +1 -1
  33. package/dist/cjs/types/savedCharts.d.ts +7 -1
  34. package/dist/cjs/types/savedCharts.d.ts.map +1 -1
  35. package/dist/cjs/types/savedCharts.js.map +1 -1
  36. package/dist/cjs/types/warehouse.d.ts +11 -0
  37. package/dist/cjs/types/warehouse.d.ts.map +1 -1
  38. package/dist/cjs/types/warehouse.js.map +1 -1
  39. package/dist/cjs/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
  40. package/dist/cjs/utils/convertCustomDimensionsToYaml.js +7 -0
  41. package/dist/cjs/utils/convertCustomDimensionsToYaml.js.map +1 -1
  42. package/dist/cjs/utils/mergeQueryItems.d.ts +23 -0
  43. package/dist/cjs/utils/mergeQueryItems.d.ts.map +1 -0
  44. package/dist/cjs/utils/mergeQueryItems.js +29 -0
  45. package/dist/cjs/utils/mergeQueryItems.js.map +1 -0
  46. package/dist/cjs/utils/mergeQueryItems.test.d.ts +2 -0
  47. package/dist/cjs/utils/mergeQueryItems.test.d.ts.map +1 -0
  48. package/dist/cjs/utils/mergeQueryItems.test.js +68 -0
  49. package/dist/cjs/utils/mergeQueryItems.test.js.map +1 -0
  50. package/dist/cjs/utils/virtualView.d.ts.map +1 -1
  51. package/dist/cjs/utils/virtualView.js +3 -0
  52. package/dist/cjs/utils/virtualView.js.map +1 -1
  53. package/dist/cjs/utils/virtualView.test.js +3 -0
  54. package/dist/cjs/utils/virtualView.test.js.map +1 -1
  55. package/dist/esm/.tsbuildinfo +1 -1
  56. package/dist/esm/compiler/exploreCompiler.mock.d.ts.map +1 -1
  57. package/dist/esm/compiler/exploreCompiler.mock.js +3 -0
  58. package/dist/esm/compiler/exploreCompiler.mock.js.map +1 -1
  59. package/dist/esm/ee/apps/types.d.ts +3 -0
  60. package/dist/esm/ee/apps/types.d.ts.map +1 -1
  61. package/dist/esm/ee/apps/types.js.map +1 -1
  62. package/dist/esm/index.d.ts +2 -0
  63. package/dist/esm/index.d.ts.map +1 -1
  64. package/dist/esm/index.js +2 -0
  65. package/dist/esm/index.js.map +1 -1
  66. package/dist/esm/types/api/paginatedQuery.d.ts +7 -1
  67. package/dist/esm/types/api/paginatedQuery.d.ts.map +1 -1
  68. package/dist/esm/types/api/paginatedQuery.js.map +1 -1
  69. package/dist/esm/types/api.d.ts +2 -1
  70. package/dist/esm/types/api.d.ts.map +1 -1
  71. package/dist/esm/types/api.js.map +1 -1
  72. package/dist/esm/types/featureFlags.d.ts +2 -1
  73. package/dist/esm/types/featureFlags.d.ts.map +1 -1
  74. package/dist/esm/types/featureFlags.js +4 -0
  75. package/dist/esm/types/featureFlags.js.map +1 -1
  76. package/dist/esm/types/mergeQuery.d.ts +339 -0
  77. package/dist/esm/types/mergeQuery.d.ts.map +1 -0
  78. package/dist/esm/types/mergeQuery.js +331 -0
  79. package/dist/esm/types/mergeQuery.js.map +1 -0
  80. package/dist/esm/types/mergeQuery.test.d.ts +2 -0
  81. package/dist/esm/types/mergeQuery.test.d.ts.map +1 -0
  82. package/dist/esm/types/mergeQuery.test.js +228 -0
  83. package/dist/esm/types/mergeQuery.test.js.map +1 -0
  84. package/dist/esm/types/results.d.ts +2 -1
  85. package/dist/esm/types/results.d.ts.map +1 -1
  86. package/dist/esm/types/results.js.map +1 -1
  87. package/dist/esm/types/savedCharts.d.ts +7 -1
  88. package/dist/esm/types/savedCharts.d.ts.map +1 -1
  89. package/dist/esm/types/savedCharts.js.map +1 -1
  90. package/dist/esm/types/warehouse.d.ts +11 -0
  91. package/dist/esm/types/warehouse.d.ts.map +1 -1
  92. package/dist/esm/types/warehouse.js.map +1 -1
  93. package/dist/esm/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
  94. package/dist/esm/utils/convertCustomDimensionsToYaml.js +7 -0
  95. package/dist/esm/utils/convertCustomDimensionsToYaml.js.map +1 -1
  96. package/dist/esm/utils/mergeQueryItems.d.ts +23 -0
  97. package/dist/esm/utils/mergeQueryItems.d.ts.map +1 -0
  98. package/dist/esm/utils/mergeQueryItems.js +25 -0
  99. package/dist/esm/utils/mergeQueryItems.js.map +1 -0
  100. package/dist/esm/utils/mergeQueryItems.test.d.ts +2 -0
  101. package/dist/esm/utils/mergeQueryItems.test.d.ts.map +1 -0
  102. package/dist/esm/utils/mergeQueryItems.test.js +66 -0
  103. package/dist/esm/utils/mergeQueryItems.test.js.map +1 -0
  104. package/dist/esm/utils/virtualView.d.ts.map +1 -1
  105. package/dist/esm/utils/virtualView.js +3 -0
  106. package/dist/esm/utils/virtualView.js.map +1 -1
  107. package/dist/esm/utils/virtualView.test.js +3 -0
  108. package/dist/esm/utils/virtualView.test.js.map +1 -1
  109. package/dist/types/.tsbuildinfo +1 -1
  110. package/dist/types/compiler/exploreCompiler.mock.d.ts.map +1 -1
  111. package/dist/types/compiler/exploreCompiler.mock.js +3 -0
  112. package/dist/types/compiler/exploreCompiler.mock.js.map +1 -1
  113. package/dist/types/ee/apps/types.d.ts +3 -0
  114. package/dist/types/ee/apps/types.d.ts.map +1 -1
  115. package/dist/types/ee/apps/types.js.map +1 -1
  116. package/dist/types/index.d.ts +2 -0
  117. package/dist/types/index.d.ts.map +1 -1
  118. package/dist/types/index.js +2 -0
  119. package/dist/types/index.js.map +1 -1
  120. package/dist/types/types/api/paginatedQuery.d.ts +7 -1
  121. package/dist/types/types/api/paginatedQuery.d.ts.map +1 -1
  122. package/dist/types/types/api/paginatedQuery.js.map +1 -1
  123. package/dist/types/types/api.d.ts +2 -1
  124. package/dist/types/types/api.d.ts.map +1 -1
  125. package/dist/types/types/api.js.map +1 -1
  126. package/dist/types/types/featureFlags.d.ts +2 -1
  127. package/dist/types/types/featureFlags.d.ts.map +1 -1
  128. package/dist/types/types/featureFlags.js +4 -0
  129. package/dist/types/types/featureFlags.js.map +1 -1
  130. package/dist/types/types/mergeQuery.d.ts +339 -0
  131. package/dist/types/types/mergeQuery.d.ts.map +1 -0
  132. package/dist/types/types/mergeQuery.js +331 -0
  133. package/dist/types/types/mergeQuery.js.map +1 -0
  134. package/dist/types/types/mergeQuery.test.d.ts +2 -0
  135. package/dist/types/types/mergeQuery.test.d.ts.map +1 -0
  136. package/dist/types/types/mergeQuery.test.js +228 -0
  137. package/dist/types/types/mergeQuery.test.js.map +1 -0
  138. package/dist/types/types/results.d.ts +2 -1
  139. package/dist/types/types/results.d.ts.map +1 -1
  140. package/dist/types/types/results.js.map +1 -1
  141. package/dist/types/types/savedCharts.d.ts +7 -1
  142. package/dist/types/types/savedCharts.d.ts.map +1 -1
  143. package/dist/types/types/savedCharts.js.map +1 -1
  144. package/dist/types/types/warehouse.d.ts +11 -0
  145. package/dist/types/types/warehouse.d.ts.map +1 -1
  146. package/dist/types/types/warehouse.js.map +1 -1
  147. package/dist/types/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
  148. package/dist/types/utils/convertCustomDimensionsToYaml.js +7 -0
  149. package/dist/types/utils/convertCustomDimensionsToYaml.js.map +1 -1
  150. package/dist/types/utils/mergeQueryItems.d.ts +23 -0
  151. package/dist/types/utils/mergeQueryItems.d.ts.map +1 -0
  152. package/dist/types/utils/mergeQueryItems.js +25 -0
  153. package/dist/types/utils/mergeQueryItems.js.map +1 -0
  154. package/dist/types/utils/mergeQueryItems.test.d.ts +2 -0
  155. package/dist/types/utils/mergeQueryItems.test.d.ts.map +1 -0
  156. package/dist/types/utils/mergeQueryItems.test.js +66 -0
  157. package/dist/types/utils/mergeQueryItems.test.js.map +1 -0
  158. package/dist/types/utils/virtualView.d.ts.map +1 -1
  159. package/dist/types/utils/virtualView.js +3 -0
  160. package/dist/types/utils/virtualView.js.map +1 -1
  161. package/dist/types/utils/virtualView.test.js +3 -0
  162. package/dist/types/utils/virtualView.test.js.map +1 -1
  163. package/package.json +1 -1
@@ -0,0 +1,339 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.parseSavedMergeQuery = exports.buildMergeQueryFromSaved = exports.MERGE_SECOND_SOURCE_ID = exports.MERGE_CHART_SOURCE_ID = exports.getMergeSourceTableLabel = exports.MERGE_TABLE_NAME = exports.MERGE_ROW_PRESENT_COLUMN = exports.MERGE_TRUNCATED_COLUMN = exports.validateMergeQuery = exports.getUnaccountedDimensions = exports.MergeQueryErrorKind = exports.mergeCalculationReferencePattern = exports.MergeJoinType = void 0;
4
+ const field_1 = require("./field");
5
+ /**
6
+ * How unmatched keys survive the merge. Mirrors the SQL join it compiles to.
7
+ */
8
+ var MergeJoinType;
9
+ (function (MergeJoinType) {
10
+ /** Keep every key from every source. */
11
+ MergeJoinType["FULL"] = "full";
12
+ /** Keep every key from the first source only. */
13
+ MergeJoinType["LEFT"] = "left";
14
+ /** Keep only keys present in all sources. */
15
+ MergeJoinType["INNER"] = "inner";
16
+ })(MergeJoinType || (exports.MergeJoinType = MergeJoinType = {}));
17
+ /** `${sourceId.fieldId}` inside a merge table calculation. */
18
+ exports.mergeCalculationReferencePattern = /\$\{([a-zA-Z0-9_.-]+)\}/g;
19
+ /**
20
+ * Types that can be compared across a join without the warehouse guessing.
21
+ * DATE and TIMESTAMP share a class because every supported warehouse compares
22
+ * them, but their *grain* still has to match — see the granularity check.
23
+ */
24
+ const getTypeClass = (type) => {
25
+ switch (type) {
26
+ case field_1.DimensionType.DATE:
27
+ case field_1.DimensionType.TIMESTAMP:
28
+ return 'temporal';
29
+ case field_1.DimensionType.NUMBER:
30
+ return 'number';
31
+ case field_1.DimensionType.STRING:
32
+ return 'string';
33
+ case field_1.DimensionType.BOOLEAN:
34
+ return 'boolean';
35
+ default:
36
+ return 'unknown';
37
+ }
38
+ };
39
+ var MergeQueryErrorKind;
40
+ (function (MergeQueryErrorKind) {
41
+ MergeQueryErrorKind["TOO_FEW_SOURCES"] = "too_few_sources";
42
+ /**
43
+ * More than two sources. The spec stays N-shaped, but N-way FULL OUTER
44
+ * JOIN chains are where dialect risk compounds, so the engine refuses
45
+ * anything the UI cannot produce rather than compiling it untested.
46
+ */
47
+ MergeQueryErrorKind["TOO_MANY_SOURCES"] = "too_many_sources";
48
+ MergeQueryErrorKind["DUPLICATE_SOURCE_ID"] = "duplicate_source_id";
49
+ MergeQueryErrorKind["EMPTY_JOIN_KEY"] = "empty_join_key";
50
+ MergeQueryErrorKind["JOIN_KEY_COVERAGE"] = "join_key_coverage";
51
+ MergeQueryErrorKind["UNKNOWN_SOURCE_IN_JOIN_KEY"] = "unknown_source_in_join_key";
52
+ /**
53
+ * A source still carries a dimension that is not part of the join key.
54
+ * Joining it would repeat the other sources' rows once per value — the
55
+ * merged table looks reasonable and every aggregate over it is wrong.
56
+ */
57
+ MergeQueryErrorKind["FAN_OUT"] = "fan_out";
58
+ /**
59
+ * A join key names a field its query does not group by. The merged
60
+ * statement would reference a column that side never produced.
61
+ */
62
+ MergeQueryErrorKind["JOIN_KEY_NOT_SELECTED"] = "join_key_not_selected";
63
+ /**
64
+ * Two sides of a join key hold different kinds of value. The warehouse
65
+ * either refuses the comparison or silently coerces it, and a coerced
66
+ * comparison that never matches looks exactly like "no data".
67
+ */
68
+ MergeQueryErrorKind["JOIN_KEY_TYPE_MISMATCH"] = "join_key_type_mismatch";
69
+ /**
70
+ * Two sides of a date join key are truncated to different grains. Joining
71
+ * a month to a day matches only the first of each month, which reads as an
72
+ * almost-empty result rather than as a mistake.
73
+ */
74
+ MergeQueryErrorKind["JOIN_KEY_GRANULARITY_MISMATCH"] = "join_key_granularity_mismatch";
75
+ /**
76
+ * A table calculation whose value depends on the query's whole row set
77
+ * (running totals, ranks, percent-of-total, pivot functions). Merging
78
+ * changes that row set, so the number would be carried over frozen or
79
+ * arrive as null.
80
+ */
81
+ MergeQueryErrorKind["UNSUPPORTED_TABLE_CALCULATION"] = "unsupported_table_calculation";
82
+ /** Two merge calculations share a name, so one would overwrite the other. */
83
+ MergeQueryErrorKind["DUPLICATE_CALCULATION_NAME"] = "duplicate_calculation_name";
84
+ /** A merge calculation references something the merged result has no column for. */
85
+ MergeQueryErrorKind["UNRESOLVED_CALCULATION_REFERENCE"] = "unresolved_calculation_reference";
86
+ /**
87
+ * A merged column's value type cannot be resolved from the field it came
88
+ * from. Guessing "string" here poisons everything built on the merged
89
+ * result — filters, formatting, further aggregation — so it is refused.
90
+ */
91
+ MergeQueryErrorKind["UNRESOLVED_COLUMN_TYPE"] = "unresolved_column_type";
92
+ /**
93
+ * A source references parameters that have no value, supplied or default.
94
+ * Embedded anyway, the placeholder would reach the warehouse as literal
95
+ * text — the same refusal the query makes when it runs on its own.
96
+ */
97
+ MergeQueryErrorKind["MISSING_PARAMETERS"] = "missing_parameters";
98
+ })(MergeQueryErrorKind || (exports.MergeQueryErrorKind = MergeQueryErrorKind = {}));
99
+ const getJoinKeyFieldIdsForSource = (joinKey, sourceId) => joinKey.flatMap((part) => {
100
+ const fieldId = part.fieldIdBySourceId[sourceId];
101
+ return fieldId === undefined ? [] : [fieldId];
102
+ });
103
+ /**
104
+ * Dimensions a source carries that are not part of the join key. A non-empty
105
+ * result is the fan-out trap, and is what the explorer renders as an
106
+ * incomplete merge row.
107
+ */
108
+ const getUnaccountedDimensions = (source, joinKey) => {
109
+ const accounted = new Set([
110
+ ...getJoinKeyFieldIdsForSource(joinKey, source.id),
111
+ ]);
112
+ return source.metricQuery.dimensions.filter((dimension) => !accounted.has(dimension));
113
+ };
114
+ exports.getUnaccountedDimensions = getUnaccountedDimensions;
115
+ /**
116
+ * Every reason this merge would produce a wrong or unbuildable result. Empty
117
+ * means the merge is safe to compile.
118
+ */
119
+ const validateMergeQuery = (mergeQuery,
120
+ /**
121
+ * Types of every field named in the join key. Omitting it skips the type
122
+ * and granularity checks — structural validation still runs, but a
123
+ * mismatched join will only show up as a puzzling empty result.
124
+ */
125
+ fieldTypes) => {
126
+ const { sources, joinKey } = mergeQuery;
127
+ const errors = [];
128
+ if (sources.length < 2) {
129
+ errors.push({
130
+ kind: MergeQueryErrorKind.TOO_FEW_SOURCES,
131
+ sourceId: null,
132
+ fieldIds: [],
133
+ message: 'A merge needs at least two queries.',
134
+ });
135
+ }
136
+ if (sources.length > 2) {
137
+ errors.push({
138
+ kind: MergeQueryErrorKind.TOO_MANY_SOURCES,
139
+ sourceId: null,
140
+ fieldIds: [],
141
+ message: 'A merge joins exactly two queries. Remove the extra queries, or merge them in pairs.',
142
+ });
143
+ }
144
+ const sourceIds = sources.map((source) => source.id);
145
+ const duplicateIds = sourceIds.filter((id, index) => sourceIds.indexOf(id) !== index);
146
+ duplicateIds.forEach((id) => {
147
+ errors.push({
148
+ kind: MergeQueryErrorKind.DUPLICATE_SOURCE_ID,
149
+ sourceId: id,
150
+ fieldIds: [],
151
+ message: `More than one query uses the id "${id}".`,
152
+ });
153
+ });
154
+ if (joinKey.length === 0) {
155
+ errors.push({
156
+ kind: MergeQueryErrorKind.EMPTY_JOIN_KEY,
157
+ sourceId: null,
158
+ fieldIds: [],
159
+ message: 'A merge needs at least one field to join on.',
160
+ });
161
+ }
162
+ const knownSourceIds = new Set(sourceIds);
163
+ joinKey.forEach((part) => {
164
+ sources.forEach((source) => {
165
+ const fieldId = part.fieldIdBySourceId[source.id];
166
+ if (fieldId === undefined) {
167
+ errors.push({
168
+ kind: MergeQueryErrorKind.JOIN_KEY_COVERAGE,
169
+ sourceId: source.id,
170
+ fieldIds: [],
171
+ message: `Query "${source.id}" has no field to join on for "${part.name}".`,
172
+ });
173
+ return;
174
+ }
175
+ // The join compiles against the source's own output columns, so a
176
+ // key naming a field the source does not select produces SQL that
177
+ // references a column the warehouse has never heard of.
178
+ if (!source.metricQuery.dimensions.includes(fieldId)) {
179
+ errors.push({
180
+ kind: MergeQueryErrorKind.JOIN_KEY_NOT_SELECTED,
181
+ sourceId: source.id,
182
+ fieldIds: [fieldId],
183
+ message: `Query "${source.id}" joins on ${fieldId}, which it does not group by. Add it to that query, or join on a field it already has.`,
184
+ });
185
+ }
186
+ });
187
+ Object.keys(part.fieldIdBySourceId)
188
+ .filter((id) => !knownSourceIds.has(id))
189
+ .forEach((id) => {
190
+ errors.push({
191
+ kind: MergeQueryErrorKind.UNKNOWN_SOURCE_IN_JOIN_KEY,
192
+ sourceId: id,
193
+ fieldIds: [],
194
+ message: `Join key "${part.name}" references unknown query "${id}".`,
195
+ });
196
+ });
197
+ if (fieldTypes === undefined) {
198
+ return;
199
+ }
200
+ const joined = Object.entries(part.fieldIdBySourceId).flatMap(([sourceId, fieldId]) => {
201
+ const meta = fieldTypes[sourceId]?.[fieldId];
202
+ return meta === undefined ? [] : [{ fieldId, meta }];
203
+ });
204
+ const typeClasses = new Set(joined.map(({ meta }) => getTypeClass(meta.type)));
205
+ if (typeClasses.size > 1) {
206
+ errors.push({
207
+ kind: MergeQueryErrorKind.JOIN_KEY_TYPE_MISMATCH,
208
+ sourceId: null,
209
+ fieldIds: joined.map(({ fieldId }) => fieldId),
210
+ message: `Join key "${part.name}" compares ${joined
211
+ .map(({ fieldId, meta }) => `${fieldId} (${meta.type})`)
212
+ .join(' to ')}. Those hold different kinds of value, so the join would either be refused or silently never match.`,
213
+ });
214
+ return;
215
+ }
216
+ const grains = new Set(joined
217
+ .filter(({ meta }) => getTypeClass(meta.type) === 'temporal')
218
+ .map(({ meta }) => meta.timeInterval ?? 'RAW'));
219
+ if (grains.size > 1) {
220
+ errors.push({
221
+ kind: MergeQueryErrorKind.JOIN_KEY_GRANULARITY_MISMATCH,
222
+ sourceId: null,
223
+ fieldIds: joined.map(({ fieldId }) => fieldId),
224
+ message: `Join key "${part.name}" joins ${[...grains]
225
+ .map((grain) => String(grain).toLowerCase())
226
+ .join(' to ')}. Dates truncated to different grains only match where the finer one lands on the coarser one, which looks like missing data rather than a mistake.`,
227
+ });
228
+ }
229
+ });
230
+ sources.forEach((source) => {
231
+ const unaccounted = (0, exports.getUnaccountedDimensions)(source, joinKey);
232
+ if (unaccounted.length > 0) {
233
+ errors.push({
234
+ kind: MergeQueryErrorKind.FAN_OUT,
235
+ sourceId: source.id,
236
+ fieldIds: unaccounted,
237
+ message: `Query "${source.id}" carries ${unaccounted.join(', ')}, which is not joined on. Merging would repeat the other queries' rows once per value.`,
238
+ });
239
+ }
240
+ });
241
+ const calculationNames = mergeQuery.tableCalculations.map((calculation) => calculation.name);
242
+ calculationNames
243
+ .filter((name, index) => calculationNames.indexOf(name) !== index)
244
+ .forEach((name) => {
245
+ errors.push({
246
+ kind: MergeQueryErrorKind.DUPLICATE_CALCULATION_NAME,
247
+ sourceId: null,
248
+ fieldIds: [name],
249
+ message: `More than one calculation is called "${name}".`,
250
+ });
251
+ });
252
+ // Reference resolution is deliberately not checked here: only the
253
+ // compiler knows the real column names. See ProjectService.compileMergeQuery.
254
+ return errors;
255
+ };
256
+ exports.validateMergeQuery = validateMergeQuery;
257
+ /**
258
+ * Column the merged statement carries to report that a query produced more
259
+ * rows than the merge is willing to join. It is a guard, not data: the caller
260
+ * refuses the result rather than showing a partial join.
261
+ */
262
+ exports.MERGE_TRUNCATED_COLUMN = '__merge_truncated';
263
+ /** Internal marker that distinguishes the empty-result guard row from data. */
264
+ exports.MERGE_ROW_PRESENT_COLUMN = '__merge_row_present';
265
+ /**
266
+ * Table merged columns that belong to no single source are attributed to:
267
+ * join keys, which are shared by every source, and calculations over the
268
+ * merged result.
269
+ */
270
+ exports.MERGE_TABLE_NAME = 'merge';
271
+ /** Label for the pseudo-table a source's merged fields belong to. */
272
+ const getMergeSourceTableLabel = (sourceIndex) => `Query ${String.fromCharCode(65 + sourceIndex)}`;
273
+ exports.getMergeSourceTableLabel = getMergeSourceTableLabel;
274
+ /** Source ids the stored shape maps onto when it becomes a runnable merge. */
275
+ exports.MERGE_CHART_SOURCE_ID = 'chart';
276
+ exports.MERGE_SECOND_SOURCE_ID = 'second';
277
+ /**
278
+ * Rebuilds a runnable merge from a chart's own query and its stored merge.
279
+ */
280
+ const buildMergeQueryFromSaved = (chartMetricQuery, saved) => ({
281
+ sources: [
282
+ {
283
+ id: exports.MERGE_CHART_SOURCE_ID,
284
+ metricQuery: chartMetricQuery,
285
+ },
286
+ {
287
+ id: exports.MERGE_SECOND_SOURCE_ID,
288
+ metricQuery: saved.secondQuery.metricQuery,
289
+ },
290
+ ],
291
+ joinKey: saved.joinKey.map((part) => ({
292
+ name: part.name,
293
+ fieldIdBySourceId: {
294
+ [exports.MERGE_CHART_SOURCE_ID]: part.chartFieldId,
295
+ [exports.MERGE_SECOND_SOURCE_ID]: part.secondFieldId,
296
+ },
297
+ })),
298
+ joinType: saved.joinType,
299
+ tableCalculations: saved.tableCalculations,
300
+ limit: chartMetricQuery.limit,
301
+ });
302
+ exports.buildMergeQueryFromSaved = buildMergeQueryFromSaved;
303
+ /**
304
+ * Reads a stored merge back, returning null for anything that does not hold
305
+ * together. A payload written by an older shape should leave the chart working
306
+ * without its merge rather than break the chart entirely.
307
+ */
308
+ const parseSavedMergeQuery = (value) => {
309
+ if (value === null || typeof value !== 'object')
310
+ return null;
311
+ const candidate = value;
312
+ const metricQuery = candidate.secondQuery?.metricQuery;
313
+ if (!metricQuery || typeof metricQuery.exploreName !== 'string') {
314
+ return null;
315
+ }
316
+ if (!Array.isArray(candidate.joinKey) || candidate.joinKey.length === 0) {
317
+ return null;
318
+ }
319
+ const joinKey = candidate.joinKey.filter((part) => typeof part?.name === 'string' &&
320
+ typeof part?.chartFieldId === 'string' &&
321
+ typeof part?.secondFieldId === 'string');
322
+ if (joinKey.length !== candidate.joinKey.length)
323
+ return null;
324
+ const joinType = Object.values(MergeJoinType).includes(String(candidate.joinType))
325
+ ? candidate.joinType
326
+ : MergeJoinType.FULL;
327
+ return {
328
+ secondQuery: {
329
+ metricQuery,
330
+ },
331
+ joinKey,
332
+ joinType,
333
+ tableCalculations: Array.isArray(candidate.tableCalculations)
334
+ ? candidate.tableCalculations
335
+ : [],
336
+ };
337
+ };
338
+ exports.parseSavedMergeQuery = parseSavedMergeQuery;
339
+ //# sourceMappingURL=mergeQuery.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mergeQuery.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=mergeQuery.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mergeQuery.test.d.ts","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,230 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const field_1 = require("./field");
4
+ const mergeQuery_1 = require("./mergeQuery");
5
+ const timeFrames_1 = require("./timeFrames");
6
+ const metricQuery = (exploreName, dimensions, metrics) => ({
7
+ exploreName,
8
+ dimensions,
9
+ metrics,
10
+ filters: {},
11
+ sorts: [],
12
+ limit: 500,
13
+ tableCalculations: [],
14
+ });
15
+ // The running example from the merge-queries field guide: query A counts new
16
+ // followers per day, query B reads total followers from daily snapshots. The
17
+ // join key is the date.
18
+ const queryA = (dimensions = ['followers_created_date']) => ({
19
+ id: 'a',
20
+ metricQuery: metricQuery('followers', dimensions, ['followers_count']),
21
+ });
22
+ const queryB = () => ({
23
+ id: 'b',
24
+ metricQuery: metricQuery('follower_snapshots', ['follower_snapshots_date'], ['follower_snapshots_total_followers']),
25
+ });
26
+ const dateJoinKey = [
27
+ {
28
+ name: 'date_day',
29
+ fieldIdBySourceId: {
30
+ a: 'followers_created_date',
31
+ b: 'follower_snapshots_date',
32
+ },
33
+ },
34
+ ];
35
+ const mergeQuery = (overrides = {}) => ({
36
+ sources: [queryA(), queryB()],
37
+ joinKey: dateJoinKey,
38
+ joinType: mergeQuery_1.MergeJoinType.FULL,
39
+ tableCalculations: [],
40
+ limit: 500,
41
+ ...overrides,
42
+ });
43
+ describe('validateMergeQuery', () => {
44
+ describe('the fan-out trap', () => {
45
+ it('rejects a source carrying a dimension that is not joined on', () => {
46
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({
47
+ sources: [
48
+ queryA(['followers_created_date', 'followers_source']),
49
+ queryB(),
50
+ ],
51
+ }));
52
+ expect(errors).toHaveLength(1);
53
+ expect(errors[0]).toMatchObject({
54
+ kind: mergeQuery_1.MergeQueryErrorKind.FAN_OUT,
55
+ sourceId: 'a',
56
+ fieldIds: ['followers_source'],
57
+ });
58
+ });
59
+ it('accepts the same merge once the extra dimension is dropped', () => {
60
+ expect((0, mergeQuery_1.validateMergeQuery)(mergeQuery())).toEqual([]);
61
+ });
62
+ it('accepts the extra dimension when both sources have it and it joins', () => {
63
+ // Both queries grouped by date and region: region belongs in the
64
+ // join key, and the merge stays at grain.
65
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({
66
+ sources: [
67
+ queryA(['followers_created_date', 'followers_region']),
68
+ {
69
+ ...queryB(),
70
+ metricQuery: metricQuery('follower_snapshots', [
71
+ 'follower_snapshots_date',
72
+ 'follower_snapshots_region',
73
+ ], ['follower_snapshots_total_followers']),
74
+ },
75
+ ],
76
+ joinKey: [
77
+ ...dateJoinKey,
78
+ {
79
+ name: 'region',
80
+ fieldIdBySourceId: {
81
+ a: 'followers_region',
82
+ b: 'follower_snapshots_region',
83
+ },
84
+ },
85
+ ],
86
+ }));
87
+ expect(errors).toEqual([]);
88
+ });
89
+ });
90
+ describe('shape of the merge', () => {
91
+ it('rejects a merge with fewer than two sources', () => {
92
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({ sources: [queryA()] }));
93
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([mergeQuery_1.MergeQueryErrorKind.TOO_FEW_SOURCES]));
94
+ });
95
+ it('rejects a merge with more than two sources', () => {
96
+ const queryC = {
97
+ id: 'c',
98
+ metricQuery: metricQuery('unfollows', ['unfollows_date'], ['unfollows_count']),
99
+ };
100
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({
101
+ sources: [queryA(), queryB(), queryC],
102
+ joinKey: [
103
+ {
104
+ name: 'date_day',
105
+ fieldIdBySourceId: {
106
+ a: 'followers_created_date',
107
+ b: 'follower_snapshots_date',
108
+ c: 'unfollows_date',
109
+ },
110
+ },
111
+ ],
112
+ }));
113
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([mergeQuery_1.MergeQueryErrorKind.TOO_MANY_SOURCES]));
114
+ });
115
+ it('rejects duplicate source ids', () => {
116
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({ sources: [queryA(), queryA()] }));
117
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([
118
+ mergeQuery_1.MergeQueryErrorKind.DUPLICATE_SOURCE_ID,
119
+ ]));
120
+ });
121
+ it('rejects an empty join key', () => {
122
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({ joinKey: [] }));
123
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([mergeQuery_1.MergeQueryErrorKind.EMPTY_JOIN_KEY]));
124
+ });
125
+ it('rejects a join key that does not cover every source', () => {
126
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({
127
+ joinKey: [
128
+ {
129
+ name: 'date_day',
130
+ fieldIdBySourceId: { a: 'followers_created_date' },
131
+ },
132
+ ],
133
+ }));
134
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([
135
+ mergeQuery_1.MergeQueryErrorKind.JOIN_KEY_COVERAGE,
136
+ // b's date is now unaccounted for as well.
137
+ mergeQuery_1.MergeQueryErrorKind.FAN_OUT,
138
+ ]));
139
+ });
140
+ it('rejects a join key referencing an unknown source', () => {
141
+ const errors = (0, mergeQuery_1.validateMergeQuery)(mergeQuery({
142
+ joinKey: [
143
+ {
144
+ name: 'date_day',
145
+ fieldIdBySourceId: {
146
+ a: 'followers_created_date',
147
+ b: 'follower_snapshots_date',
148
+ c: 'ghost_date',
149
+ },
150
+ },
151
+ ],
152
+ }));
153
+ expect(errors.map((error) => error.kind)).toEqual(expect.arrayContaining([
154
+ mergeQuery_1.MergeQueryErrorKind.UNKNOWN_SOURCE_IN_JOIN_KEY,
155
+ ]));
156
+ });
157
+ });
158
+ });
159
+ describe('join key comparability', () => {
160
+ const withTypes = (a, b) => (0, mergeQuery_1.validateMergeQuery)(mergeQuery(), {
161
+ a: { followers_created_date: a },
162
+ b: { follower_snapshots_date: b },
163
+ });
164
+ const day = {
165
+ type: field_1.DimensionType.DATE,
166
+ timeInterval: timeFrames_1.TimeFrames.DAY,
167
+ };
168
+ it('accepts two date fields at the same grain', () => {
169
+ expect(withTypes(day, day)).toEqual([]);
170
+ });
171
+ it('accepts a date joined to a timestamp at the same grain', () => {
172
+ // Every supported warehouse compares these; the grain is what matters.
173
+ expect(withTypes(day, {
174
+ type: field_1.DimensionType.TIMESTAMP,
175
+ timeInterval: timeFrames_1.TimeFrames.DAY,
176
+ })).toEqual([]);
177
+ });
178
+ it('rejects a date joined to a string', () => {
179
+ const errors = withTypes(day, {
180
+ type: field_1.DimensionType.STRING,
181
+ timeInterval: null,
182
+ });
183
+ expect(errors).toHaveLength(1);
184
+ expect(errors[0].kind).toBe(mergeQuery_1.MergeQueryErrorKind.JOIN_KEY_TYPE_MISMATCH);
185
+ });
186
+ it('rejects a month joined to a day', () => {
187
+ const errors = withTypes(day, {
188
+ type: field_1.DimensionType.DATE,
189
+ timeInterval: timeFrames_1.TimeFrames.MONTH,
190
+ });
191
+ expect(errors).toHaveLength(1);
192
+ expect(errors[0].kind).toBe(mergeQuery_1.MergeQueryErrorKind.JOIN_KEY_GRANULARITY_MISMATCH);
193
+ });
194
+ it('keeps types separate when two sources use the same field id', () => {
195
+ const query = mergeQuery({
196
+ sources: [
197
+ queryA(['shared']),
198
+ {
199
+ ...queryB(),
200
+ metricQuery: metricQuery('follower_snapshots', ['shared'], []),
201
+ },
202
+ ],
203
+ joinKey: [
204
+ {
205
+ name: 'shared',
206
+ fieldIdBySourceId: { a: 'shared', b: 'shared' },
207
+ },
208
+ ],
209
+ });
210
+ const errors = (0, mergeQuery_1.validateMergeQuery)(query, {
211
+ a: { shared: day },
212
+ b: {
213
+ shared: { type: field_1.DimensionType.STRING, timeInterval: null },
214
+ },
215
+ });
216
+ expect(errors.map(({ kind }) => kind)).toContain(mergeQuery_1.MergeQueryErrorKind.JOIN_KEY_TYPE_MISMATCH);
217
+ });
218
+ it('skips the checks when no field types are supplied', () => {
219
+ expect((0, mergeQuery_1.validateMergeQuery)(mergeQuery())).toEqual([]);
220
+ });
221
+ });
222
+ describe('getUnaccountedDimensions', () => {
223
+ it('reports the dimension that would fan the merge out', () => {
224
+ expect((0, mergeQuery_1.getUnaccountedDimensions)(queryA(['followers_created_date', 'followers_source']), dateJoinKey)).toEqual(['followers_source']);
225
+ });
226
+ it('reports nothing when every dimension joins', () => {
227
+ expect((0, mergeQuery_1.getUnaccountedDimensions)(queryA(), dateJoinKey)).toEqual([]);
228
+ });
229
+ });
230
+ //# sourceMappingURL=mergeQuery.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mergeQuery.test.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { DimensionType, type Item } from './field';
2
+ import { type AdditionalMetric } from './metricQuery';
2
3
  export type ResultValue = {
3
4
  raw: unknown;
4
5
  formatted: string;
@@ -6,7 +7,7 @@ export type ResultValue = {
6
7
  export declare const isResultValue: (value: unknown) => value is {
7
8
  value: ResultValue;
8
9
  };
9
- export declare function convertItemTypeToDimensionType(item: Item): DimensionType;
10
+ export declare function convertItemTypeToDimensionType(item: Item | AdditionalMetric): DimensionType;
10
11
  export type ResultColumn = {
11
12
  reference: string;
12
13
  type: DimensionType;
@@ -1 +1 @@
1
- {"version":3,"file":"results.d.ts","sourceRoot":"","sources":["../../../src/types/results.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,aAAa,EAGb,KAAK,IAAI,EACZ,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,WAAW,GAAG;IACtB,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,aAAa,UACf,OAAO,KACf,KAAK,IAAI;IAAE,KAAK,EAAE,WAAW,CAAA;CAOF,CAAC;AAE/B,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,CA2CxE;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC;AAE/D,KAAK,cAAc,GAAG,OAAO,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAE1D,eAAO,MAAM,cAAc,UAAW,OAAO,KAAG,KAAK,IAAI,cACV,CAAC"}
1
+ {"version":3,"file":"results.d.ts","sourceRoot":"","sources":["../../../src/types/results.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,aAAa,EAGb,KAAK,IAAI,EACZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,MAAM,WAAW,GAAG;IACtB,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,aAAa,UACf,OAAO,KACf,KAAK,IAAI;IAAE,KAAK,EAAE,WAAW,CAAA;CAOF,CAAC;AAE/B,wBAAgB,8BAA8B,CAC1C,IAAI,EAAE,IAAI,GAAG,gBAAgB,GAC9B,aAAa,CA2Cf;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC;AAE/D,KAAK,cAAc,GAAG,OAAO,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAE1D,eAAO,MAAM,cAAc,UAAW,OAAO,KAAG,KAAK,IAAI,cACV,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"results.js","sourceRoot":"","sources":["../../../src/types/results.ts"],"names":[],"mappings":";;;;;AAAA,2FAA2D;AAC3D,wCAA4C;AAC5C,mCAKiB;AAOV,MAAM,aAAa,GAAG,CACzB,KAAc,EACiB,EAAE,CACjC,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACd,OAAO,IAAI,KAAK;IAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;IAC/B,KAAK,CAAC,KAAK,KAAK,IAAI;IACpB,KAAK,IAAI,KAAK,CAAC,KAAK;IACpB,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC;AATlB,QAAA,aAAa,GAAb,aAAa,CASK;AAE/B,wCAA+C,IAAU;IACrD,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,qBAAa,CAAC,MAAM,CAAC;QAC1B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,4BAAoB,CAAC,MAAM;YAC5B,OAAO,qBAAa,CAAC,MAAM,CAAC;QAChC,KAAK,qBAAa,CAAC,MAAM,CAAC;QAC1B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,kBAAU,CAAC,UAAU,CAAC;QAC3B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,kBAAU,CAAC,OAAO,CAAC;QACxB,KAAK,kBAAU,CAAC,KAAK,CAAC;QACtB,KAAK,kBAAU,CAAC,cAAc,CAAC;QAC/B,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,YAAY,CAAC;QAC7B,KAAK,kBAAU,CAAC,gBAAgB,CAAC;QACjC,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,mBAAmB,CAAC;QACpC,KAAK,kBAAU,CAAC,gBAAgB,CAAC;QACjC,KAAK,kBAAU,CAAC,aAAa,CAAC;QAC9B,KAAK,4BAAoB,CAAC,MAAM;YAC5B,OAAO,qBAAa,CAAC,MAAM,CAAC;QAChC,KAAK,qBAAa,CAAC,SAAS,CAAC;QAC7B,KAAK,kBAAU,CAAC,SAAS,CAAC;QAC1B,KAAK,4BAAoB,CAAC,SAAS;YAC/B,OAAO,qBAAa,CAAC,SAAS,CAAC;QACnC,KAAK,qBAAa,CAAC,IAAI,CAAC;QACxB,KAAK,kBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,4BAAoB,CAAC,IAAI;YAC1B,OAAO,qBAAa,CAAC,IAAI,CAAC;QAC9B,KAAK,qBAAa,CAAC,OAAO,CAAC;QAC3B,KAAK,kBAAU,CAAC,OAAO,CAAC;QACxB,KAAK,4BAAoB,CAAC,OAAO;YAC7B,OAAO,qBAAa,CAAC,OAAO,CAAC;QACjC,SAAS,CAAC;YACN,OAAO,IAAA,2BAAiB,EACpB,IAAI,EACJ,2CAA2C,IAAI,EAAE,CACpD,CAAC;QACN,CAAC;IACL,CAAC;AACL,CAAC;AAeM,MAAM,cAAc,GAAG,CAAC,KAAc,EAA2B,EAAE,CACtE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AADnC,QAAA,cAAc,GAAd,cAAc,CACqB"}
1
+ {"version":3,"file":"results.js","sourceRoot":"","sources":["../../../src/types/results.ts"],"names":[],"mappings":";;;;;AAAA,2FAA2D;AAC3D,wCAA4C;AAC5C,mCAKiB;AAQV,MAAM,aAAa,GAAG,CACzB,KAAc,EACiB,EAAE,CACjC,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACd,OAAO,IAAI,KAAK;IAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;IAC/B,KAAK,CAAC,KAAK,KAAK,IAAI;IACpB,KAAK,IAAI,KAAK,CAAC,KAAK;IACpB,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC;AATlB,QAAA,aAAa,GAAb,aAAa,CASK;AAE/B,wCACI,IAA6B;IAE7B,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,qBAAa,CAAC,MAAM,CAAC;QAC1B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,4BAAoB,CAAC,MAAM;YAC5B,OAAO,qBAAa,CAAC,MAAM,CAAC;QAChC,KAAK,qBAAa,CAAC,MAAM,CAAC;QAC1B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,kBAAU,CAAC,UAAU,CAAC;QAC3B,KAAK,kBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,kBAAU,CAAC,OAAO,CAAC;QACxB,KAAK,kBAAU,CAAC,KAAK,CAAC;QACtB,KAAK,kBAAU,CAAC,cAAc,CAAC;QAC/B,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,YAAY,CAAC;QAC7B,KAAK,kBAAU,CAAC,gBAAgB,CAAC;QACjC,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,kBAAU,CAAC,mBAAmB,CAAC;QACpC,KAAK,kBAAU,CAAC,gBAAgB,CAAC;QACjC,KAAK,kBAAU,CAAC,aAAa,CAAC;QAC9B,KAAK,4BAAoB,CAAC,MAAM;YAC5B,OAAO,qBAAa,CAAC,MAAM,CAAC;QAChC,KAAK,qBAAa,CAAC,SAAS,CAAC;QAC7B,KAAK,kBAAU,CAAC,SAAS,CAAC;QAC1B,KAAK,4BAAoB,CAAC,SAAS;YAC/B,OAAO,qBAAa,CAAC,SAAS,CAAC;QACnC,KAAK,qBAAa,CAAC,IAAI,CAAC;QACxB,KAAK,kBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,4BAAoB,CAAC,IAAI;YAC1B,OAAO,qBAAa,CAAC,IAAI,CAAC;QAC9B,KAAK,qBAAa,CAAC,OAAO,CAAC;QAC3B,KAAK,kBAAU,CAAC,OAAO,CAAC;QACxB,KAAK,4BAAoB,CAAC,OAAO;YAC7B,OAAO,qBAAa,CAAC,OAAO,CAAC;QACjC,SAAS,CAAC;YACN,OAAO,IAAA,2BAAiB,EACpB,IAAI,EACJ,2CAA2C,IAAI,EAAE,CACpD,CAAC;QACN,CAAC;IACL,CAAC;AACL,CAAC;AAeM,MAAM,cAAc,GAAG,CAAC,KAAc,EAA2B,EAAE,CACtE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AADnC,QAAA,cAAc,GAAd,cAAc,CACqB"}