@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
|
-
import {
|
|
1
|
+
import { getAllReferences, getParsedReference, } from '../compiler/exploreCompiler';
|
|
2
|
+
import { getReferencedDimensionCaseInsensitive, getReferencedTable, } from '../compiler/referenceLookup';
|
|
2
3
|
import { convertColumnMetric } from '../types/dbt';
|
|
3
|
-
import { DimensionType, getMinMaxBaseDimensionMetadata, MetricType, } from '../types/field';
|
|
4
|
+
import { DimensionType, getMinMaxBaseDimensionMetadata, isCustomSqlDimension, MetricType, } from '../types/field';
|
|
4
5
|
import { isPeriodOverPeriodAdditionalMetric, } from '../types/metricQuery';
|
|
5
6
|
import { getItemId } from './item';
|
|
6
7
|
export const convertAdditionalMetric = ({ additionalMetric, table, }) => {
|
|
@@ -97,7 +98,19 @@ const dimensionRefExistsInExplore = (ref, explore, owningTable) => {
|
|
|
97
98
|
: [owningTable, strippedRef];
|
|
98
99
|
return (getReferencedDimensionCaseInsensitive(refTable, refName, explore.tables) !== undefined);
|
|
99
100
|
};
|
|
100
|
-
const
|
|
101
|
+
export const getMissingAdditionalMetricReferences = (metric, explore, customDimensions = []) => getAllReferences(metric.sql).filter((ref) => {
|
|
102
|
+
if (ref === 'TABLE')
|
|
103
|
+
return false;
|
|
104
|
+
const { refTable, refName } = getParsedReference(ref, metric.table);
|
|
105
|
+
const table = getReferencedTable(refTable, explore.tables);
|
|
106
|
+
return (!table ||
|
|
107
|
+
(!table.dimensions[refName] &&
|
|
108
|
+
!table.metrics[refName] &&
|
|
109
|
+
!customDimensions.some((dimension) => isCustomSqlDimension(dimension) &&
|
|
110
|
+
dimension.table === refTable &&
|
|
111
|
+
dimension.id === refName)));
|
|
112
|
+
});
|
|
113
|
+
const isMetricCompatibleWithExplore = (metric, explore, customDimensions) => {
|
|
101
114
|
const table = explore.tables[metric.table];
|
|
102
115
|
if (!table)
|
|
103
116
|
return false;
|
|
@@ -113,6 +126,10 @@ const isMetricCompatibleWithExplore = (metric, explore) => {
|
|
|
113
126
|
if (metric.baseMetricName && !table.metrics[metric.baseMetricName]) {
|
|
114
127
|
return false;
|
|
115
128
|
}
|
|
129
|
+
if (getMissingAdditionalMetricReferences(metric, explore, customDimensions)
|
|
130
|
+
.length > 0) {
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
116
133
|
if (metric.filters?.some((filter) => !dimensionRefExistsInExplore(filter.target.fieldRef, explore, metric.table))) {
|
|
117
134
|
return false;
|
|
118
135
|
}
|
|
@@ -126,9 +143,9 @@ const isMetricCompatibleWithExplore = (metric, explore) => {
|
|
|
126
143
|
* every field the metric depends on must exist. Incompatible metrics must never
|
|
127
144
|
* execute as partial definitions.
|
|
128
145
|
*/
|
|
129
|
-
export const getCompatibleDashboardMetrics = (registry, explore) => {
|
|
146
|
+
export const getCompatibleDashboardMetrics = (registry, explore, customDimensions = []) => {
|
|
130
147
|
if (!explore)
|
|
131
148
|
return [];
|
|
132
|
-
return registry.filter((metric) => isMetricCompatibleWithExplore(metric, explore));
|
|
149
|
+
return registry.filter((metric) => isMetricCompatibleWithExplore(metric, explore, customDimensions));
|
|
133
150
|
};
|
|
134
151
|
//# sourceMappingURL=additionalMetrics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"additionalMetrics.js","sourceRoot":"","sources":["../../../src/utils/additionalMetrics.ts"],"names":[],"mappings":"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"}
|