@lightdash/common 2.115.0 → 2.117.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.
- package/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/ee/AiAgent/schemas/filterExpressions/expressionSchemas.d.ts +10 -10
- package/dist/cjs/ee/AiAgent/schemas/filterExpressions/resolvedArgs.d.ts +4 -4
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDashboardV2Args.d.ts +6 -6
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +32 -32
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +4 -2
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js +22 -0
- package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js.map +1 -1
- package/dist/cjs/featureFlags/previewFeatureFlags.d.ts.map +1 -1
- package/dist/cjs/featureFlags/previewFeatureFlags.js +0 -1
- package/dist/cjs/featureFlags/previewFeatureFlags.js.map +1 -1
- package/dist/cjs/schemas/json/mcp-tools-1.0.json +40 -8
- package/dist/cjs/types/featureFlags.d.ts +0 -4
- package/dist/cjs/types/featureFlags.d.ts.map +1 -1
- package/dist/cjs/types/featureFlags.js +0 -4
- package/dist/cjs/types/featureFlags.js.map +1 -1
- package/dist/cjs/types/querySources.d.ts +34 -0
- package/dist/cjs/types/querySources.d.ts.map +1 -1
- package/dist/cjs/types/querySources.js.map +1 -1
- package/dist/cjs/utils/additionalMetrics.d.ts +14 -1
- package/dist/cjs/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/cjs/utils/additionalMetrics.js +63 -1
- package/dist/cjs/utils/additionalMetrics.js.map +1 -1
- package/dist/cjs/utils/additionalMetrics.test.js +186 -0
- package/dist/cjs/utils/additionalMetrics.test.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/ee/AiAgent/schemas/filterExpressions/expressionSchemas.d.ts +10 -10
- package/dist/esm/ee/AiAgent/schemas/filterExpressions/resolvedArgs.d.ts +4 -4
- package/dist/esm/ee/AiAgent/schemas/tools/toolDashboardV2Args.d.ts +6 -6
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +32 -32
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +4 -2
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js +22 -0
- package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js.map +1 -1
- package/dist/esm/featureFlags/previewFeatureFlags.d.ts.map +1 -1
- package/dist/esm/featureFlags/previewFeatureFlags.js +0 -1
- package/dist/esm/featureFlags/previewFeatureFlags.js.map +1 -1
- package/dist/esm/schemas/json/mcp-tools-1.0.json +40 -8
- package/dist/esm/types/featureFlags.d.ts +0 -4
- package/dist/esm/types/featureFlags.d.ts.map +1 -1
- package/dist/esm/types/featureFlags.js +0 -4
- package/dist/esm/types/featureFlags.js.map +1 -1
- package/dist/esm/types/querySources.d.ts +34 -0
- package/dist/esm/types/querySources.d.ts.map +1 -1
- package/dist/esm/types/querySources.js.map +1 -1
- package/dist/esm/utils/additionalMetrics.d.ts +14 -1
- package/dist/esm/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/esm/utils/additionalMetrics.js +60 -0
- package/dist/esm/utils/additionalMetrics.js.map +1 -1
- package/dist/esm/utils/additionalMetrics.test.js +187 -1
- package/dist/esm/utils/additionalMetrics.test.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/ee/AiAgent/schemas/filterExpressions/expressionSchemas.d.ts +10 -10
- package/dist/types/ee/AiAgent/schemas/filterExpressions/resolvedArgs.d.ts +4 -4
- package/dist/types/ee/AiAgent/schemas/tools/toolDashboardV2Args.d.ts +6 -6
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +32 -32
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +4 -2
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js +22 -0
- package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.test.js.map +1 -1
- package/dist/types/featureFlags/previewFeatureFlags.d.ts.map +1 -1
- package/dist/types/featureFlags/previewFeatureFlags.js +0 -1
- package/dist/types/featureFlags/previewFeatureFlags.js.map +1 -1
- package/dist/types/schemas/json/mcp-tools-1.0.json +40 -8
- package/dist/types/types/featureFlags.d.ts +0 -4
- package/dist/types/types/featureFlags.d.ts.map +1 -1
- package/dist/types/types/featureFlags.js +0 -4
- package/dist/types/types/featureFlags.js.map +1 -1
- package/dist/types/types/querySources.d.ts +34 -0
- package/dist/types/types/querySources.d.ts.map +1 -1
- package/dist/types/types/querySources.js.map +1 -1
- package/dist/types/utils/additionalMetrics.d.ts +14 -1
- package/dist/types/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/types/utils/additionalMetrics.js +60 -0
- package/dist/types/utils/additionalMetrics.js.map +1 -1
- package/dist/types/utils/additionalMetrics.test.js +187 -1
- package/dist/types/utils/additionalMetrics.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,10 +16,6 @@ var FeatureFlags;
|
|
|
16
16
|
DATE_TRUNC, per-viewer (user-profile) timezone resolution, result
|
|
17
17
|
formatting, etc. Temporary — remove once stable. */
|
|
18
18
|
FeatureFlags["EnableTimezoneSupport"] = "enable-timezone-support";
|
|
19
|
-
/**
|
|
20
|
-
* Enable scheduler task that replaces custom metrics after project compile
|
|
21
|
-
*/
|
|
22
|
-
FeatureFlags["ReplaceCustomMetricsOnCompile"] = "replace-custom-metrics-on-compile";
|
|
23
19
|
/**
|
|
24
20
|
* Enable the dynamic calculation of series color, when not manually set on the chart config.
|
|
25
21
|
* This aims to make the colors more consistent, depending on the groups, but this could cause the opposite effect.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/types/featureFlags.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/types/featureFlags.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,IAAY,YAmVX;AAnVD,WAAY,YAAY;IACpB,sBAAsB;IACtB,yDAAyC,CAAA;IAEzC;;0DAEsD;IACtD,iEAAiD,CAAA;IAEjD;;;;OAIG;IACH,+DAA+C,CAAA;IAE/C;;OAEG;IACH,iFAAiE,CAAA;IAEjE;;OAEG;IACH,yDAAyC,CAAA;IAEzC;;OAEG;IACH,6CAA6B,CAAA;IAE7B;;OAEG;IACH,gDAAgC,CAAA;IAEhC;;;;;;OAMG;IACH,iFAAiE,CAAA;IAEjE;;;OAGG;IACH,wDAAwC,CAAA;IAExC;;OAEG;IACH,qDAAqC,CAAA;IAErC;;OAEG;IACH,2DAA2C,CAAA;IAE3C;;;;;OAKG;IACH,kEAAkD,CAAA;IAElD;;;;OAIG;IACH,mEAAmD,CAAA;IAEnD;;;;OAIG;IACH,mDAAmC,CAAA;IAEnC;;;OAGG;IACH,+DAA+C,CAAA;IAE/C;;;;OAIG;IACH,uFAAuE,CAAA;IAEvE;;OAEG;IACH,4CAA4B,CAAA;IAE5B;;;OAGG;IACH,mDAAmC,CAAA;IAEnC;;;;OAIG;IACH,wCAAwB,CAAA;IAExB;;;;;OAKG;IACH,qEAAqD,CAAA;IAErD;;;;;OAKG;IACH,6DAA6C,CAAA;IAE7C;;;;;;;OAOG;IACH,+DAA+C,CAAA;IAE/C;;;OAGG;IACH,uEAAuD,CAAA;IAEvD;;;;OAIG;IACH,mEAAmD,CAAA;IAEnD;;;;OAIG;IACH,kEAAkD,CAAA;IAElD;;;;;;;OAOG;IACH,gEAAgD,CAAA;IAEhD;;;;;OAKG;IACH,6EAA6D,CAAA;IAE7D;;;;OAIG;IACH,wCAAwB,CAAA;IAExB;;OAEG;IACH,4DAA4C,CAAA;IAE5C;;;;;;;;OAQG;IACH,qDAAqC,CAAA;IAErC;;;;;;;;;;OAUG;IACH,+CAA+B,CAAA;IAE/B;;;OAGG;IACH,iEAAiD,CAAA;IAEjD;;;;;;;;OAQG;IACH,oDAAoC,CAAA;IAEpC;;;;;;;;;OASG;IACH,gDAAgC,CAAA;IAEhC;;;;;;;OAOG;IACH,oDAAoC,CAAA;IAEpC;;;;OAIG;IACH,6DAA6C,CAAA;IAE7C;;yEAEqE;IACrE,8CAA8B,CAAA;IAE9B;;;;;;;OAOG;IACH,uDAAuC,CAAA;IAEvC;;;;;;OAMG;IACH,uDAAuC,CAAA;IAEvC;;;;OAIG;IACH,8CAA8B,CAAA;IAE9B;;;;;OAKG;IACH,mDAAmC,CAAA;IAEnC;;;OAGG;IACH,yDAAyC,CAAA;IAEzC;;;;;;OAMG;IACH,oDAAoC,CAAA;IAEpC;;;OAGG;IACH,sEAAsD,CAAA;IAEtD;;;OAGG;IACH,yDAAyC,CAAA;IAEzC;;;;OAIG;IACH,mEAAmD,CAAA;IAEnD;;;;OAIG;IACH,0DAA0C,CAAA;AAC9C,CAAC,EAnVW,YAAY,aAAZ,YAAY,GAAZ,YAAY,QAmVvB;AAOD,wBAA+B,KAAa;IACxC,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAqB,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { type QueryExecutionContext } from './analytics';
|
|
|
2
2
|
import { type UUID } from './api/uuid';
|
|
3
3
|
import { type CustomDimension, type DimensionType, type FieldId, type TableCalculation } from './field';
|
|
4
4
|
import { type AdditionalMetric, type MetricQueryRequest, type SortField } from './metricQuery';
|
|
5
|
+
import { type ParametersValuesMap } from './parameters';
|
|
6
|
+
import { type PivotConfiguration } from './pivot';
|
|
5
7
|
import { type QueryHistoryStatus } from './queryHistory';
|
|
6
8
|
/**
|
|
7
9
|
* Discriminator for every query source a project can execute queries against.
|
|
@@ -86,6 +88,12 @@ export type SemanticLayerSourceQuery = {
|
|
|
86
88
|
customDimensions?: CustomDimension[];
|
|
87
89
|
/** IANA timezone for time dimension bucketing, e.g. "America/New_York". */
|
|
88
90
|
timezone?: string;
|
|
91
|
+
/**
|
|
92
|
+
* Pivots this node's result the way a pivoted chart does. Honoured by
|
|
93
|
+
* semanticLayer and sql nodes; duckdb and external nodes refuse it until
|
|
94
|
+
* the join node owns the pivot stage.
|
|
95
|
+
*/
|
|
96
|
+
pivotConfiguration?: PivotConfiguration;
|
|
89
97
|
};
|
|
90
98
|
/** A raw warehouse SQL query as a source query. */
|
|
91
99
|
export type SqlSourceQuery = {
|
|
@@ -94,6 +102,12 @@ export type SqlSourceQuery = {
|
|
|
94
102
|
nodeId?: QueryNodeId;
|
|
95
103
|
sql: string;
|
|
96
104
|
limit?: number;
|
|
105
|
+
/**
|
|
106
|
+
* Pivots this node's result the way a pivoted chart does. Honoured by
|
|
107
|
+
* semanticLayer and sql nodes; duckdb and external nodes refuse it until
|
|
108
|
+
* the join node owns the pivot stage.
|
|
109
|
+
*/
|
|
110
|
+
pivotConfiguration?: PivotConfiguration;
|
|
97
111
|
};
|
|
98
112
|
/**
|
|
99
113
|
* A DuckDB compose query as a source query. References expose other queries'
|
|
@@ -120,6 +134,12 @@ export type DuckdbSourceQuery = {
|
|
|
120
134
|
* "<queryUuid>"}.
|
|
121
135
|
*/
|
|
122
136
|
references?: QueryNodeId[] | Record<QuerySourceTableName, QueryResultReference>;
|
|
137
|
+
/**
|
|
138
|
+
* Pivots this node's result the way a pivoted chart does. Honoured by
|
|
139
|
+
* semanticLayer and sql nodes; duckdb and external nodes refuse it until
|
|
140
|
+
* the join node owns the pivot stage.
|
|
141
|
+
*/
|
|
142
|
+
pivotConfiguration?: PivotConfiguration;
|
|
123
143
|
};
|
|
124
144
|
/**
|
|
125
145
|
* External table SQL name or UUID.
|
|
@@ -134,6 +154,12 @@ export type ExternalSourceQuery = {
|
|
|
134
154
|
sql: string;
|
|
135
155
|
limit?: number;
|
|
136
156
|
tables: ExternalSourceTableReference[] | Record<QuerySourceTableName, ExternalSourceTableReference>;
|
|
157
|
+
/**
|
|
158
|
+
* Pivots this node's result the way a pivoted chart does. Honoured by
|
|
159
|
+
* semanticLayer and sql nodes; duckdb and external nodes refuse it until
|
|
160
|
+
* the join node owns the pivot stage.
|
|
161
|
+
*/
|
|
162
|
+
pivotConfiguration?: PivotConfiguration;
|
|
137
163
|
};
|
|
138
164
|
/**
|
|
139
165
|
* The tagged union every submit endpoint takes: one shape per source,
|
|
@@ -178,6 +204,14 @@ export type ExecuteSourceQueriesRequestParams = {
|
|
|
178
204
|
*/
|
|
179
205
|
queries: SourceQuery[];
|
|
180
206
|
context?: QueryExecutionContext;
|
|
207
|
+
/**
|
|
208
|
+
* Parameter values shared by every query in the submission, layered over
|
|
209
|
+
* project and explore defaults. A query referencing a parameter with no
|
|
210
|
+
* value refuses rather than running with a placeholder.
|
|
211
|
+
*/
|
|
212
|
+
parameters?: ParametersValuesMap;
|
|
213
|
+
/** Bypass cached results for every query in the submission. */
|
|
214
|
+
invalidateCache?: boolean;
|
|
181
215
|
};
|
|
182
216
|
/** One submitted query: its (possibly generated) node id and the queryUuid to poll. */
|
|
183
217
|
export type SourceQuerySubmission = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querySources.d.ts","sourceRoot":"","sources":["../../../src/types/querySources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,gBAAgB,EACxB,MAAM,SAAS,CAAC;AACjB,OAAO,EACH,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD;;;;;;;;;GASG;AACH,oBAAY,eAAe;IACvB,oEAAoE;IACpE,cAAc,kBAAkB;IAChC,iEAAiE;IACjE,GAAG,QAAQ;IACX;;;;OAIG;IACH,MAAM,WAAW;IACjB,oEAAoE;IACpE,QAAQ,aAAa;CACxB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAE1C;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAE1C;;;;;;;;GAQG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACnC,UAAU,EAAE,eAAe,CAAC,cAAc,CAAC;IAC3C,0FAA0F;IAC1F,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,UAAU,EAAE,OAAO,EAAE,CAAC;IACtB,8DAA8D;IAC9D,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACxC,qGAAqG;IACrG,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oEAAoE;IACpE,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,iDAAiD;IACjD,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"querySources.d.ts","sourceRoot":"","sources":["../../../src/types/querySources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querySources.js","sourceRoot":"","sources":["../../../src/types/querySources.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"querySources.js","sourceRoot":"","sources":["../../../src/types/querySources.ts"],"names":[],"mappings":";;;AAiBA;;;;;;;;;GASG;AACH,IAAY,eAaX;AAbD,WAAY,eAAe;IACvB,oEAAoE;IACpE,mDAAgC,CAAA;IAChC,iEAAiE;IACjE,8BAAW,CAAA;IACX;;;;OAIG;IACH,oCAAiB,CAAA;IACjB,oEAAoE;IACpE,wCAAqB,CAAA;AACzB,CAAC,EAbW,eAAe,aAAf,eAAe,GAAf,eAAe,QAa1B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type CompiledTable } from '../types/explore';
|
|
1
|
+
import { type CompiledTable, type Explore } from '../types/explore';
|
|
2
2
|
import { DimensionType, MetricType, type Metric } from '../types/field';
|
|
3
3
|
import { type AdditionalMetric } from '../types/metricQuery';
|
|
4
4
|
type ConvertAdditionalMetricArgs = {
|
|
@@ -12,5 +12,18 @@ export declare const convertAdditionalMetric: ({ additionalMetric, table, }: Con
|
|
|
12
12
|
* @returns
|
|
13
13
|
*/
|
|
14
14
|
export declare const getCustomMetricType: (type: DimensionType) => MetricType[];
|
|
15
|
+
/**
|
|
16
|
+
* Merges a chart's custom metrics into a dashboard registry, keyed by
|
|
17
|
+
* `getItemId()`. Existing registry definitions win (frozen once saved) and
|
|
18
|
+
* system-generated metrics (e.g. period-over-period) are skipped. Returns the
|
|
19
|
+
* original array identity when nothing was added.
|
|
20
|
+
*/
|
|
21
|
+
export declare const mergeDashboardCustomMetrics: (registry: AdditionalMetric[], fromChart: AdditionalMetric[]) => AdditionalMetric[];
|
|
22
|
+
/**
|
|
23
|
+
* Registry metrics usable in the given compiled Explore: the owning table and
|
|
24
|
+
* every field the metric depends on must exist. Incompatible metrics must never
|
|
25
|
+
* execute as partial definitions.
|
|
26
|
+
*/
|
|
27
|
+
export declare const getCompatibleDashboardMetrics: (registry: AdditionalMetric[], explore: Explore | undefined) => AdditionalMetric[];
|
|
15
28
|
export {};
|
|
16
29
|
//# sourceMappingURL=additionalMetrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"additionalMetrics.d.ts","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"additionalMetrics.d.ts","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACH,aAAa,EAEb,UAAU,EACV,KAAK,MAAM,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEH,KAAK,gBAAgB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,KAAK,2BAA2B,GAAG;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,aAAa,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,uBAAuB,iCAGjC,2BAA2B,KAAG,MAqChC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,SAAU,aAAa,KAAG,UAAU,EA2BnE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,aAC1B,gBAAgB,EAAE,aACjB,gBAAgB,EAAE,KAC9B,gBAAgB,EAWlB,CAAC;AA6DF;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,aAC5B,gBAAgB,EAAE,WACnB,OAAO,GAAG,SAAS,KAC7B,gBAAgB,EAKlB,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCustomMetricType = exports.convertAdditionalMetric = void 0;
|
|
3
|
+
exports.getCompatibleDashboardMetrics = exports.mergeDashboardCustomMetrics = exports.getCustomMetricType = exports.convertAdditionalMetric = void 0;
|
|
4
|
+
const referenceLookup_1 = require("../compiler/referenceLookup");
|
|
4
5
|
const dbt_1 = require("../types/dbt");
|
|
5
6
|
const field_1 = require("../types/field");
|
|
6
7
|
const metricQuery_1 = require("../types/metricQuery");
|
|
8
|
+
const item_1 = require("./item");
|
|
7
9
|
const convertAdditionalMetric = ({ additionalMetric, table, }) => {
|
|
8
10
|
const metric = (0, dbt_1.convertColumnMetric)({
|
|
9
11
|
modelName: table.name,
|
|
@@ -71,4 +73,64 @@ const getCustomMetricType = (type) => {
|
|
|
71
73
|
}
|
|
72
74
|
};
|
|
73
75
|
exports.getCustomMetricType = getCustomMetricType;
|
|
76
|
+
/**
|
|
77
|
+
* Merges a chart's custom metrics into a dashboard registry, keyed by
|
|
78
|
+
* `getItemId()`. Existing registry definitions win (frozen once saved) and
|
|
79
|
+
* system-generated metrics (e.g. period-over-period) are skipped. Returns the
|
|
80
|
+
* original array identity when nothing was added.
|
|
81
|
+
*/
|
|
82
|
+
const mergeDashboardCustomMetrics = (registry, fromChart) => {
|
|
83
|
+
const seenIds = new Set(registry.map(item_1.getItemId));
|
|
84
|
+
const additions = fromChart.filter((metric) => {
|
|
85
|
+
if (metric.generationType !== undefined)
|
|
86
|
+
return false;
|
|
87
|
+
const id = (0, item_1.getItemId)(metric);
|
|
88
|
+
if (seenIds.has(id))
|
|
89
|
+
return false;
|
|
90
|
+
seenIds.add(id);
|
|
91
|
+
return true;
|
|
92
|
+
});
|
|
93
|
+
return additions.length === 0 ? registry : [...registry, ...additions];
|
|
94
|
+
};
|
|
95
|
+
exports.mergeDashboardCustomMetrics = mergeDashboardCustomMetrics;
|
|
96
|
+
// Accepts `table.field`, bare `field` (owning table), or a `${...}`-wrapped
|
|
97
|
+
// ref. Resolution is case-insensitive to match the compiler: compiled
|
|
98
|
+
// timeframe dimension keys are uppercased (e.g. order_date_DAY, #5998).
|
|
99
|
+
const dimensionRefExistsInExplore = (ref, explore, owningTable) => {
|
|
100
|
+
const strippedRef = ref.replace(/^\$\{(.+)\}$/, '$1');
|
|
101
|
+
const [refTable, refName] = strippedRef.includes('.')
|
|
102
|
+
? strippedRef.split('.')
|
|
103
|
+
: [owningTable, strippedRef];
|
|
104
|
+
return ((0, referenceLookup_1.getReferencedDimensionCaseInsensitive)(refTable, refName, explore.tables) !== undefined);
|
|
105
|
+
};
|
|
106
|
+
const isMetricCompatibleWithExplore = (metric, explore) => {
|
|
107
|
+
const table = explore.tables[metric.table];
|
|
108
|
+
if (!table)
|
|
109
|
+
return false;
|
|
110
|
+
if (metric.baseDimensionName &&
|
|
111
|
+
!table.dimensions[metric.baseDimensionName]) {
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
if (metric.baseMetricName && !table.metrics[metric.baseMetricName]) {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
if (metric.filters?.some((filter) => !dimensionRefExistsInExplore(filter.target.fieldRef, explore, metric.table))) {
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
if (metric.distinctKeys?.some((keyRef) => !dimensionRefExistsInExplore(keyRef, explore, metric.table))) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
return true;
|
|
124
|
+
};
|
|
125
|
+
/**
|
|
126
|
+
* Registry metrics usable in the given compiled Explore: the owning table and
|
|
127
|
+
* every field the metric depends on must exist. Incompatible metrics must never
|
|
128
|
+
* execute as partial definitions.
|
|
129
|
+
*/
|
|
130
|
+
const getCompatibleDashboardMetrics = (registry, explore) => {
|
|
131
|
+
if (!explore)
|
|
132
|
+
return [];
|
|
133
|
+
return registry.filter((metric) => isMetricCompatibleWithExplore(metric, explore));
|
|
134
|
+
};
|
|
135
|
+
exports.getCompatibleDashboardMetrics = getCompatibleDashboardMetrics;
|
|
74
136
|
//# sourceMappingURL=additionalMetrics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AAEnD,0CAKwB;AACxB,sDAG8B;
|
|
1
|
+
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,4 +139,190 @@ describe('convertAdditionalMetric — baseDimensionType plumbing', () => {
|
|
|
139
139
|
expect(result.baseDimensionTimeInterval).toBeUndefined();
|
|
140
140
|
});
|
|
141
141
|
});
|
|
142
|
+
describe('mergeDashboardCustomMetrics', () => {
|
|
143
|
+
const metric = (table, name, overrides = {}) => ({
|
|
144
|
+
table,
|
|
145
|
+
name,
|
|
146
|
+
label: name,
|
|
147
|
+
sql: '${TABLE}.amount',
|
|
148
|
+
type: field_1.MetricType.SUM,
|
|
149
|
+
...overrides,
|
|
150
|
+
});
|
|
151
|
+
it('adds new chart metrics to the registry', () => {
|
|
152
|
+
const registry = [metric('orders', 'total_revenue')];
|
|
153
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)(registry, [
|
|
154
|
+
metric('orders', 'avg_basket'),
|
|
155
|
+
]);
|
|
156
|
+
expect(result.map((m) => m.name)).toEqual([
|
|
157
|
+
'total_revenue',
|
|
158
|
+
'avg_basket',
|
|
159
|
+
]);
|
|
160
|
+
});
|
|
161
|
+
it('is idempotent for an identical definition', () => {
|
|
162
|
+
const registry = [metric('orders', 'total_revenue')];
|
|
163
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)(registry, [
|
|
164
|
+
metric('orders', 'total_revenue'),
|
|
165
|
+
]);
|
|
166
|
+
expect(result).toBe(registry);
|
|
167
|
+
});
|
|
168
|
+
it('keeps the existing registry definition when the same (table, name) reappears', () => {
|
|
169
|
+
const registry = [metric('orders', 'total_revenue')];
|
|
170
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)(registry, [
|
|
171
|
+
metric('orders', 'total_revenue', { sql: '${TABLE}.other_column' }),
|
|
172
|
+
]);
|
|
173
|
+
expect(result).toBe(registry);
|
|
174
|
+
expect(result[0].sql).toEqual('${TABLE}.amount');
|
|
175
|
+
});
|
|
176
|
+
it('lets the same name coexist on different tables', () => {
|
|
177
|
+
const registry = [metric('orders', 'total')];
|
|
178
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)(registry, [
|
|
179
|
+
metric('payments', 'total'),
|
|
180
|
+
]);
|
|
181
|
+
expect(result).toHaveLength(2);
|
|
182
|
+
expect(result.map((m) => m.table)).toEqual(['orders', 'payments']);
|
|
183
|
+
});
|
|
184
|
+
it('never admits system-generated metrics', () => {
|
|
185
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)([], [
|
|
186
|
+
metric('orders', 'total_revenue_previous_week', {
|
|
187
|
+
generationType: 'periodOverPeriod',
|
|
188
|
+
}),
|
|
189
|
+
]);
|
|
190
|
+
expect(result).toEqual([]);
|
|
191
|
+
});
|
|
192
|
+
it('returns the original array identity when nothing was added', () => {
|
|
193
|
+
const registry = [metric('orders', 'total_revenue')];
|
|
194
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)(registry, []);
|
|
195
|
+
expect(result).toBe(registry);
|
|
196
|
+
});
|
|
197
|
+
it('deduplicates within the incoming chart metrics', () => {
|
|
198
|
+
const result = (0, additionalMetrics_1.mergeDashboardCustomMetrics)([], [
|
|
199
|
+
metric('orders', 'total_revenue'),
|
|
200
|
+
metric('orders', 'total_revenue', {
|
|
201
|
+
sql: '${TABLE}.other_column',
|
|
202
|
+
}),
|
|
203
|
+
]);
|
|
204
|
+
expect(result).toHaveLength(1);
|
|
205
|
+
expect(result[0].sql).toEqual('${TABLE}.amount');
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
describe('getCompatibleDashboardMetrics', () => {
|
|
209
|
+
const explore = {
|
|
210
|
+
tables: {
|
|
211
|
+
orders: {
|
|
212
|
+
dimensions: {
|
|
213
|
+
amount: {},
|
|
214
|
+
status: {},
|
|
215
|
+
order_id: {},
|
|
216
|
+
},
|
|
217
|
+
metrics: {
|
|
218
|
+
total_amount: {},
|
|
219
|
+
},
|
|
220
|
+
},
|
|
221
|
+
customers: {
|
|
222
|
+
dimensions: {
|
|
223
|
+
customer_id: {},
|
|
224
|
+
},
|
|
225
|
+
metrics: {},
|
|
226
|
+
},
|
|
227
|
+
},
|
|
228
|
+
};
|
|
229
|
+
const metric = (overrides = {}) => ({
|
|
230
|
+
table: 'orders',
|
|
231
|
+
name: 'custom_metric',
|
|
232
|
+
label: 'Custom metric',
|
|
233
|
+
sql: '${TABLE}.amount',
|
|
234
|
+
type: field_1.MetricType.SUM,
|
|
235
|
+
...overrides,
|
|
236
|
+
});
|
|
237
|
+
it('returns nothing without an explore', () => {
|
|
238
|
+
expect((0, additionalMetrics_1.getCompatibleDashboardMetrics)([metric()], undefined)).toEqual([]);
|
|
239
|
+
});
|
|
240
|
+
it('omits metrics whose owning table is missing', () => {
|
|
241
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([metric(), metric({ table: 'payments', name: 'other' })], explore);
|
|
242
|
+
expect(result.map((m) => m.name)).toEqual(['custom_metric']);
|
|
243
|
+
});
|
|
244
|
+
it('requires the base dimension to exist on the owning table', () => {
|
|
245
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([
|
|
246
|
+
metric({ baseDimensionName: 'amount' }),
|
|
247
|
+
metric({ name: 'bad', baseDimensionName: 'deleted_column' }),
|
|
248
|
+
], explore);
|
|
249
|
+
expect(result.map((m) => m.name)).toEqual(['custom_metric']);
|
|
250
|
+
});
|
|
251
|
+
it('requires the base metric to exist on the owning table', () => {
|
|
252
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([
|
|
253
|
+
metric({ baseMetricName: 'total_amount' }),
|
|
254
|
+
metric({ name: 'bad', baseMetricName: 'deleted_metric' }),
|
|
255
|
+
], explore);
|
|
256
|
+
expect(result.map((m) => m.name)).toEqual(['custom_metric']);
|
|
257
|
+
});
|
|
258
|
+
it('requires every filter target field to exist', () => {
|
|
259
|
+
const filterOn = (fieldRef) => [
|
|
260
|
+
{
|
|
261
|
+
id: 'f1',
|
|
262
|
+
target: { fieldRef },
|
|
263
|
+
operator: 'equals',
|
|
264
|
+
values: ['x'],
|
|
265
|
+
},
|
|
266
|
+
];
|
|
267
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([
|
|
268
|
+
metric({ filters: filterOn('orders.status') }),
|
|
269
|
+
// Bare ref resolves against the owning table
|
|
270
|
+
metric({ name: 'bare', filters: filterOn('status') }),
|
|
271
|
+
metric({
|
|
272
|
+
name: 'joined',
|
|
273
|
+
filters: filterOn('customers.customer_id'),
|
|
274
|
+
}),
|
|
275
|
+
metric({
|
|
276
|
+
name: 'bad',
|
|
277
|
+
filters: filterOn('orders.deleted_column'),
|
|
278
|
+
}),
|
|
279
|
+
metric({
|
|
280
|
+
name: 'bad_table',
|
|
281
|
+
filters: filterOn('payments.status'),
|
|
282
|
+
}),
|
|
283
|
+
], explore);
|
|
284
|
+
expect(result.map((m) => m.name)).toEqual([
|
|
285
|
+
'custom_metric',
|
|
286
|
+
'bare',
|
|
287
|
+
'joined',
|
|
288
|
+
]);
|
|
289
|
+
});
|
|
290
|
+
it('resolves references case-insensitively like the compiler (uppercased timeframe keys)', () => {
|
|
291
|
+
const exploreWithTimeframes = {
|
|
292
|
+
tables: {
|
|
293
|
+
orders: {
|
|
294
|
+
dimensions: { order_date_DAY: {} },
|
|
295
|
+
metrics: {},
|
|
296
|
+
},
|
|
297
|
+
},
|
|
298
|
+
};
|
|
299
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([
|
|
300
|
+
metric({
|
|
301
|
+
filters: [
|
|
302
|
+
{
|
|
303
|
+
id: 'f1',
|
|
304
|
+
target: { fieldRef: 'orders.order_date_day' },
|
|
305
|
+
operator: 'equals',
|
|
306
|
+
values: ['2026-01-01'],
|
|
307
|
+
},
|
|
308
|
+
],
|
|
309
|
+
}),
|
|
310
|
+
], exploreWithTimeframes);
|
|
311
|
+
expect(result.map((m) => m.name)).toEqual(['custom_metric']);
|
|
312
|
+
});
|
|
313
|
+
it('requires every distinctKeys field to exist', () => {
|
|
314
|
+
const result = (0, additionalMetrics_1.getCompatibleDashboardMetrics)([
|
|
315
|
+
metric({ distinctKeys: ['orders.order_id'] }),
|
|
316
|
+
metric({
|
|
317
|
+
name: 'wrapped',
|
|
318
|
+
distinctKeys: ['${orders.order_id}'],
|
|
319
|
+
}),
|
|
320
|
+
metric({
|
|
321
|
+
name: 'bad',
|
|
322
|
+
distinctKeys: ['orders.deleted_column'],
|
|
323
|
+
}),
|
|
324
|
+
], explore);
|
|
325
|
+
expect(result.map((m) => m.name)).toEqual(['custom_metric', 'wrapped']);
|
|
326
|
+
});
|
|
327
|
+
});
|
|
142
328
|
//# sourceMappingURL=additionalMetrics.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"additionalMetrics.test.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.test.ts"],"names":[],"mappings":";;AACA,0CAA6E;
|
|
1
|
+
{"version":3,"file":"additionalMetrics.test.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.test.ts"],"names":[],"mappings":"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"}
|