@lightdash/common 2.242.0 → 2.242.2

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.
@@ -1,5 +1,5 @@
1
1
  import { DimensionType, type FieldId, type ItemsMap, type TimestampDomain } from './field';
2
- import { type MetricQuery } from './metricQuery';
2
+ import { type MetricQuery, type SortField } from './metricQuery';
3
3
  import { type ParametersValuesMap } from './parameters';
4
4
  import { type PivotConfiguration } from './pivot';
5
5
  import { type TimeFrames } from './timeFrames';
@@ -45,6 +45,7 @@ export type MetricSourcedMergeQuery = {
45
45
  joinKey: MergeJoinKeyPart[];
46
46
  joinType: MergeJoinType;
47
47
  tableCalculations: MergeTableCalculation[];
48
+ sorts?: SortField[];
48
49
  limit: number;
49
50
  };
50
51
  export declare const isMergeResultSource: (source: MergeQuerySource) => source is MergeQueryResultSource;
@@ -80,6 +81,12 @@ export type MergeQuery = {
80
81
  joinType: MergeJoinType;
81
82
  /** Calculations over the merged result. Applied last, after any pivot. */
82
83
  tableCalculations: MergeTableCalculation[];
84
+ /**
85
+ * Sort of the merged result, by merged field id. Legs always run
86
+ * unsorted. Optional for compatibility with merges from before it
87
+ * existed; absent means join-key order.
88
+ */
89
+ sorts?: SortField[];
83
90
  limit: number;
84
91
  };
85
92
  /**
@@ -223,6 +230,25 @@ export declare const getUnaccountedDimensions: (source: MergeQuerySource, joinKe
223
230
  * merged result.
224
231
  */
225
232
  export declare const MERGE_TABLE_NAME = "merge";
233
+ /**
234
+ * The sorts a merge can honour: those naming a field the merged result
235
+ * carries. A sort left behind by a field no longer selected is dropped, as
236
+ * the Explorer drops it for a single query, rather than refusing the merge.
237
+ */
238
+ export declare const resolveMergeSorts: (sorts: SortField[] | undefined, mergedFieldIds: string[]) => SortField[];
239
+ /**
240
+ * Sorts as the Explorer holds them, in merged-field space. The Explorer's
241
+ * sort state belongs to the primary source's metric query, so a sort set
242
+ * before merging names a primary field: it maps to that field's merged
243
+ * column, or to the join key column when the field is a key. A sort set on
244
+ * the merged table already names a merged field and passes through.
245
+ */
246
+ export declare const toMergedSorts: ({ sorts, primarySourceId, primaryMetricQuery, joinKey, }: {
247
+ sorts: SortField[];
248
+ primarySourceId: string;
249
+ primaryMetricQuery: Pick<MetricQuery, 'dimensions' | 'metrics' | 'tableCalculations'>;
250
+ joinKey: MergeJoinKeyPart[];
251
+ }) => SortField[];
226
252
  export declare const validateMergeQuery: (mergeQuery: MergeQuery,
227
253
  /**
228
254
  * Types of every field named in the join key. Omitting it skips the type
@@ -1 +1 @@
1
- {"version":3,"file":"mergeQuery.d.ts","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mergeQuery.d.ts","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { getItemId } from '../utils/item';
1
2
  import { DimensionType, } from './field';
2
3
  /**
3
4
  * How unmatched keys survive the merge. Mirrors the SQL join it compiles to.
@@ -138,6 +139,51 @@ export const getUnaccountedDimensions = (source, joinKey) => {
138
139
  * merged result.
139
140
  */
140
141
  export const MERGE_TABLE_NAME = 'merge';
142
+ /**
143
+ * The sorts a merge can honour: those naming a field the merged result
144
+ * carries. A sort left behind by a field no longer selected is dropped, as
145
+ * the Explorer drops it for a single query, rather than refusing the merge.
146
+ */
147
+ export const resolveMergeSorts = (sorts, mergedFieldIds) => {
148
+ const known = new Set(mergedFieldIds);
149
+ return (sorts ?? []).filter((sort) => known.has(sort.fieldId));
150
+ };
151
+ /**
152
+ * Sorts as the Explorer holds them, in merged-field space. The Explorer's
153
+ * sort state belongs to the primary source's metric query, so a sort set
154
+ * before merging names a primary field: it maps to that field's merged
155
+ * column, or to the join key column when the field is a key. A sort set on
156
+ * the merged table already names a merged field and passes through.
157
+ */
158
+ export const toMergedSorts = ({ sorts, primarySourceId, primaryMetricQuery, joinKey, }) => {
159
+ const primaryFieldIds = new Set([
160
+ ...primaryMetricQuery.dimensions,
161
+ ...primaryMetricQuery.metrics,
162
+ ...primaryMetricQuery.tableCalculations.map(({ name }) => name),
163
+ ]);
164
+ return sorts.map((sort) => {
165
+ const keyPart = joinKey.find((part) => part.fieldIdBySourceId[primarySourceId] === sort.fieldId);
166
+ if (keyPart) {
167
+ return {
168
+ ...sort,
169
+ fieldId: getItemId({
170
+ table: MERGE_TABLE_NAME,
171
+ name: keyPart.name,
172
+ }),
173
+ };
174
+ }
175
+ if (primaryFieldIds.has(sort.fieldId)) {
176
+ return {
177
+ ...sort,
178
+ fieldId: getItemId({
179
+ table: primarySourceId,
180
+ name: sort.fieldId,
181
+ }),
182
+ };
183
+ }
184
+ return sort;
185
+ });
186
+ };
141
187
  export const validateMergeQuery = (mergeQuery,
142
188
  /**
143
189
  * Types of every field named in the join key. Omitting it skips the type
@@ -329,6 +375,14 @@ export const buildMergeQueryFromSaved = (chartMetricQuery, saved) => {
329
375
  joinKey: saved.joinKey,
330
376
  joinType: saved.joinType,
331
377
  tableCalculations: saved.tableCalculations,
378
+ // The chart's sort state is the Explorer's, so it may still name
379
+ // primary fields from before the merge was built
380
+ sorts: toMergedSorts({
381
+ sorts: chartMetricQuery.sorts,
382
+ primarySourceId: saved.primarySourceId,
383
+ primaryMetricQuery: chartMetricQuery,
384
+ joinKey: saved.joinKey,
385
+ }),
332
386
  limit: chartMetricQuery.limit,
333
387
  };
334
388
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mergeQuery.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mergeQuery.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}