@lightdash/common 2.458.2 → 2.458.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/types/filterGrammarConversion.d.ts +1 -1
- package/dist/cjs/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammarConversion.js +4 -2
- package/dist/cjs/types/filterGrammarConversion.js.map +1 -1
- package/dist/cjs/utils/convertCustomMetricsToYaml.js +1 -1
- package/dist/cjs/utils/convertCustomMetricsToYaml.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/types/filterGrammarConversion.d.ts +1 -1
- package/dist/esm/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/esm/types/filterGrammarConversion.js +4 -2
- package/dist/esm/types/filterGrammarConversion.js.map +1 -1
- package/dist/esm/utils/convertCustomMetricsToYaml.js +1 -1
- package/dist/esm/utils/convertCustomMetricsToYaml.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/types/filterGrammarConversion.d.ts +1 -1
- package/dist/types/types/filterGrammarConversion.d.ts.map +1 -1
- package/dist/types/types/filterGrammarConversion.js +4 -2
- package/dist/types/types/filterGrammarConversion.js.map +1 -1
- package/dist/types/utils/convertCustomMetricsToYaml.js +1 -1
- package/dist/types/utils/convertCustomMetricsToYaml.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type DbtColumnLightdashMetric } from './dbt';
|
|
2
2
|
import { type MetricFilterRule } from './filter';
|
|
3
|
-
export declare const convertMetricFilterToDbt: (filters: MetricFilterRule[] | undefined) => DbtColumnLightdashMetric['filters'];
|
|
3
|
+
export declare const convertMetricFilterToDbt: (filters: MetricFilterRule[] | undefined, metricTable: string) => DbtColumnLightdashMetric['filters'];
|
|
4
4
|
//# sourceMappingURL=filterGrammarConversion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammarConversion.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAKH,KAAK,gBAAgB,EACxB,MAAM,UAAU,CAAC;AAmGlB,eAAO,MAAM,wBAAwB,YACxB,gBAAgB,EAAE,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"filterGrammarConversion.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAKH,KAAK,gBAAgB,EACxB,MAAM,UAAU,CAAC;AAmGlB,eAAO,MAAM,wBAAwB,YACxB,gBAAgB,EAAE,GAAG,SAAS,eAC1B,MAAM,KACpB,wBAAwB,CAAC,SAAS,CAqBpC,CAAC"}
|
|
@@ -84,7 +84,7 @@ const convertFilterOperatorToDbt = (filter) => {
|
|
|
84
84
|
}
|
|
85
85
|
return [];
|
|
86
86
|
};
|
|
87
|
-
const convertMetricFilterToDbt = (filters) => {
|
|
87
|
+
const convertMetricFilterToDbt = (filters, metricTable) => {
|
|
88
88
|
if (!filters)
|
|
89
89
|
return undefined;
|
|
90
90
|
return filters.reduce((acc, filter) => {
|
|
@@ -93,7 +93,9 @@ const convertMetricFilterToDbt = (filters) => {
|
|
|
93
93
|
return acc;
|
|
94
94
|
const values = convertFilterOperatorToDbt(filter);
|
|
95
95
|
const fieldRefParts = target.fieldRef.split('.');
|
|
96
|
-
const fieldId = fieldRefParts.length
|
|
96
|
+
const fieldId = fieldRefParts.length === 2 && fieldRefParts[0] === metricTable
|
|
97
|
+
? fieldRefParts[1]
|
|
98
|
+
: target.fieldRef;
|
|
97
99
|
const dbtFilters = {
|
|
98
100
|
[fieldId]: values.length > 1 ? values : values[0],
|
|
99
101
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterGrammarConversion.js","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"filterGrammarConversion.js","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const field_1 = require("../types/field");
|
|
|
5
5
|
const filterGrammarConversion_1 = require("../types/filterGrammarConversion");
|
|
6
6
|
const formatting_1 = require("./formatting");
|
|
7
7
|
function convertCustomMetricToDbt(field) {
|
|
8
|
-
const filters = (0, filterGrammarConversion_1.convertMetricFilterToDbt)(field.filters);
|
|
8
|
+
const filters = (0, filterGrammarConversion_1.convertMetricFilterToDbt)(field.filters, field.table);
|
|
9
9
|
return {
|
|
10
10
|
label: field.label || (0, field_1.friendlyName)(field.name),
|
|
11
11
|
description: field.description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertCustomMetricsToYaml.js","sourceRoot":"","sources":["../../../src/utils/convertCustomMetricsToYaml.ts"],"names":[],"mappings":";;;AACA,0CAA8C;AAC9C,8EAA4E;AAE5E,6CAAmD;AAEnD,kCACI,KAAuB;IAEvB,MAAM,OAAO,GAAG,IAAA,kDAAwB,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"convertCustomMetricsToYaml.js","sourceRoot":"","sources":["../../../src/utils/convertCustomMetricsToYaml.ts"],"names":[],"mappings":";;;AACA,0CAA8C;AAC9C,8EAA4E;AAE5E,6CAAmD;AAEnD,kCACI,KAAuB;IAEvB,MAAM,OAAO,GAAG,IAAA,kDAAwB,EAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrE,OAAO;QACH,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,IAAA,gCAAmB,EAAC,KAAK,CAAC;QAClC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO;KACV,CAAC;AACN,CAAC"}
|