@lightdash/common 1.156.0 → 1.157.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.
@@ -305,40 +305,41 @@ export type MergeFieldOrigin = {
305
305
  };
306
306
  /** Provenance of every merged field, by field id. */
307
307
  export type MergeFieldOrigins = Record<FieldId, MergeFieldOrigin>;
308
+ /** Current JSON schema stored in `saved_queries_version_merges.merge`. */
309
+ export declare const SAVED_MERGE_QUERY_SCHEMA_VERSION = 2;
308
310
  /**
309
- * How a merge is stored against a chart version.
311
+ * A persisted merge source.
310
312
  *
311
- * Deliberately not the runtime `MergeQuery`. The chart version *is* the first
312
- * query, so storing it again would create two sources of truth that drift the
313
- * next time the chart is edited. Only the second query and the relationship
314
- * are kept, and the two sides of each key part are named rather than addressed
315
- * by a source id that means nothing outside a single request.
313
+ * The chart source is a reference: its metric query already lives on the chart
314
+ * version. Every additional source owns its query. This keeps one source of
315
+ * truth while allowing more sources without adding `thirdQuery`, `fourthQuery`,
316
+ * and so on.
316
317
  */
318
+ export type SavedMergeQuerySource = {
319
+ id: string;
320
+ kind: 'chart';
321
+ } | {
322
+ id: string;
323
+ kind: 'query';
324
+ metricQuery: MetricQuery;
325
+ };
326
+ /** Canonical, scalable representation of a merge stored on a chart version. */
317
327
  export type SavedMergeQuery = {
318
- secondQuery: {
319
- metricQuery: MetricQuery;
320
- };
321
- joinKey: Array<{
322
- name: string;
323
- /** Field in the chart's own query. */
324
- chartFieldId: FieldId;
325
- /** Field in the second query. */
326
- secondFieldId: FieldId;
327
- }>;
328
+ /** Source whose rows a LEFT merge preserves. */
329
+ primarySourceId: string;
330
+ sources: SavedMergeQuerySource[];
331
+ joinKey: MergeJoinKeyPart[];
328
332
  joinType: MergeJoinType;
329
333
  tableCalculations: MergeTableCalculation[];
330
334
  };
331
- /** Source ids the stored shape maps onto when it becomes a runnable merge. */
332
- export declare const MERGE_CHART_SOURCE_ID = "chart";
333
- export declare const MERGE_SECOND_SOURCE_ID = "second";
334
335
  /**
335
336
  * Rebuilds a runnable merge from a chart's own query and its stored merge.
336
337
  */
337
338
  export declare const buildMergeQueryFromSaved: (chartMetricQuery: MetricQuery, saved: SavedMergeQuery) => MergeQuery;
338
339
  /**
339
340
  * Reads a stored merge back, returning null for anything that does not hold
340
- * together. A payload written by an older shape should leave the chart working
341
- * without its merge rather than break the chart entirely.
341
+ * together. An unknown future version leaves the chart working without its
342
+ * merge rather than breaking the chart entirely.
342
343
  */
343
- export declare const parseSavedMergeQuery: (value: unknown) => SavedMergeQuery | null;
344
+ export declare const parseSavedMergeQuery: (schemaVersion: number, value: unknown) => SavedMergeQuery | null;
344
345
  //# sourceMappingURL=mergeQuery.d.ts.map
@@ -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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"}
@@ -265,64 +265,89 @@ export const MERGE_ROW_PRESENT_COLUMN = '__merge_row_present';
265
265
  export const MERGE_TABLE_NAME = 'merge';
266
266
  /** Label for the pseudo-table a source's merged fields belong to. */
267
267
  export const getMergeSourceTableLabel = (sourceIndex) => `Query ${String.fromCharCode(65 + sourceIndex)}`;
268
- /** Source ids the stored shape maps onto when it becomes a runnable merge. */
269
- export const MERGE_CHART_SOURCE_ID = 'chart';
270
- export const MERGE_SECOND_SOURCE_ID = 'second';
268
+ /** Current JSON schema stored in `saved_queries_version_merges.merge`. */
269
+ export const SAVED_MERGE_QUERY_SCHEMA_VERSION = 2;
271
270
  /**
272
271
  * Rebuilds a runnable merge from a chart's own query and its stored merge.
273
272
  */
274
- export const buildMergeQueryFromSaved = (chartMetricQuery, saved) => ({
275
- sources: [
276
- {
277
- id: MERGE_CHART_SOURCE_ID,
278
- metricQuery: chartMetricQuery,
279
- },
280
- {
281
- id: MERGE_SECOND_SOURCE_ID,
282
- metricQuery: saved.secondQuery.metricQuery,
283
- },
284
- ],
285
- joinKey: saved.joinKey.map((part) => ({
286
- name: part.name,
287
- fieldIdBySourceId: {
288
- [MERGE_CHART_SOURCE_ID]: part.chartFieldId,
289
- [MERGE_SECOND_SOURCE_ID]: part.secondFieldId,
290
- },
291
- })),
292
- joinType: saved.joinType,
293
- tableCalculations: saved.tableCalculations,
294
- limit: chartMetricQuery.limit,
295
- });
273
+ export const buildMergeQueryFromSaved = (chartMetricQuery, saved) => {
274
+ const sources = saved.sources.map((source) => {
275
+ if (source.kind === 'chart') {
276
+ return { id: source.id, metricQuery: chartMetricQuery };
277
+ }
278
+ return { id: source.id, metricQuery: source.metricQuery };
279
+ });
280
+ const primaryIndex = sources.findIndex((source) => source.id === saved.primarySourceId);
281
+ if (primaryIndex > 0) {
282
+ sources.unshift(...sources.splice(primaryIndex, 1));
283
+ }
284
+ return {
285
+ sources,
286
+ joinKey: saved.joinKey,
287
+ joinType: saved.joinType,
288
+ tableCalculations: saved.tableCalculations,
289
+ limit: chartMetricQuery.limit,
290
+ };
291
+ };
292
+ const parseJoinType = (value) => Object.values(MergeJoinType).includes(value)
293
+ ? value
294
+ : MergeJoinType.FULL;
296
295
  /**
297
296
  * Reads a stored merge back, returning null for anything that does not hold
298
- * together. A payload written by an older shape should leave the chart working
299
- * without its merge rather than break the chart entirely.
297
+ * together. An unknown future version leaves the chart working without its
298
+ * merge rather than breaking the chart entirely.
300
299
  */
301
- export const parseSavedMergeQuery = (value) => {
300
+ export const parseSavedMergeQuery = (schemaVersion, value) => {
301
+ if (schemaVersion !== SAVED_MERGE_QUERY_SCHEMA_VERSION)
302
+ return null;
302
303
  if (value === null || typeof value !== 'object')
303
304
  return null;
304
305
  const candidate = value;
305
- const metricQuery = candidate.secondQuery?.metricQuery;
306
- if (!metricQuery || typeof metricQuery.exploreName !== 'string') {
306
+ if (!Array.isArray(candidate.sources) ||
307
+ candidate.sources.length < 2 ||
308
+ typeof candidate.primarySourceId !== 'string') {
309
+ return null;
310
+ }
311
+ const sourceIds = candidate.sources.map((source) => source?.id);
312
+ if (sourceIds.some((id) => typeof id !== 'string' || id.length === 0) ||
313
+ new Set(sourceIds).size !== sourceIds.length ||
314
+ !sourceIds.includes(candidate.primarySourceId)) {
315
+ return null;
316
+ }
317
+ const validSources = candidate.sources.every((source) => {
318
+ if (source?.kind === 'chart') {
319
+ return true;
320
+ }
321
+ return (source?.kind === 'query' &&
322
+ source.metricQuery !== null &&
323
+ typeof source.metricQuery === 'object' &&
324
+ typeof source.metricQuery.exploreName === 'string');
325
+ });
326
+ const chartSources = candidate.sources.filter((source) => source?.kind === 'chart');
327
+ if (!validSources || chartSources.length !== 1) {
307
328
  return null;
308
329
  }
309
330
  if (!Array.isArray(candidate.joinKey) || candidate.joinKey.length === 0) {
310
331
  return null;
311
332
  }
312
- const joinKey = candidate.joinKey.filter((part) => typeof part?.name === 'string' &&
313
- typeof part?.chartFieldId === 'string' &&
314
- typeof part?.secondFieldId === 'string');
315
- if (joinKey.length !== candidate.joinKey.length)
333
+ const hasCompleteJoinKeys = candidate.joinKey.every((part) => {
334
+ if (typeof part?.name !== 'string' ||
335
+ part.fieldIdBySourceId === null ||
336
+ typeof part.fieldIdBySourceId !== 'object') {
337
+ return false;
338
+ }
339
+ const fieldSourceIds = Object.keys(part.fieldIdBySourceId);
340
+ return (fieldSourceIds.length === sourceIds.length &&
341
+ sourceIds.every((sourceId) => typeof sourceId === 'string' &&
342
+ typeof part.fieldIdBySourceId[sourceId] === 'string'));
343
+ });
344
+ if (!hasCompleteJoinKeys)
316
345
  return null;
317
- const joinType = Object.values(MergeJoinType).includes(String(candidate.joinType))
318
- ? candidate.joinType
319
- : MergeJoinType.FULL;
320
346
  return {
321
- secondQuery: {
322
- metricQuery,
323
- },
324
- joinKey,
325
- joinType,
347
+ primarySourceId: candidate.primarySourceId,
348
+ sources: candidate.sources,
349
+ joinKey: candidate.joinKey,
350
+ joinType: parseJoinType(candidate.joinType),
326
351
  tableCalculations: Array.isArray(candidate.tableCalculations)
327
352
  ? candidate.tableCalculations
328
353
  : [],
@@ -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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"}
@@ -1,5 +1,5 @@
1
1
  import { DimensionType } from './field';
2
- import { getUnaccountedDimensions, MergeJoinType, MergeQueryErrorKind, validateMergeQuery, } from './mergeQuery';
2
+ import { buildMergeQueryFromSaved, getUnaccountedDimensions, MergeJoinType, MergeQueryErrorKind, parseSavedMergeQuery, SAVED_MERGE_QUERY_SCHEMA_VERSION, validateMergeQuery, } from './mergeQuery';
3
3
  import { TimeFrames } from './timeFrames';
4
4
  const metricQuery = (exploreName, dimensions, metrics) => ({
5
5
  exploreName,
@@ -225,4 +225,62 @@ describe('getUnaccountedDimensions', () => {
225
225
  expect(getUnaccountedDimensions(queryA(), dateJoinKey)).toEqual([]);
226
226
  });
227
227
  });
228
+ describe('saved merge query schemas', () => {
229
+ it('round-trips every source and key in a version 2 payload', () => {
230
+ const saved = {
231
+ primarySourceId: 'payments',
232
+ sources: [
233
+ { id: 'orders', kind: 'chart' },
234
+ {
235
+ id: 'payments',
236
+ kind: 'query',
237
+ metricQuery: metricQuery('payments', ['payments_month'], ['payments_total']),
238
+ },
239
+ {
240
+ id: 'subscriptions',
241
+ kind: 'query',
242
+ metricQuery: metricQuery('subscriptions', ['subscriptions_month'], ['subscriptions_mrr']),
243
+ },
244
+ ],
245
+ joinKey: [
246
+ {
247
+ name: 'month',
248
+ fieldIdBySourceId: {
249
+ orders: 'orders_month',
250
+ payments: 'payments_month',
251
+ subscriptions: 'subscriptions_month',
252
+ },
253
+ },
254
+ ],
255
+ joinType: MergeJoinType.LEFT,
256
+ tableCalculations: [],
257
+ };
258
+ const parsed = parseSavedMergeQuery(SAVED_MERGE_QUERY_SCHEMA_VERSION, saved);
259
+ expect(parsed).toEqual(saved);
260
+ expect(buildMergeQueryFromSaved(metricQuery('orders', ['orders_month'], ['orders_total']), parsed).sources.map(({ id }) => id)).toEqual(['payments', 'orders', 'subscriptions']);
261
+ });
262
+ it('rejects unknown schemas and incomplete source mappings', () => {
263
+ expect(parseSavedMergeQuery(1, {})).toBeNull();
264
+ expect(parseSavedMergeQuery(99, {})).toBeNull();
265
+ expect(parseSavedMergeQuery(SAVED_MERGE_QUERY_SCHEMA_VERSION, {
266
+ primarySourceId: 'orders',
267
+ sources: [
268
+ { id: 'orders', kind: 'chart' },
269
+ {
270
+ id: 'payments',
271
+ kind: 'query',
272
+ metricQuery: metricQuery('payments', [], []),
273
+ },
274
+ ],
275
+ joinKey: [
276
+ {
277
+ name: 'month',
278
+ fieldIdBySourceId: { orders: 'orders_month' },
279
+ },
280
+ ],
281
+ joinType: 'full',
282
+ tableCalculations: [],
283
+ })).toBeNull();
284
+ });
285
+ });
228
286
  //# sourceMappingURL=mergeQuery.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mergeQuery.test.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mergeQuery.test.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lightdash/common",
3
- "version": "1.156.0",
3
+ "version": "1.157.0",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",