@lightdash/common 2.455.1 → 2.455.3
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/utils/additionalMetrics.d.ts +3 -2
- package/dist/cjs/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/cjs/utils/additionalMetrics.js +22 -4
- package/dist/cjs/utils/additionalMetrics.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/utils/additionalMetrics.d.ts +3 -2
- package/dist/esm/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/esm/utils/additionalMetrics.js +22 -5
- package/dist/esm/utils/additionalMetrics.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/utils/additionalMetrics.d.ts +3 -2
- package/dist/types/utils/additionalMetrics.d.ts.map +1 -1
- package/dist/types/utils/additionalMetrics.js +22 -5
- package/dist/types/utils/additionalMetrics.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type CompiledTable, type Explore } from '../types/explore';
|
|
2
|
-
import { DimensionType, MetricType, type Metric } from '../types/field';
|
|
2
|
+
import { DimensionType, MetricType, type CustomDimension, type Metric } from '../types/field';
|
|
3
3
|
import { type AdditionalMetric } from '../types/metricQuery';
|
|
4
4
|
type ConvertAdditionalMetricArgs = {
|
|
5
5
|
additionalMetric: AdditionalMetric;
|
|
@@ -19,11 +19,12 @@ export declare const getCustomMetricType: (type: DimensionType) => MetricType[];
|
|
|
19
19
|
* original array identity when nothing was added.
|
|
20
20
|
*/
|
|
21
21
|
export declare const mergeDashboardCustomMetrics: (registry: AdditionalMetric[], fromChart: AdditionalMetric[]) => AdditionalMetric[];
|
|
22
|
+
export declare const getMissingAdditionalMetricReferences: (metric: AdditionalMetric, explore: Explore, customDimensions?: CustomDimension[]) => string[];
|
|
22
23
|
/**
|
|
23
24
|
* Registry metrics usable in the given compiled Explore: the owning table and
|
|
24
25
|
* every field the metric depends on must exist. Incompatible metrics must never
|
|
25
26
|
* execute as partial definitions.
|
|
26
27
|
*/
|
|
27
|
-
export declare const getCompatibleDashboardMetrics: (registry: AdditionalMetric[], explore: Explore | undefined) => AdditionalMetric[];
|
|
28
|
+
export declare const getCompatibleDashboardMetrics: (registry: AdditionalMetric[], explore: Explore | undefined, customDimensions?: CustomDimension[]) => AdditionalMetric[];
|
|
28
29
|
export {};
|
|
29
30
|
//# 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":"AASA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACH,aAAa,EAGb,UAAU,EACV,KAAK,eAAe,EACpB,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;AAuBF,eAAO,MAAM,oCAAoC,WACrC,gBAAgB,WACf,OAAO,qBACE,eAAe,EAAE,KACpC,MAAM,EAgBH,CAAC;AAoDP;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,aAC5B,gBAAgB,EAAE,WACnB,OAAO,GAAG,SAAS,qBACV,eAAe,EAAE,KACpC,gBAAgB,EAKlB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCompatibleDashboardMetrics = exports.mergeDashboardCustomMetrics = exports.getCustomMetricType = exports.convertAdditionalMetric = void 0;
|
|
3
|
+
exports.getCompatibleDashboardMetrics = exports.getMissingAdditionalMetricReferences = exports.mergeDashboardCustomMetrics = exports.getCustomMetricType = exports.convertAdditionalMetric = void 0;
|
|
4
|
+
const exploreCompiler_1 = require("../compiler/exploreCompiler");
|
|
4
5
|
const referenceLookup_1 = require("../compiler/referenceLookup");
|
|
5
6
|
const dbt_1 = require("../types/dbt");
|
|
6
7
|
const field_1 = require("../types/field");
|
|
@@ -103,7 +104,20 @@ const dimensionRefExistsInExplore = (ref, explore, owningTable) => {
|
|
|
103
104
|
: [owningTable, strippedRef];
|
|
104
105
|
return ((0, referenceLookup_1.getReferencedDimensionCaseInsensitive)(refTable, refName, explore.tables) !== undefined);
|
|
105
106
|
};
|
|
106
|
-
const
|
|
107
|
+
const getMissingAdditionalMetricReferences = (metric, explore, customDimensions = []) => (0, exploreCompiler_1.getAllReferences)(metric.sql).filter((ref) => {
|
|
108
|
+
if (ref === 'TABLE')
|
|
109
|
+
return false;
|
|
110
|
+
const { refTable, refName } = (0, exploreCompiler_1.getParsedReference)(ref, metric.table);
|
|
111
|
+
const table = (0, referenceLookup_1.getReferencedTable)(refTable, explore.tables);
|
|
112
|
+
return (!table ||
|
|
113
|
+
(!table.dimensions[refName] &&
|
|
114
|
+
!table.metrics[refName] &&
|
|
115
|
+
!customDimensions.some((dimension) => (0, field_1.isCustomSqlDimension)(dimension) &&
|
|
116
|
+
dimension.table === refTable &&
|
|
117
|
+
dimension.id === refName)));
|
|
118
|
+
});
|
|
119
|
+
exports.getMissingAdditionalMetricReferences = getMissingAdditionalMetricReferences;
|
|
120
|
+
const isMetricCompatibleWithExplore = (metric, explore, customDimensions) => {
|
|
107
121
|
const table = explore.tables[metric.table];
|
|
108
122
|
if (!table)
|
|
109
123
|
return false;
|
|
@@ -119,6 +133,10 @@ const isMetricCompatibleWithExplore = (metric, explore) => {
|
|
|
119
133
|
if (metric.baseMetricName && !table.metrics[metric.baseMetricName]) {
|
|
120
134
|
return false;
|
|
121
135
|
}
|
|
136
|
+
if ((0, exports.getMissingAdditionalMetricReferences)(metric, explore, customDimensions)
|
|
137
|
+
.length > 0) {
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
122
140
|
if (metric.filters?.some((filter) => !dimensionRefExistsInExplore(filter.target.fieldRef, explore, metric.table))) {
|
|
123
141
|
return false;
|
|
124
142
|
}
|
|
@@ -132,10 +150,10 @@ const isMetricCompatibleWithExplore = (metric, explore) => {
|
|
|
132
150
|
* every field the metric depends on must exist. Incompatible metrics must never
|
|
133
151
|
* execute as partial definitions.
|
|
134
152
|
*/
|
|
135
|
-
const getCompatibleDashboardMetrics = (registry, explore) => {
|
|
153
|
+
const getCompatibleDashboardMetrics = (registry, explore, customDimensions = []) => {
|
|
136
154
|
if (!explore)
|
|
137
155
|
return [];
|
|
138
|
-
return registry.filter((metric) => isMetricCompatibleWithExplore(metric, explore));
|
|
156
|
+
return registry.filter((metric) => isMetricCompatibleWithExplore(metric, explore, customDimensions));
|
|
139
157
|
};
|
|
140
158
|
exports.getCompatibleDashboardMetrics = getCompatibleDashboardMetrics;
|
|
141
159
|
//# sourceMappingURL=additionalMetrics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"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"}
|