@lightdash/common 2.280.0 → 2.281.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 (70) hide show
  1. package/dist/cjs/.tsbuildinfo +1 -1
  2. package/dist/cjs/ee/AiAgent/canonicalizeAiMerge.d.ts +3 -3
  3. package/dist/cjs/ee/AiAgent/canonicalizeAiMerge.d.ts.map +1 -1
  4. package/dist/cjs/ee/AiAgent/canonicalizeAiMerge.js +13 -8
  5. package/dist/cjs/ee/AiAgent/canonicalizeAiMerge.js.map +1 -1
  6. package/dist/cjs/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +12 -12
  7. package/dist/cjs/ee/AiAgent/utils.d.ts +25 -25
  8. package/dist/cjs/schemas/json/chart-as-code-1.0.json +139 -4
  9. package/dist/cjs/types/contentAsCode/charts.d.ts +3 -1
  10. package/dist/cjs/types/contentAsCode/charts.d.ts.map +1 -1
  11. package/dist/cjs/types/contentReviewRequests.d.ts +7 -1
  12. package/dist/cjs/types/contentReviewRequests.d.ts.map +1 -1
  13. package/dist/cjs/types/contentReviewRequests.js.map +1 -1
  14. package/dist/cjs/types/mergeQuery.d.ts +114 -10
  15. package/dist/cjs/types/mergeQuery.d.ts.map +1 -1
  16. package/dist/cjs/types/mergeQuery.js +409 -42
  17. package/dist/cjs/types/mergeQuery.js.map +1 -1
  18. package/dist/cjs/types/savedCharts.d.ts +17 -8
  19. package/dist/cjs/types/savedCharts.d.ts.map +1 -1
  20. package/dist/cjs/types/savedCharts.js.map +1 -1
  21. package/dist/cjs/utils/document.d.ts.map +1 -1
  22. package/dist/cjs/utils/document.js +1 -1
  23. package/dist/cjs/utils/document.js.map +1 -1
  24. package/dist/esm/.tsbuildinfo +1 -1
  25. package/dist/esm/ee/AiAgent/canonicalizeAiMerge.d.ts +3 -3
  26. package/dist/esm/ee/AiAgent/canonicalizeAiMerge.d.ts.map +1 -1
  27. package/dist/esm/ee/AiAgent/canonicalizeAiMerge.js +13 -8
  28. package/dist/esm/ee/AiAgent/canonicalizeAiMerge.js.map +1 -1
  29. package/dist/esm/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +25 -25
  30. package/dist/esm/ee/AiAgent/utils.d.ts +28 -28
  31. package/dist/esm/schemas/json/chart-as-code-1.0.json +139 -4
  32. package/dist/esm/types/contentAsCode/charts.d.ts +3 -1
  33. package/dist/esm/types/contentAsCode/charts.d.ts.map +1 -1
  34. package/dist/esm/types/contentReviewRequests.d.ts +7 -1
  35. package/dist/esm/types/contentReviewRequests.d.ts.map +1 -1
  36. package/dist/esm/types/contentReviewRequests.js.map +1 -1
  37. package/dist/esm/types/mergeQuery.d.ts +114 -10
  38. package/dist/esm/types/mergeQuery.d.ts.map +1 -1
  39. package/dist/esm/types/mergeQuery.js +398 -40
  40. package/dist/esm/types/mergeQuery.js.map +1 -1
  41. package/dist/esm/types/savedCharts.d.ts +17 -8
  42. package/dist/esm/types/savedCharts.d.ts.map +1 -1
  43. package/dist/esm/types/savedCharts.js.map +1 -1
  44. package/dist/esm/utils/document.d.ts.map +1 -1
  45. package/dist/esm/utils/document.js +2 -2
  46. package/dist/esm/utils/document.js.map +1 -1
  47. package/dist/types/.tsbuildinfo +1 -1
  48. package/dist/types/ee/AiAgent/canonicalizeAiMerge.d.ts +3 -3
  49. package/dist/types/ee/AiAgent/canonicalizeAiMerge.d.ts.map +1 -1
  50. package/dist/types/ee/AiAgent/canonicalizeAiMerge.js +13 -8
  51. package/dist/types/ee/AiAgent/canonicalizeAiMerge.js.map +1 -1
  52. package/dist/types/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +25 -25
  53. package/dist/types/ee/AiAgent/utils.d.ts +28 -28
  54. package/dist/types/schemas/json/chart-as-code-1.0.json +139 -4
  55. package/dist/types/types/contentAsCode/charts.d.ts +3 -1
  56. package/dist/types/types/contentAsCode/charts.d.ts.map +1 -1
  57. package/dist/types/types/contentReviewRequests.d.ts +7 -1
  58. package/dist/types/types/contentReviewRequests.d.ts.map +1 -1
  59. package/dist/types/types/contentReviewRequests.js.map +1 -1
  60. package/dist/types/types/mergeQuery.d.ts +114 -10
  61. package/dist/types/types/mergeQuery.d.ts.map +1 -1
  62. package/dist/types/types/mergeQuery.js +398 -40
  63. package/dist/types/types/mergeQuery.js.map +1 -1
  64. package/dist/types/types/savedCharts.d.ts +17 -8
  65. package/dist/types/types/savedCharts.d.ts.map +1 -1
  66. package/dist/types/types/savedCharts.js.map +1 -1
  67. package/dist/types/utils/document.d.ts.map +1 -1
  68. package/dist/types/utils/document.js +2 -2
  69. package/dist/types/utils/document.js.map +1 -1
  70. package/package.json +1 -1
@@ -7,9 +7,9 @@ export type CanonicalAiMerge = {
7
7
  fieldIdByAiFieldId: Record<string, string>;
8
8
  };
9
9
  /**
10
- * Renames the AI's free-form source and join-key names to the merge editor's
11
- * fixed conventions, so everything downstream treats an AI merge exactly like
12
- * one built by hand. Chart configs referencing the AI's merged column ids must
10
+ * Renames the AI's free-form source and join-key names to the names the
11
+ * merge editor would give them, so everything downstream treats an AI merge
12
+ * exactly like one built by hand. Chart configs referencing the AI's merged column ids must
13
13
  * be remapped with `fieldIdByAiFieldId`.
14
14
  */
15
15
  export declare const canonicalizeAiMerge: (mergeQuery: MergeQuery) => CanonicalAiMerge | null;
@@ -1 +1 @@
1
- {"version":3,"file":"canonicalizeAiMerge.d.ts","sourceRoot":"","sources":["../../../../src/ee/AiAgent/canonicalizeAiMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,UAAU,EACf,KAAK,sBAAsB,EAC9B,MAAM,wBAAwB,CAAC;AAQhC,MAAM,MAAM,gBAAgB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;QACtC,OAAO,EAAE,sBAAsB,EAAE,CAAC;KACrC,CAAC;IACF,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAOF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,eAChB,UAAU,KACvB,gBAAgB,GAAG,IAqDrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SACxB,CAAC,cACI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACnC,CAgBF,CAAC"}
1
+ {"version":3,"file":"canonicalizeAiMerge.d.ts","sourceRoot":"","sources":["../../../../src/ee/AiAgent/canonicalizeAiMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,UAAU,EACf,KAAK,sBAAsB,EAC9B,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,gBAAgB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;QACtC,OAAO,EAAE,sBAAsB,EAAE,CAAC;KACrC,CAAC;IACF,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAOF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,eAChB,UAAU,KACvB,gBAAgB,GAAG,IA4DrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SACxB,CAAC,cACI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACnC,CAgBF,CAAC"}
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.remapFieldIdsDeep = exports.canonicalizeAiMerge = void 0;
4
4
  const mergeQuery_1 = require("../../types/mergeQuery");
5
5
  const item_1 = require("../../utils/item");
6
- const savedMerge_1 = require("../../utils/savedMerge");
7
6
  // Merged output columns are fields of the merge/source "tables", so getItemId
8
7
  // is the naming authority.
9
8
  const mergedColumnId = (table, name) => (0, item_1.getItemId)({ table, name });
10
9
  /**
11
- * Renames the AI's free-form source and join-key names to the merge editor's
12
- * fixed conventions, so everything downstream treats an AI merge exactly like
13
- * one built by hand. Chart configs referencing the AI's merged column ids must
10
+ * Renames the AI's free-form source and join-key names to the names the
11
+ * merge editor would give them, so everything downstream treats an AI merge
12
+ * exactly like one built by hand. Chart configs referencing the AI's merged column ids must
14
13
  * be remapped with `fieldIdByAiFieldId`.
15
14
  */
16
15
  const canonicalizeAiMerge = (mergeQuery) => {
@@ -22,9 +21,14 @@ const canonicalizeAiMerge = (mergeQuery) => {
22
21
  if (metricSources.length !== 2)
23
22
  return null;
24
23
  const [primary, additional] = metricSources;
24
+ // Sources run under their explore's name, as the editor names them
25
+ const primaryName = primary.metricQuery.exploreName;
26
+ const additionalName = additional.metricQuery.exploreName === primaryName
27
+ ? `${primaryName}_2`
28
+ : additional.metricQuery.exploreName;
25
29
  const idBySourceId = {
26
- [primary.id]: savedMerge_1.MERGE_PRIMARY_SOURCE_ID,
27
- [additional.id]: savedMerge_1.MERGE_ADDITIONAL_SOURCE_ID,
30
+ [primary.id]: primaryName,
31
+ [additional.id]: additionalName,
28
32
  };
29
33
  const fieldIdByAiFieldId = {};
30
34
  metricSources.forEach((source) => {
@@ -37,8 +41,9 @@ const canonicalizeAiMerge = (mergeQuery) => {
37
41
  mergedColumnId(canonicalId, column);
38
42
  });
39
43
  });
40
- const joinKey = mergeQuery.joinKey.map((part, index) => {
41
- const name = `${savedMerge_1.MERGE_JOIN_KEY}_${index}`;
44
+ // A key column is named after the primary's field, as the editor names it
45
+ const joinKey = mergeQuery.joinKey.map((part) => {
46
+ const name = part.fieldIdBySourceId[primary.id];
42
47
  fieldIdByAiFieldId[mergedColumnId(mergeQuery_1.MERGE_TABLE_NAME, part.name)] =
43
48
  mergedColumnId(mergeQuery_1.MERGE_TABLE_NAME, name);
44
49
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"canonicalizeAiMerge.js","sourceRoot":"","sources":["../../../../src/ee/AiAgent/canonicalizeAiMerge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"canonicalizeAiMerge.js","sourceRoot":"","sources":["../../../../src/ee/AiAgent/canonicalizeAiMerge.ts"],"names":[],"mappings":"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"}
@@ -25,22 +25,17 @@ export declare const getWebAiChartConfig: ({ vizConfig, metricQuery, maxQueryLim
25
25
  parameters: Record<string, string | number | string[] | number[]> | null;
26
26
  customMetrics: import("../..").TransformedCustomMetric[] | null;
27
27
  tableCalculations: ({
28
- name: string;
29
- displayName: string;
30
- type: "percent_of_previous_value";
31
- fieldId: string;
32
- orderBy: {
33
- fieldId: string;
34
- order: "asc" | "desc" | null;
35
- }[];
36
- partitionBy: string[] | null;
37
- } | {
38
28
  name: string;
39
29
  displayName: string;
40
30
  type: "formula";
41
31
  formula: string;
42
32
  format: "number" | "percent" | null;
43
33
  resultType: "boolean" | "date" | "number" | "string" | "timestamp" | null;
34
+ } | {
35
+ name: string;
36
+ displayName: string;
37
+ type: "rank_in_column";
38
+ fieldId: string;
44
39
  } | {
45
40
  name: string;
46
41
  displayName: string;
@@ -54,14 +49,19 @@ export declare const getWebAiChartConfig: ({ vizConfig, metricQuery, maxQueryLim
54
49
  } | {
55
50
  name: string;
56
51
  displayName: string;
57
- type: "percent_of_column_total";
52
+ type: "percent_of_previous_value";
58
53
  fieldId: string;
54
+ orderBy: {
55
+ fieldId: string;
56
+ order: "asc" | "desc" | null;
57
+ }[];
59
58
  partitionBy: string[] | null;
60
59
  } | {
61
60
  name: string;
62
61
  displayName: string;
63
- type: "rank_in_column";
62
+ type: "percent_of_column_total";
64
63
  fieldId: string;
64
+ partitionBy: string[] | null;
65
65
  } | {
66
66
  name: string;
67
67
  displayName: string;
@@ -22,31 +22,13 @@ export declare const parseVizConfig: (vizConfigUnknown: object | null, maxLimit?
22
22
  tableCalculations: ({
23
23
  name: string;
24
24
  displayName: string;
25
- type: "percent_of_column_total";
25
+ type: "percent_of_previous_value";
26
26
  fieldId: string;
27
- partitionBy: string[] | null;
28
- } | {
29
- name: string;
30
- displayName: string;
31
- type: "window_function";
32
- windowFunction: import("../..").WindowFunctionType;
33
- fieldId: string | null;
34
27
  orderBy: {
35
28
  fieldId: string;
36
29
  order: "asc" | "desc" | null;
37
- }[] | null;
30
+ }[];
38
31
  partitionBy: string[] | null;
39
- frame: {
40
- frameType: "range" | "rows";
41
- start: {
42
- type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
43
- offset: number | null;
44
- } | null;
45
- end: {
46
- type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
47
- offset: number | null;
48
- };
49
- } | null;
50
32
  } | {
51
33
  name: string;
52
34
  displayName: string;
@@ -67,12 +49,8 @@ export declare const parseVizConfig: (vizConfigUnknown: object | null, maxLimit?
67
49
  } | {
68
50
  name: string;
69
51
  displayName: string;
70
- type: "percent_of_previous_value";
52
+ type: "percent_of_column_total";
71
53
  fieldId: string;
72
- orderBy: {
73
- fieldId: string;
74
- order: "asc" | "desc" | null;
75
- }[];
76
54
  partitionBy: string[] | null;
77
55
  } | {
78
56
  name: string;
@@ -84,6 +62,28 @@ export declare const parseVizConfig: (vizConfigUnknown: object | null, maxLimit?
84
62
  displayName: string;
85
63
  type: "running_total";
86
64
  fieldId: string;
65
+ } | {
66
+ name: string;
67
+ displayName: string;
68
+ type: "window_function";
69
+ windowFunction: import("../..").WindowFunctionType;
70
+ fieldId: string | null;
71
+ orderBy: {
72
+ fieldId: string;
73
+ order: "asc" | "desc" | null;
74
+ }[] | null;
75
+ partitionBy: string[] | null;
76
+ frame: {
77
+ frameType: "range" | "rows";
78
+ start: {
79
+ type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
80
+ offset: number | null;
81
+ } | null;
82
+ end: {
83
+ type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
84
+ offset: number | null;
85
+ };
86
+ } | null;
87
87
  })[] | null;
88
88
  filters: import("../..").Filters;
89
89
  };
@@ -3216,8 +3216,141 @@
3216
3216
  "enum": ["multi-step", "merged", "direct"],
3217
3217
  "type": "string"
3218
3218
  },
3219
+ "SavedMergeDefinition": {
3220
+ "properties": {
3221
+ "chartAs": {
3222
+ "description": "The chart query's name in merged column ids, when not its explore's.",
3223
+ "type": "string"
3224
+ },
3225
+ "chartRepeats": {
3226
+ "description": "The chart's own query repeats its values. Omitted when off.",
3227
+ "type": "boolean"
3228
+ },
3229
+ "join": {
3230
+ "$ref": "#/$defs/MergeJoinType"
3231
+ },
3232
+ "keyNames": {
3233
+ "additionalProperties": {
3234
+ "type": "string"
3235
+ },
3236
+ "description": "The key column's name, when not the chart field's id.",
3237
+ "properties": {},
3238
+ "type": "object"
3239
+ },
3240
+ "keys": {
3241
+ "additionalProperties": {
3242
+ "items": {
3243
+ "type": "string"
3244
+ },
3245
+ "type": "array"
3246
+ },
3247
+ "description": "The join keys: each entry is the chart's field and one `query.fieldId`\nreference per other query. The key column takes the chart field's id.",
3248
+ "properties": {},
3249
+ "type": "object"
3250
+ },
3251
+ "limit": {
3252
+ "format": "double",
3253
+ "type": "number"
3254
+ },
3255
+ "queries": {
3256
+ "additionalProperties": {
3257
+ "$ref": "#/$defs/SavedMergeDefinitionQuery"
3258
+ },
3259
+ "description": "The other queries, by the name they go by.",
3260
+ "properties": {},
3261
+ "type": "object"
3262
+ },
3263
+ "sort": {
3264
+ "items": {
3265
+ "$ref": "#/$defs/SavedMergeDefinitionSort"
3266
+ },
3267
+ "type": "array"
3268
+ },
3269
+ "tableCalculations": {
3270
+ "items": {
3271
+ "$ref": "#/$defs/MergeTableCalculation"
3272
+ },
3273
+ "type": "array"
3274
+ }
3275
+ },
3276
+ "required": ["limit", "keys", "join", "queries"],
3277
+ "type": "object"
3278
+ },
3279
+ "SavedMergeDefinitionQuery": {
3280
+ "description": "A query the merge owns, run against an explore.",
3281
+ "properties": {
3282
+ "additionalMetrics": {
3283
+ "items": {
3284
+ "$ref": "#/$defs/AdditionalMetric"
3285
+ },
3286
+ "type": "array"
3287
+ },
3288
+ "customDimensions": {
3289
+ "items": {
3290
+ "$ref": "#/$defs/CustomDimension"
3291
+ },
3292
+ "type": "array"
3293
+ },
3294
+ "dimensionOverrides": {
3295
+ "$ref": "#/$defs/DimensionOverrides"
3296
+ },
3297
+ "dimensions": {
3298
+ "items": {
3299
+ "$ref": "#/$defs/FieldId"
3300
+ },
3301
+ "type": "array"
3302
+ },
3303
+ "explore": {
3304
+ "type": "string"
3305
+ },
3306
+ "filters": {
3307
+ "$ref": "#/$defs/Filters"
3308
+ },
3309
+ "metricOverrides": {
3310
+ "$ref": "#/$defs/MetricOverrides"
3311
+ },
3312
+ "metrics": {
3313
+ "items": {
3314
+ "$ref": "#/$defs/FieldId"
3315
+ },
3316
+ "type": "array"
3317
+ },
3318
+ "repeat": {
3319
+ "description": "See MergeQueryMetricSource.repeatValues. Omitted when off.",
3320
+ "type": "boolean"
3321
+ },
3322
+ "tableCalculations": {
3323
+ "items": {
3324
+ "$ref": "#/$defs/TableCalculation"
3325
+ },
3326
+ "type": "array"
3327
+ },
3328
+ "timezone": {
3329
+ "type": "string"
3330
+ }
3331
+ },
3332
+ "required": ["metrics", "dimensions", "explore"],
3333
+ "type": "object"
3334
+ },
3335
+ "SavedMergeDefinitionSort": {
3336
+ "description": "A sort of the merged result. `by` is a chart field id, a `query.fieldId`\nreference into another query, or the name of a merge table calculation.\nA chart field that is a join key sorts the key column.",
3337
+ "properties": {
3338
+ "by": {
3339
+ "type": "string"
3340
+ },
3341
+ "direction": {
3342
+ "$ref": "#/$defs/SavedMergeDefinitionSortDirection"
3343
+ }
3344
+ },
3345
+ "required": ["direction", "by"],
3346
+ "type": "object"
3347
+ },
3348
+ "SavedMergeDefinitionSortDirection": {
3349
+ "enum": ["asc", "desc"],
3350
+ "type": "string"
3351
+ },
3219
3352
  "SavedMergeQuery": {
3220
- "description": "Canonical, scalable representation of a merge stored on a chart version.",
3353
+ "description": "Schema v2 of a merge stored on a chart version. Accepted on requests and\nread from rows written before schema v3; rewritten to schema v3 by\nupgradeSavedMergeQuery. Never written.",
3221
3354
  "properties": {
3222
3355
  "joinKey": {
3223
3356
  "items": {
@@ -4187,12 +4320,14 @@
4187
4320
  "merge": {
4188
4321
  "anyOf": [
4189
4322
  {
4190
- "allOf": [
4323
+ "anyOf": [
4324
+ {
4325
+ "$ref": "#/$defs/SavedMergeDefinition"
4326
+ },
4191
4327
  {
4192
4328
  "$ref": "#/$defs/SavedMergeQuery"
4193
4329
  }
4194
- ],
4195
- "description": "Second query this chart's query is merged with, when it has one. Absent\non the overwhelming majority of charts."
4330
+ ]
4196
4331
  },
4197
4332
  {
4198
4333
  "type": "null"
@@ -1,6 +1,7 @@
1
1
  import type { PartialDeep } from 'type-fest';
2
2
  import type { ChartAsCodeLanguageMap } from '../../utils/i18n/chartAsCode';
3
3
  import type { ContentVerificationInfo } from '../contentVerification';
4
+ import type { SavedMergeDefinition, SavedMergeQuery } from '../mergeQuery';
4
5
  import type { MetricQuery } from '../metricQuery';
5
6
  import type { PromotionChanges } from '../promotion';
6
7
  import type { BigNumberConfig, CartesianChartConfig, ChartType, CustomVisConfig, DataAppVizChart, FunnelChartConfig, GaugeChartConfig, MapChartConfig, PieChartConfig, SankeyChartConfig, SavedChart, TableChartConfig, TreemapChartConfig } from '../savedCharts';
@@ -37,7 +38,8 @@ export type DataAppVizChartConfigAsCode = {
37
38
  * generated chart-as-code JSON schema. Keep in sync with ChartConfig.
38
39
  */
39
40
  export type ChartAsCodeConfig<CustomChartConfig = DataAppVizChartConfigAsCode> = BigNumberConfig | CartesianChartConfig | CustomVisConfig | PieChartConfig | FunnelChartConfig | TableChartConfig | TreemapChartConfig | GaugeChartConfig | MapChartConfig | SankeyChartConfig | CustomChartConfig;
40
- export type ChartAsCode = Omit<Pick<SavedChart, 'name' | 'description' | 'tableName' | 'metricQuery' | 'chartConfig' | 'pivotConfig' | 'merge' | 'slug' | 'parameters'>, 'metricQuery' | 'chartConfig'> & {
41
+ export type ChartAsCode = Omit<Pick<SavedChart, 'name' | 'description' | 'tableName' | 'metricQuery' | 'chartConfig' | 'pivotConfig' | 'slug' | 'parameters'>, 'metricQuery' | 'chartConfig'> & {
42
+ merge?: SavedMergeDefinition | SavedMergeQuery | null;
41
43
  metricQuery: Omit<MetricQuery, 'filters'> & {
42
44
  filters: FiltersInput;
43
45
  };
@@ -1 +1 @@
1
- {"version":3,"file":"charts.d.ts","sourceRoot":"","sources":["../../../../src/types/contentAsCode/charts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"charts.d.ts","sourceRoot":"","sources":["../../../../src/types/contentAsCode/charts.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { type DirectAccessPrincipalRef, type DirectAccessResourceType } from './directAccess';
2
2
  import { type KnexPaginatedData } from './knex-paginate';
3
+ import { type SavedMergeDefinition, type SavedMergeQuery } from './mergeQuery';
3
4
  import { type SavedChart } from './savedCharts';
4
5
  export declare enum ContentReviewContentType {
5
6
  CHART = "chart",
@@ -30,11 +31,16 @@ export type ContentReviewSimilarContentItem = {
30
31
  explanation?: string;
31
32
  };
32
33
  export type ChartSimilarityContext = Pick<SavedChart, 'metricQuery' | 'parameters' | 'merge'>;
34
+ export type ChartSimilarityRequest = {
35
+ metricQuery: SavedChart['metricQuery'];
36
+ parameters?: SavedChart['parameters'];
37
+ merge?: SavedMergeDefinition | SavedMergeQuery | null;
38
+ };
33
39
  export type FindSimilarContentBody = {
34
40
  contentType: ContentReviewContentType;
35
41
  name: string;
36
42
  excludeContentUuid: string | null;
37
- chart?: ChartSimilarityContext;
43
+ chart?: ChartSimilarityRequest;
38
44
  };
39
45
  export type ContentReviewMovedItem = {
40
46
  contentType: ContentReviewContentType;
@@ -1 +1 @@
1
- {"version":3,"file":"contentReviewRequests.d.ts","sourceRoot":"","sources":["../../../src/types/contentReviewRequests.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contentReviewRequests.d.ts","sourceRoot":"","sources":["../../../src/types/contentReviewRequests.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAIhD,oBAAY,wBAAwB;IAChC,KAAK,UAAU;IACf,SAAS,cAAc;IACvB,SAAS,cAAc;CAC1B;AAED,oBAAY,0BAA0B;IAClC,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,SAAS,cAAc;CAC1B;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAGF,MAAM,MAAM,+BAA+B,GAAG;IAC1C,WAAW,EAAE,wBAAwB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IAEd,WAAW,CAAC,EACN,WAAW,GACX,cAAc,GACd,qBAAqB,GACrB,SAAS,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAGF,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACrC,UAAU,EACV,aAAa,GAAG,YAAY,GAAG,OAAO,CACzC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,WAAW,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,oBAAoB,GAAG,eAAe,GAAG,IAAI,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,WAAW,EAAE,wBAAwB,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,WAAW,EAAE,wBAAwB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,6BAA6B,GAAG;IACxC,YAAY,EAAE,wBAAwB,CAAC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,wBAAwB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,iBAAiB,CAAC;IAC/B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,+BAA+B,EAAE,CAAC;IAClD,MAAM,EAAE,0BAA0B,CAAC;IACnC,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,sBAAsB,EAAE,CAAC;IACvC,iBAAiB,EAAE,6BAA6B,EAAE,CAAC;IACnD,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,sBAAsB,EAAE,OAAO,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAC7C,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAC7C,CAAC;AAEF,oBAAY,wBAAwB;IAChC,SAAS,cAAc;IACvB,IAAI,SAAS;CAChB;AAED,MAAM,MAAM,8BAA8B,GAAG;IACzC,WAAW,EAAE,wBAAwB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,cAAc,EAAE,+BAA+B,EAAE,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,oBAAoB,GAAG;IAC9D,OAAO,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAC5C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,4BAA4B,GAAG;IAEpE,OAAO,EAAE,sBAAsB,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,0BAA0B,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAChD,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAC9C,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,iBAAiB,CAAC,4BAA4B,EAAE,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC3C,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,qBAAqB,CAAC;CAClC,CAAC;AAEF,oBAAY,8BAA8B;IACtC,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,QAAQ,aAAa;CACxB;AAED,eAAO,MAAM,4BAA4B,gBAAiB,MAAM,KAAG,MACrB,CAAC;AAE/C,eAAO,MAAM,2BAA2B,gBACvB,MAAM,eACN,MAAM,KACpB,MAAuE,CAAC;AAE3E,MAAM,MAAM,sCAAsC,GAAG;IACjD,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,+BAA+B,EAAE,CAAC;CAC9C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"contentReviewRequests.js","sourceRoot":"","sources":["../../../src/types/contentReviewRequests.ts"],"names":[],"mappings":";;;AAOA,qEAAqE;AACrE,sBAAsB;AACtB,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAChC,2CAAe,CAAA;IACf,mDAAuB,CAAA;IACvB,mDAAuB,CAAA;AAC3B,CAAC,EAJW,wBAAwB,aAAxB,wBAAwB,GAAxB,wBAAwB,QAInC;AAED,IAAY,0BAKX;AALD,WAAY,0BAA0B;IAClC,iDAAmB,CAAA;IACnB,mDAAqB,CAAA;IACrB,mDAAqB,CAAA;IACrB,qDAAuB,CAAA;AAC3B,CAAC,EALW,0BAA0B,aAA1B,0BAA0B,GAA1B,0BAA0B,QAKrC;AAqFD,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,mDAAuB,CAAA;IACvB,yCAAa,CAAA;AACjB,CAAC,EAHW,wBAAwB,aAAxB,wBAAwB,GAAxB,wBAAwB,QAGnC;AA2DD,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACtC,yDAAuB,CAAA;IACvB,uDAAqB,CAAA;IACrB,uDAAqB,CAAA;AACzB,CAAC,EAJW,8BAA8B,aAA9B,8BAA8B,GAA9B,8BAA8B,QAIzC;AAEM,MAAM,4BAA4B,GAAG,CAAC,WAAmB,EAAU,EAAE,CACxE,aAAa,WAAW,kBAAkB,CAAC;AADlC,QAAA,4BAA4B,GAA5B,4BAA4B,CACM;AAExC,MAAM,2BAA2B,GAAG,CACvC,WAAmB,EACnB,WAAmB,EACb,EAAE,CAAC,GAAG,IAAA,QAAA,4BAA4B,EAAC,WAAW,CAAC,IAAI,WAAW,EAAE,CAAC;AAH9D,QAAA,2BAA2B,GAA3B,2BAA2B,CAGmC"}
1
+ {"version":3,"file":"contentReviewRequests.js","sourceRoot":"","sources":["../../../src/types/contentReviewRequests.ts"],"names":[],"mappings":";;;AAQA,qEAAqE;AACrE,sBAAsB;AACtB,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAChC,2CAAe,CAAA;IACf,mDAAuB,CAAA;IACvB,mDAAuB,CAAA;AAC3B,CAAC,EAJW,wBAAwB,aAAxB,wBAAwB,GAAxB,wBAAwB,QAInC;AAED,IAAY,0BAKX;AALD,WAAY,0BAA0B;IAClC,iDAAmB,CAAA;IACnB,mDAAqB,CAAA;IACrB,mDAAqB,CAAA;IACrB,qDAAuB,CAAA;AAC3B,CAAC,EALW,0BAA0B,aAA1B,0BAA0B,GAA1B,0BAA0B,QAKrC;AA2FD,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,mDAAuB,CAAA;IACvB,yCAAa,CAAA;AACjB,CAAC,EAHW,wBAAwB,aAAxB,wBAAwB,GAAxB,wBAAwB,QAGnC;AA2DD,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACtC,yDAAuB,CAAA;IACvB,uDAAqB,CAAA;IACrB,uDAAqB,CAAA;AACzB,CAAC,EAJW,8BAA8B,aAA9B,8BAA8B,GAA9B,8BAA8B,QAIzC;AAEM,MAAM,4BAA4B,GAAG,CAAC,WAAmB,EAAU,EAAE,CACxE,aAAa,WAAW,kBAAkB,CAAC;AADlC,QAAA,4BAA4B,GAA5B,4BAA4B,CACM;AAExC,MAAM,2BAA2B,GAAG,CACvC,WAAmB,EACnB,WAAmB,EACb,EAAE,CAAC,GAAG,IAAA,QAAA,4BAA4B,EAAC,WAAW,CAAC,IAAI,WAAW,EAAE,CAAC;AAH9D,QAAA,2BAA2B,GAA3B,2BAA2B,CAGmC"}
@@ -1,6 +1,7 @@
1
1
  import { SupportedDbtAdapter } from './dbt';
2
- import { DimensionType, type FieldId, type ItemsMap, type TimestampDomain } from './field';
3
- import { type MetricQuery, type SortField } from './metricQuery';
2
+ import { DimensionType, type CustomDimension, type FieldId, type ItemsMap, type TableCalculation, type TimestampDomain } from './field';
3
+ import { type Filters } from './filter';
4
+ import { type AdditionalMetric, type DimensionOverrides, type MetricOverrides, type MetricQuery, type SortField } from './metricQuery';
4
5
  import { type ParametersValuesMap } from './parameters';
5
6
  import { type PivotConfiguration } from './pivot';
6
7
  import { type TimeFrames } from './timeFrames';
@@ -444,8 +445,10 @@ export type MergeFieldOrigin = {
444
445
  };
445
446
  /** Provenance of every merged field, by field id. */
446
447
  export type MergeFieldOrigins = Record<FieldId, MergeFieldOrigin>;
447
- /** Current JSON schema stored in `saved_queries_version_merges.merge`. */
448
- export declare const SAVED_MERGE_QUERY_SCHEMA_VERSION = 2;
448
+ /** Current JSON schema stored in `saved_queries_version_merges.merge`: a merge. */
449
+ export declare const SAVED_MERGE_QUERY_SCHEMA_VERSION = 3;
450
+ /** The legacy shape with explicit source ids. Still read, never written. */
451
+ export declare const SAVED_MERGE_QUERY_SCHEMA_VERSION_V2 = 2;
449
452
  /**
450
453
  * A persisted merge source.
451
454
  *
@@ -462,7 +465,12 @@ export type SavedMergeQuerySource = {
462
465
  kind: 'query';
463
466
  metricQuery: MetricQuery;
464
467
  };
465
- /** Canonical, scalable representation of a merge stored on a chart version. */
468
+ /**
469
+ * Schema v2 of a merge stored on a chart version. Accepted on requests and
470
+ * read from rows written before schema v3; rewritten to schema v3 by
471
+ * upgradeSavedMergeQuery. Never written.
472
+ * @deprecated use SavedMergeDefinition
473
+ */
466
474
  export type SavedMergeQuery = {
467
475
  /** Source whose rows a LEFT merge preserves. */
468
476
  primarySourceId: string;
@@ -479,13 +487,109 @@ export type SavedMergeQuery = {
479
487
  repeatValuesSourceIds?: string[];
480
488
  };
481
489
  /**
482
- * Rebuilds a runnable merge from a chart's own query and its stored merge.
490
+ * Reads a v2 merge back, returning null for anything that does not hold
491
+ * together.
492
+ */
493
+ export declare const parseSavedMergeQuery: (value: unknown) => SavedMergeQuery | null;
494
+ /** A query the merge owns, run against an explore. */
495
+ export type SavedMergeDefinitionQuery = {
496
+ explore: string;
497
+ dimensions: FieldId[];
498
+ metrics: FieldId[];
499
+ filters?: Filters;
500
+ tableCalculations?: TableCalculation[];
501
+ additionalMetrics?: AdditionalMetric[];
502
+ customDimensions?: CustomDimension[];
503
+ metricOverrides?: MetricOverrides;
504
+ dimensionOverrides?: DimensionOverrides;
505
+ timezone?: string;
506
+ /** See MergeQueryMetricSource.repeatValues. Omitted when off. */
507
+ repeat?: boolean;
508
+ };
509
+ export type SavedMergeDefinitionSortDirection = 'asc' | 'desc';
510
+ /**
511
+ * A sort of the merged result. `by` is a chart field id, a `query.fieldId`
512
+ * reference into another query, or the name of a merge table calculation.
513
+ * A chart field that is a join key sorts the key column.
514
+ */
515
+ export type SavedMergeDefinitionSort = {
516
+ by: string;
517
+ direction: SavedMergeDefinitionSortDirection;
518
+ };
519
+ export type SavedMergeDefinition = {
520
+ /** The chart query's name in merged column ids, when not its explore's. */
521
+ chartAs?: string;
522
+ /** The chart's own query repeats its values. Omitted when off. */
523
+ chartRepeats?: boolean;
524
+ /** The other queries, by the name they go by. */
525
+ queries: {
526
+ [name: string]: SavedMergeDefinitionQuery;
527
+ };
528
+ join: MergeJoinType;
529
+ /**
530
+ * The join keys: each entry is the chart's field and one `query.fieldId`
531
+ * reference per other query. The key column takes the chart field's id.
532
+ */
533
+ keys: {
534
+ [chartFieldId: string]: string[];
535
+ };
536
+ /** The key column's name, when not the chart field's id. */
537
+ keyNames?: {
538
+ [chartFieldId: string]: string;
539
+ };
540
+ sort?: SavedMergeDefinitionSort[];
541
+ limit: number;
542
+ tableCalculations?: MergeTableCalculation[];
543
+ };
544
+ /** `query.fieldId` into another query, or a bare chart field id. */
545
+ export declare const parseMergeDefinitionReference: (reference: string) => {
546
+ query: string | null;
547
+ fieldId: FieldId;
548
+ };
549
+ /** The name the chart's query goes by in the merged result. */
550
+ export declare const getMergeDefinitionChartName: (merge: Pick<SavedMergeDefinition, 'chartAs'>, chartExploreName: string) => string;
551
+ /** The explore names of the queries beside the chart's, in order. */
552
+ export declare const getMergeDefinitionQueryExploreNames: (merge: Pick<SavedMergeDefinition, 'queries'>) => string[];
553
+ /**
554
+ * The merge a runnable merge saves as. The chart's source must be one of
555
+ * the sources and every other source must be a metric query, because a
556
+ * saved chart cannot re-run a referenced result.
557
+ */
558
+ export declare const buildSavedMergeDefinition: ({ mergeQuery, chartSourceId, }: {
559
+ mergeQuery: MergeQuery;
560
+ chartSourceId: string;
561
+ }) => SavedMergeDefinition;
562
+ /** Rebuilds a runnable merge from a chart's own query and its stored merge. */
563
+ export declare const buildMergeQueryFromMergeDefinition: (chartMetricQuery: MetricQuery, merge: SavedMergeDefinition) => MergeQuery;
564
+ /**
565
+ * Rebuilds a runnable merge from a chart's own query and a schema v2 merge,
566
+ * the shape requests and Document chart cells still carry.
483
567
  */
484
568
  export declare const buildMergeQueryFromSaved: (chartMetricQuery: MetricQuery, saved: SavedMergeQuery) => MergeQuery;
485
569
  /**
486
- * Reads a stored merge back, returning null for anything that does not hold
487
- * together. An unknown future version leaves the chart working without its
488
- * merge rather than breaking the chart entirely.
570
+ * A pure rewrite of the v2 shape, keeping the ids it had. The chart's sort
571
+ * state was the Explorer's and named primary fields, so it is mapped once
572
+ * here; the chart's limit was the merged result's. A v2 merge whose
573
+ * primary was not the chart has no merge form: the chart is always the
574
+ * first input.
575
+ */
576
+ export declare const upgradeSavedMergeQuery: (saved: SavedMergeQuery, chartMetricQuery: MetricQuery) => SavedMergeDefinition | null;
577
+ /**
578
+ * Reads a stored merge back, returning null for anything that does not
579
+ * hold together: named queries against explores, one join with a key that
580
+ * reaches every query, a known join type, a numeric limit.
581
+ */
582
+ export declare const parseSavedMergeDefinition: (value: unknown) => SavedMergeDefinition | null;
583
+ /**
584
+ * Reads whatever a chart version stored. A v2 merge is rewritten to a
585
+ * merge with the chart's own sort and limit; an unknown version leaves
586
+ * the chart working without its merge rather than breaking the chart.
489
587
  */
490
- export declare const parseSavedMergeQuery: (schemaVersion: number, value: unknown) => SavedMergeQuery | null;
588
+ export declare const parseStoredMergeDefinition: ({ schemaVersion, value, chartMetricQuery, }: {
589
+ schemaVersion: number;
590
+ value: unknown;
591
+ chartMetricQuery: MetricQuery;
592
+ }) => SavedMergeDefinition | null;
593
+ /** Normalizes either supported request shape to the saved schema v3 definition. */
594
+ export declare const normalizeSavedMergeDefinition: (value: SavedMergeDefinition | SavedMergeQuery, chartMetricQuery: MetricQuery) => SavedMergeDefinition | null;
491
595
  //# sourceMappingURL=mergeQuery.d.ts.map