@lightdash/common 2.173.2 → 2.175.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/compiler/compileLightdashModels.d.ts +11 -0
- package/dist/cjs/compiler/compileLightdashModels.d.ts.map +1 -0
- package/dist/cjs/compiler/compileLightdashModels.js +8 -0
- package/dist/cjs/compiler/compileLightdashModels.js.map +1 -0
- package/dist/cjs/compiler/lightdashModelConverter.d.ts +1 -1
- package/dist/cjs/compiler/lightdashModelConverter.d.ts.map +1 -1
- package/dist/cjs/compiler/lightdashModelConverter.js +4 -4
- package/dist/cjs/compiler/lightdashModelConverter.js.map +1 -1
- package/dist/cjs/constants/sessionStorageKeys.d.ts +1 -0
- package/dist/cjs/constants/sessionStorageKeys.d.ts.map +1 -1
- package/dist/cjs/constants/sessionStorageKeys.js +1 -0
- package/dist/cjs/constants/sessionStorageKeys.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js +5 -5
- package/dist/cjs/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js.map +1 -1
- package/dist/cjs/index.d.ts +3 -0
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +3 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/lightdash/LightdashModelEditor.d.ts +23 -0
- package/dist/cjs/lightdash/LightdashModelEditor.d.ts.map +1 -0
- package/dist/cjs/lightdash/LightdashModelEditor.js +168 -0
- package/dist/cjs/lightdash/LightdashModelEditor.js.map +1 -0
- package/dist/cjs/lightdash/LightdashModelEditor.test.d.ts +2 -0
- package/dist/cjs/lightdash/LightdashModelEditor.test.d.ts.map +1 -0
- package/dist/cjs/lightdash/LightdashModelEditor.test.js +195 -0
- package/dist/cjs/lightdash/LightdashModelEditor.test.js.map +1 -0
- package/dist/cjs/lightdash/convertCustomMetricToLightdash.d.ts +4 -0
- package/dist/cjs/lightdash/convertCustomMetricToLightdash.d.ts.map +1 -0
- package/dist/cjs/lightdash/convertCustomMetricToLightdash.js +37 -0
- package/dist/cjs/lightdash/convertCustomMetricToLightdash.js.map +1 -0
- package/dist/cjs/lightdash/loader.d.ts +5 -0
- package/dist/cjs/lightdash/loader.d.ts.map +1 -0
- package/dist/cjs/lightdash/loader.js +100 -0
- package/dist/cjs/lightdash/loader.js.map +1 -0
- package/dist/cjs/lightdash/loader.test.d.ts +2 -0
- package/dist/cjs/lightdash/loader.test.d.ts.map +1 -0
- package/dist/cjs/lightdash/loader.test.js +75 -0
- package/dist/cjs/lightdash/loader.test.js.map +1 -0
- package/dist/cjs/packageExports.test.js +1 -0
- package/dist/cjs/packageExports.test.js.map +1 -1
- package/dist/cjs/schemas/json/model-as-code-1.0.json +1 -1
- package/dist/cjs/types/lightdashModel.d.ts +4 -0
- package/dist/cjs/types/lightdashModel.d.ts.map +1 -1
- package/dist/cjs/types/projects.d.ts +2 -0
- package/dist/cjs/types/projects.d.ts.map +1 -1
- package/dist/cjs/types/projects.js.map +1 -1
- package/dist/cjs/utils/applyChartFilterOverrides.test.d.ts +2 -0
- package/dist/cjs/utils/applyChartFilterOverrides.test.d.ts.map +1 -0
- package/dist/cjs/utils/applyChartFilterOverrides.test.js +218 -0
- package/dist/cjs/utils/applyChartFilterOverrides.test.js.map +1 -0
- package/dist/cjs/utils/convertCustomDimensionsToYaml.d.ts +1 -1
- package/dist/cjs/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
- package/dist/cjs/utils/convertCustomDimensionsToYaml.js +1 -1
- package/dist/cjs/utils/convertCustomDimensionsToYaml.js.map +1 -1
- package/dist/cjs/utils/filters.d.ts +16 -0
- package/dist/cjs/utils/filters.d.ts.map +1 -1
- package/dist/cjs/utils/filters.js +99 -2
- package/dist/cjs/utils/filters.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/authorization/roleToScopeMapping.testUtils.d.ts +98 -98
- package/dist/esm/compiler/compileLightdashModels.d.ts +11 -0
- package/dist/esm/compiler/compileLightdashModels.d.ts.map +1 -0
- package/dist/esm/compiler/compileLightdashModels.js +4 -0
- package/dist/esm/compiler/compileLightdashModels.js.map +1 -0
- package/dist/esm/compiler/lightdashModelConverter.d.ts +1 -1
- package/dist/esm/compiler/lightdashModelConverter.d.ts.map +1 -1
- package/dist/esm/compiler/lightdashModelConverter.js +4 -4
- package/dist/esm/compiler/lightdashModelConverter.js.map +1 -1
- package/dist/esm/constants/sessionStorageKeys.d.ts +1 -0
- package/dist/esm/constants/sessionStorageKeys.d.ts.map +1 -1
- package/dist/esm/constants/sessionStorageKeys.js +1 -0
- package/dist/esm/constants/sessionStorageKeys.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js +5 -5
- package/dist/esm/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js.map +1 -1
- package/dist/esm/index.d.ts +3 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lightdash/LightdashModelEditor.d.ts +23 -0
- package/dist/esm/lightdash/LightdashModelEditor.d.ts.map +1 -0
- package/dist/esm/lightdash/LightdashModelEditor.js +163 -0
- package/dist/esm/lightdash/LightdashModelEditor.js.map +1 -0
- package/dist/esm/lightdash/LightdashModelEditor.test.d.ts +2 -0
- package/dist/esm/lightdash/LightdashModelEditor.test.d.ts.map +1 -0
- package/dist/esm/lightdash/LightdashModelEditor.test.js +193 -0
- package/dist/esm/lightdash/LightdashModelEditor.test.js.map +1 -0
- package/dist/esm/lightdash/convertCustomMetricToLightdash.d.ts +4 -0
- package/dist/esm/lightdash/convertCustomMetricToLightdash.d.ts.map +1 -0
- package/dist/esm/lightdash/convertCustomMetricToLightdash.js +33 -0
- package/dist/esm/lightdash/convertCustomMetricToLightdash.js.map +1 -0
- package/dist/esm/lightdash/loader.d.ts +5 -0
- package/dist/esm/lightdash/loader.d.ts.map +1 -0
- package/dist/esm/lightdash/loader.js +94 -0
- package/dist/esm/lightdash/loader.js.map +1 -0
- package/dist/esm/lightdash/loader.test.d.ts +2 -0
- package/dist/esm/lightdash/loader.test.d.ts.map +1 -0
- package/dist/esm/lightdash/loader.test.js +72 -0
- package/dist/esm/lightdash/loader.test.js.map +1 -0
- package/dist/esm/packageExports.test.js +1 -0
- package/dist/esm/packageExports.test.js.map +1 -1
- package/dist/esm/schemas/json/model-as-code-1.0.json +1 -1
- package/dist/esm/types/lightdashModel.d.ts +4 -0
- package/dist/esm/types/lightdashModel.d.ts.map +1 -1
- package/dist/esm/types/projects.d.ts +2 -0
- package/dist/esm/types/projects.d.ts.map +1 -1
- package/dist/esm/types/projects.js.map +1 -1
- package/dist/esm/utils/applyChartFilterOverrides.test.d.ts +2 -0
- package/dist/esm/utils/applyChartFilterOverrides.test.d.ts.map +1 -0
- package/dist/esm/utils/applyChartFilterOverrides.test.js +216 -0
- package/dist/esm/utils/applyChartFilterOverrides.test.js.map +1 -0
- package/dist/esm/utils/convertCustomDimensionsToYaml.d.ts +1 -1
- package/dist/esm/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
- package/dist/esm/utils/convertCustomDimensionsToYaml.js +1 -1
- package/dist/esm/utils/convertCustomDimensionsToYaml.js.map +1 -1
- package/dist/esm/utils/filters.d.ts +16 -0
- package/dist/esm/utils/filters.d.ts.map +1 -1
- package/dist/esm/utils/filters.js +93 -0
- package/dist/esm/utils/filters.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/authorization/roleToScopeMapping.testUtils.d.ts +98 -98
- package/dist/types/compiler/compileLightdashModels.d.ts +11 -0
- package/dist/types/compiler/compileLightdashModels.d.ts.map +1 -0
- package/dist/types/compiler/compileLightdashModels.js +4 -0
- package/dist/types/compiler/compileLightdashModels.js.map +1 -0
- package/dist/types/compiler/lightdashModelConverter.d.ts +1 -1
- package/dist/types/compiler/lightdashModelConverter.d.ts.map +1 -1
- package/dist/types/compiler/lightdashModelConverter.js +4 -4
- package/dist/types/compiler/lightdashModelConverter.js.map +1 -1
- package/dist/types/constants/sessionStorageKeys.d.ts +1 -0
- package/dist/types/constants/sessionStorageKeys.d.ts.map +1 -1
- package/dist/types/constants/sessionStorageKeys.js +1 -0
- package/dist/types/constants/sessionStorageKeys.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js +5 -5
- package/dist/types/ee/AiAgent/schemas/tools/toolEditDbtProjectArgs.js.map +1 -1
- package/dist/types/index.d.ts +3 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +3 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/lightdash/LightdashModelEditor.d.ts +23 -0
- package/dist/types/lightdash/LightdashModelEditor.d.ts.map +1 -0
- package/dist/types/lightdash/LightdashModelEditor.js +163 -0
- package/dist/types/lightdash/LightdashModelEditor.js.map +1 -0
- package/dist/types/lightdash/LightdashModelEditor.test.d.ts +2 -0
- package/dist/types/lightdash/LightdashModelEditor.test.d.ts.map +1 -0
- package/dist/types/lightdash/LightdashModelEditor.test.js +193 -0
- package/dist/types/lightdash/LightdashModelEditor.test.js.map +1 -0
- package/dist/types/lightdash/convertCustomMetricToLightdash.d.ts +4 -0
- package/dist/types/lightdash/convertCustomMetricToLightdash.d.ts.map +1 -0
- package/dist/types/lightdash/convertCustomMetricToLightdash.js +33 -0
- package/dist/types/lightdash/convertCustomMetricToLightdash.js.map +1 -0
- package/dist/types/lightdash/loader.d.ts +5 -0
- package/dist/types/lightdash/loader.d.ts.map +1 -0
- package/dist/types/lightdash/loader.js +94 -0
- package/dist/types/lightdash/loader.js.map +1 -0
- package/dist/types/lightdash/loader.test.d.ts +2 -0
- package/dist/types/lightdash/loader.test.d.ts.map +1 -0
- package/dist/types/lightdash/loader.test.js +72 -0
- package/dist/types/lightdash/loader.test.js.map +1 -0
- package/dist/types/packageExports.test.js +1 -0
- package/dist/types/packageExports.test.js.map +1 -1
- package/dist/types/schemas/json/model-as-code-1.0.json +1 -1
- package/dist/types/types/lightdashModel.d.ts +4 -0
- package/dist/types/types/lightdashModel.d.ts.map +1 -1
- package/dist/types/types/projects.d.ts +2 -0
- package/dist/types/types/projects.d.ts.map +1 -1
- package/dist/types/types/projects.js.map +1 -1
- package/dist/types/utils/applyChartFilterOverrides.test.d.ts +2 -0
- package/dist/types/utils/applyChartFilterOverrides.test.d.ts.map +1 -0
- package/dist/types/utils/applyChartFilterOverrides.test.js +216 -0
- package/dist/types/utils/applyChartFilterOverrides.test.js.map +1 -0
- package/dist/types/utils/convertCustomDimensionsToYaml.d.ts +1 -1
- package/dist/types/utils/convertCustomDimensionsToYaml.d.ts.map +1 -1
- package/dist/types/utils/convertCustomDimensionsToYaml.js +1 -1
- package/dist/types/utils/convertCustomDimensionsToYaml.js.map +1 -1
- package/dist/types/utils/filters.d.ts +16 -0
- package/dist/types/utils/filters.d.ts.map +1 -1
- package/dist/types/utils/filters.js +93 -0
- package/dist/types/utils/filters.js.map +1 -1
- package/package.json +8 -1
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import Ajv from 'ajv';
|
|
2
|
+
import { Document, isMap, isSeq, parseDocument } from 'yaml';
|
|
3
|
+
import modelSchema from '../schemas/json/model-as-code-1.0.json';
|
|
4
|
+
import { ParameterError, ParseError } from '../types/errors';
|
|
5
|
+
import { DimensionType, friendlyName, isCustomSqlDimension, } from '../types/field';
|
|
6
|
+
import { convertCustomBinDimensionToDbt, getCustomDimensionWriteBackError, } from '../utils/convertCustomDimensionsToYaml';
|
|
7
|
+
import { convertCustomMetricToLightdash } from './convertCustomMetricToLightdash';
|
|
8
|
+
const ajv = new Ajv({ allErrors: true, strict: false });
|
|
9
|
+
const validate = ajv.compile(modelSchema);
|
|
10
|
+
/** Edits the original native model document, preserving comments and unrelated nodes. */
|
|
11
|
+
export class LightdashModelEditor {
|
|
12
|
+
constructor(contents, filename) {
|
|
13
|
+
this.contents = contents;
|
|
14
|
+
this.filename = filename;
|
|
15
|
+
this.changedDimensions = new Set();
|
|
16
|
+
this.newDimensions = [];
|
|
17
|
+
this.doc = parseDocument(contents);
|
|
18
|
+
this.validate();
|
|
19
|
+
}
|
|
20
|
+
validate() {
|
|
21
|
+
const model = this.doc.toJS();
|
|
22
|
+
if (this.doc.errors.length > 0 || !validate(model)) {
|
|
23
|
+
throw new ParseError(`Invalid Lightdash model in ${this.filename}: ${this.doc.errors.map((error) => error.message).join('; ') || ajv.errorsText(validate.errors)}`);
|
|
24
|
+
}
|
|
25
|
+
return model;
|
|
26
|
+
}
|
|
27
|
+
assertModelName(name) {
|
|
28
|
+
if (this.doc.get('name') !== name) {
|
|
29
|
+
throw new ParameterError(`Model ${name} no longer matches ${this.filename}. Refresh the project before writing back.`);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
assertFieldDoesNotExist(name) {
|
|
33
|
+
const model = this.validate();
|
|
34
|
+
const names = [
|
|
35
|
+
...Object.keys(model.metrics ?? {}),
|
|
36
|
+
...model.dimensions.flatMap((dimension) => [
|
|
37
|
+
dimension.name,
|
|
38
|
+
...Object.keys(dimension.metrics ?? {}),
|
|
39
|
+
...Object.keys(dimension.additional_dimensions ?? {}),
|
|
40
|
+
]),
|
|
41
|
+
];
|
|
42
|
+
if (names.some((existing) => existing.toLowerCase() === name.toLowerCase())) {
|
|
43
|
+
throw new ParameterError(`Field ${name} already exists in ${this.filename}. Choose a different name to preserve the existing definition.`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
addCustomMetrics(metrics) {
|
|
47
|
+
metrics.forEach((metric) => {
|
|
48
|
+
this.assertModelName(metric.table);
|
|
49
|
+
this.assertFieldDoesNotExist(metric.name);
|
|
50
|
+
const definition = convertCustomMetricToLightdash(metric);
|
|
51
|
+
const dimensions = this.doc.get('dimensions');
|
|
52
|
+
const dimension = isSeq(dimensions)
|
|
53
|
+
? dimensions.items.find((item) => isMap(item) &&
|
|
54
|
+
item.get('name') === metric.baseDimensionName)
|
|
55
|
+
: undefined;
|
|
56
|
+
if (!isMap(dimension)) {
|
|
57
|
+
throw new ParameterError(`Native dimension ${metric.baseDimensionName} not found in ${this.filename}. Refresh the project before writing back.`);
|
|
58
|
+
}
|
|
59
|
+
dimension.setIn(['metrics', metric.name], definition);
|
|
60
|
+
this.changedDimensions.add(dimension);
|
|
61
|
+
});
|
|
62
|
+
this.validate();
|
|
63
|
+
return this;
|
|
64
|
+
}
|
|
65
|
+
getCustomDimensionDefinition(dimension, warehouseSqlBuilder) {
|
|
66
|
+
this.assertModelName(dimension.table);
|
|
67
|
+
this.assertFieldDoesNotExist(dimension.id);
|
|
68
|
+
const error = getCustomDimensionWriteBackError(dimension);
|
|
69
|
+
if (error)
|
|
70
|
+
throw new ParameterError(error);
|
|
71
|
+
if (isCustomSqlDimension(dimension)) {
|
|
72
|
+
return {
|
|
73
|
+
name: dimension.id,
|
|
74
|
+
label: friendlyName(dimension.name),
|
|
75
|
+
type: dimension.dimensionType,
|
|
76
|
+
sql: dimension.sql,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
const model = this.validate();
|
|
80
|
+
const prefix = `${dimension.table}_`;
|
|
81
|
+
const baseName = dimension.dimensionId.startsWith(prefix)
|
|
82
|
+
? dimension.dimensionId.slice(prefix.length)
|
|
83
|
+
: dimension.dimensionId;
|
|
84
|
+
const base = model.dimensions.find((item) => item.name === baseName);
|
|
85
|
+
if (!base) {
|
|
86
|
+
throw new ParameterError(`Native dimension ${baseName} not found in ${this.filename}. Refresh the project before writing back.`);
|
|
87
|
+
}
|
|
88
|
+
const definition = convertCustomBinDimensionToDbt({
|
|
89
|
+
customDimension: dimension,
|
|
90
|
+
baseDimensionSql: base.sql,
|
|
91
|
+
warehouseSqlBuilder,
|
|
92
|
+
});
|
|
93
|
+
return {
|
|
94
|
+
...definition,
|
|
95
|
+
name: dimension.id,
|
|
96
|
+
type: DimensionType.STRING,
|
|
97
|
+
sql: definition.sql,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
addCustomDimensions(dimensions, warehouseSqlBuilder) {
|
|
101
|
+
dimensions.forEach((dimension) => {
|
|
102
|
+
const definition = this.getCustomDimensionDefinition(dimension, warehouseSqlBuilder);
|
|
103
|
+
this.doc.addIn(['dimensions'], definition);
|
|
104
|
+
this.newDimensions.push(definition);
|
|
105
|
+
});
|
|
106
|
+
this.validate();
|
|
107
|
+
return this;
|
|
108
|
+
}
|
|
109
|
+
toString(options) {
|
|
110
|
+
// Replace only changed dimension nodes. Serializing the whole document
|
|
111
|
+
// would reindent every list and reflow unrelated model SQL/descriptions.
|
|
112
|
+
let result = this.contents;
|
|
113
|
+
const changes = [];
|
|
114
|
+
for (const node of this.changedDimensions) {
|
|
115
|
+
const [start, , end] = node.range;
|
|
116
|
+
const lineStart = this.contents.lastIndexOf('\n', start - 1) + 1;
|
|
117
|
+
const prefix = this.contents.slice(lineStart, start);
|
|
118
|
+
if (!/^ *-? *$/.test(prefix) || node.flow) {
|
|
119
|
+
throw new ParameterError(`Native write-back requires block-style dimensions in ${this.filename}. Expand flow-style YAML before writing back.`);
|
|
120
|
+
}
|
|
121
|
+
const clone = node.clone();
|
|
122
|
+
// A leading comment lies before range[0] and remains in the source.
|
|
123
|
+
clone.commentBefore = undefined;
|
|
124
|
+
const text = new Document(clone)
|
|
125
|
+
.toString({
|
|
126
|
+
singleQuote: options?.quoteChar === "'" ? true : null,
|
|
127
|
+
lineWidth: 0,
|
|
128
|
+
})
|
|
129
|
+
.trimEnd()
|
|
130
|
+
.split('\n')
|
|
131
|
+
.join(`\n${' '.repeat(prefix.length)}`);
|
|
132
|
+
changes.push({ start, end, text: `${text}\n` });
|
|
133
|
+
}
|
|
134
|
+
if (this.newDimensions.length > 0) {
|
|
135
|
+
const dimensions = this.doc.get('dimensions');
|
|
136
|
+
if (!isSeq(dimensions) || dimensions.flow || !dimensions.range) {
|
|
137
|
+
throw new ParameterError(`Native write-back requires block-style dimensions in ${this.filename}. Expand flow-style YAML before writing back.`);
|
|
138
|
+
}
|
|
139
|
+
const [start, end] = dimensions.range;
|
|
140
|
+
const lineStart = this.contents.lastIndexOf('\n', start - 1) + 1;
|
|
141
|
+
const indent = ' '.repeat(start - lineStart);
|
|
142
|
+
const text = new Document(this.newDimensions)
|
|
143
|
+
.toString({
|
|
144
|
+
singleQuote: options?.quoteChar === "'" ? true : null,
|
|
145
|
+
lineWidth: 0,
|
|
146
|
+
})
|
|
147
|
+
.trimEnd()
|
|
148
|
+
.split('\n')
|
|
149
|
+
.map((line) => indent + line)
|
|
150
|
+
.join('\n');
|
|
151
|
+
changes.push({
|
|
152
|
+
start: end,
|
|
153
|
+
end,
|
|
154
|
+
text: `${this.contents[end - 1] === '\n' ? '' : '\n'}${text}\n`,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
for (const { start, end, text } of changes.sort((a, b) => b.start - a.start)) {
|
|
158
|
+
result = result.slice(0, start) + text + result.slice(end);
|
|
159
|
+
}
|
|
160
|
+
return result;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=LightdashModelEditor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LightdashModelEditor.js","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LightdashModelEditor.test.d.ts","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import { parse } from 'yaml';
|
|
2
|
+
import { compileLightdashModels } from '../compiler/compileLightdashModels';
|
|
3
|
+
import { warehouseClientMock } from '../compiler/exploreCompiler.mock';
|
|
4
|
+
import { isExploreError } from '../types/explore';
|
|
5
|
+
import { BinType, CustomDimensionType, DimensionType, GroupValueMatchType, MetricType, } from '../types/field';
|
|
6
|
+
import { FilterOperator } from '../types/filter';
|
|
7
|
+
import { DEFAULT_SPOTLIGHT_CONFIG } from '../types/lightdashProjectConfig';
|
|
8
|
+
import { LightdashModelEditor } from './LightdashModelEditor';
|
|
9
|
+
const source = `# Keep this model comment
|
|
10
|
+
type: model
|
|
11
|
+
name: orders
|
|
12
|
+
sql_from: public.orders
|
|
13
|
+
metrics:
|
|
14
|
+
existing_count: # Keep this metric comment
|
|
15
|
+
type: count
|
|
16
|
+
sql: '1'
|
|
17
|
+
dimensions:
|
|
18
|
+
- name: amount
|
|
19
|
+
type: number
|
|
20
|
+
sql: \${TABLE}.amount * 2 # Keep the original expression
|
|
21
|
+
- name: status
|
|
22
|
+
type: string
|
|
23
|
+
sql: \${TABLE}.status
|
|
24
|
+
`;
|
|
25
|
+
const metric = {
|
|
26
|
+
name: 'paid_revenue',
|
|
27
|
+
label: 'Paid Revenue',
|
|
28
|
+
description: 'Revenue for paid orders',
|
|
29
|
+
table: 'orders',
|
|
30
|
+
baseDimensionName: 'amount',
|
|
31
|
+
sql: '${TABLE}.amount * 2',
|
|
32
|
+
type: MetricType.SUM,
|
|
33
|
+
filters: [
|
|
34
|
+
{
|
|
35
|
+
id: 'paid',
|
|
36
|
+
target: { fieldRef: 'orders.status' },
|
|
37
|
+
operator: FilterOperator.EQUALS,
|
|
38
|
+
values: ['paid'],
|
|
39
|
+
},
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
describe('native model write-back', () => {
|
|
43
|
+
it('preserves existing YAML and compiles the metric with its SQL, filters and base dimension identity', async () => {
|
|
44
|
+
const output = new LightdashModelEditor(source, 'models/nested/sales.yaml')
|
|
45
|
+
.addCustomMetrics([metric])
|
|
46
|
+
.toString();
|
|
47
|
+
expect(output.split('dimensions:')[0]).toBe(source.split('dimensions:')[0]);
|
|
48
|
+
expect(output).toContain('# Keep this model comment');
|
|
49
|
+
expect(output).toContain('# Keep this metric comment');
|
|
50
|
+
expect(output).toContain('# Keep the original expression');
|
|
51
|
+
const original = parse(source);
|
|
52
|
+
const updated = parse(output);
|
|
53
|
+
expect(updated.metrics).toEqual(original.metrics);
|
|
54
|
+
expect(updated.dimensions[1]).toEqual(original.dimensions[1]);
|
|
55
|
+
expect(updated).not.toHaveProperty('models');
|
|
56
|
+
const [explore] = await compileLightdashModels({
|
|
57
|
+
models: [{ ...updated, sourcePath: 'models/nested/sales.yaml' }],
|
|
58
|
+
warehouseSqlBuilder: warehouseClientMock,
|
|
59
|
+
lightdashProjectConfig: { spotlight: DEFAULT_SPOTLIGHT_CONFIG },
|
|
60
|
+
});
|
|
61
|
+
if (!explore || isExploreError(explore))
|
|
62
|
+
throw new Error('Expected compiled native explore');
|
|
63
|
+
expect(explore.tables.orders.metrics.paid_revenue).toMatchObject({
|
|
64
|
+
label: metric.label,
|
|
65
|
+
description: metric.description,
|
|
66
|
+
type: MetricType.SUM,
|
|
67
|
+
sql: metric.sql,
|
|
68
|
+
dimensionReference: 'orders_amount',
|
|
69
|
+
filters: [
|
|
70
|
+
expect.objectContaining({
|
|
71
|
+
target: { fieldRef: 'status' },
|
|
72
|
+
values: ['paid'],
|
|
73
|
+
}),
|
|
74
|
+
],
|
|
75
|
+
});
|
|
76
|
+
expect(explore.ymlPath).toBe('models/nested/sales.yaml');
|
|
77
|
+
});
|
|
78
|
+
it.each([
|
|
79
|
+
{ ...metric, name: 'existing_count' },
|
|
80
|
+
{ ...metric, name: 'status' },
|
|
81
|
+
{ ...metric, table: 'renamed_orders' },
|
|
82
|
+
{ ...metric, baseDimensionName: 'missing' },
|
|
83
|
+
{ ...metric, generationType: 'periodOverPeriod' },
|
|
84
|
+
{ ...metric, baseDimensionName: undefined },
|
|
85
|
+
])('rejects collisions, stale sources and unsupported metric definitions ($name)', (field) => {
|
|
86
|
+
expect(() => new LightdashModelEditor(source, 'models/orders.yml').addCustomMetrics([field])).toThrow();
|
|
87
|
+
});
|
|
88
|
+
const customDimensions = [
|
|
89
|
+
{
|
|
90
|
+
id: 'amount_times_ten',
|
|
91
|
+
name: 'Amount times ten',
|
|
92
|
+
table: 'orders',
|
|
93
|
+
type: CustomDimensionType.SQL,
|
|
94
|
+
dimensionType: DimensionType.NUMBER,
|
|
95
|
+
sql: '${orders.amount} * 10',
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
id: 'amount_band',
|
|
99
|
+
name: 'Amount band',
|
|
100
|
+
table: 'orders',
|
|
101
|
+
type: CustomDimensionType.BIN,
|
|
102
|
+
dimensionId: 'orders_amount',
|
|
103
|
+
binType: BinType.FIXED_WIDTH,
|
|
104
|
+
binWidth: 10,
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
id: 'amount_range',
|
|
108
|
+
name: 'Amount range',
|
|
109
|
+
table: 'orders',
|
|
110
|
+
type: CustomDimensionType.BIN,
|
|
111
|
+
dimensionId: 'orders_amount',
|
|
112
|
+
binType: BinType.CUSTOM_RANGE,
|
|
113
|
+
customRange: [
|
|
114
|
+
{ from: undefined, to: 10 },
|
|
115
|
+
{ from: 10, to: undefined },
|
|
116
|
+
],
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
id: 'amount_group',
|
|
120
|
+
name: 'Amount group',
|
|
121
|
+
table: 'orders',
|
|
122
|
+
type: CustomDimensionType.BIN,
|
|
123
|
+
dimensionId: 'orders_amount',
|
|
124
|
+
binType: BinType.CUSTOM_GROUP,
|
|
125
|
+
customGroups: [
|
|
126
|
+
{
|
|
127
|
+
name: 'Twenty',
|
|
128
|
+
values: [
|
|
129
|
+
{ matchType: GroupValueMatchType.EXACT, value: '20' },
|
|
130
|
+
],
|
|
131
|
+
},
|
|
132
|
+
],
|
|
133
|
+
},
|
|
134
|
+
];
|
|
135
|
+
it.each(customDimensions)('appends and compiles native $id while preserving the original document', async (dimension) => {
|
|
136
|
+
const output = new LightdashModelEditor(source, 'models/orders.yml')
|
|
137
|
+
.addCustomDimensions([dimension], warehouseClientMock)
|
|
138
|
+
.toString();
|
|
139
|
+
expect(output.startsWith(source)).toBe(true);
|
|
140
|
+
const model = parse(output);
|
|
141
|
+
const added = model.dimensions.at(-1);
|
|
142
|
+
expect(added.name).toBe(dimension.id);
|
|
143
|
+
expect(added.sql).toContain(dimension.type === CustomDimensionType.SQL
|
|
144
|
+
? '${orders.amount}'
|
|
145
|
+
: '${TABLE}.amount * 2');
|
|
146
|
+
expect(model).not.toHaveProperty('models');
|
|
147
|
+
const [explore] = await compileLightdashModels({
|
|
148
|
+
models: [{ ...model, sourcePath: 'models/orders.yml' }],
|
|
149
|
+
warehouseSqlBuilder: warehouseClientMock,
|
|
150
|
+
lightdashProjectConfig: { spotlight: DEFAULT_SPOTLIGHT_CONFIG },
|
|
151
|
+
});
|
|
152
|
+
if (!explore || isExploreError(explore))
|
|
153
|
+
throw new Error('Expected compiled native explore');
|
|
154
|
+
expect(explore.tables.orders.dimensions[dimension.id].compiledSql).toContain('amount');
|
|
155
|
+
});
|
|
156
|
+
it('keeps trailing model properties and comments when appending dimensions', () => {
|
|
157
|
+
const footer = '# Keep this root property\nprimary_key: amount\n';
|
|
158
|
+
const output = new LightdashModelEditor(source + footer, 'models/orders.yml')
|
|
159
|
+
.addCustomDimensions([customDimensions[0]], warehouseClientMock)
|
|
160
|
+
.toString();
|
|
161
|
+
expect(output).toContain(footer);
|
|
162
|
+
expect(parse(output).primary_key).toBe('amount');
|
|
163
|
+
expect(parse(output).dimensions.at(-1).name).toBe('amount_times_ten');
|
|
164
|
+
});
|
|
165
|
+
it('rejects fixed-number bins instead of persisting query-dependent boundaries', () => {
|
|
166
|
+
expect(() => new LightdashModelEditor(source, 'models/orders.yml').addCustomDimensions([
|
|
167
|
+
{
|
|
168
|
+
id: 'unsupported',
|
|
169
|
+
name: 'Unsupported',
|
|
170
|
+
table: 'orders',
|
|
171
|
+
type: CustomDimensionType.BIN,
|
|
172
|
+
dimensionId: 'orders_amount',
|
|
173
|
+
binType: BinType.FIXED_NUMBER,
|
|
174
|
+
binNumber: 4,
|
|
175
|
+
},
|
|
176
|
+
], warehouseClientMock)).toThrow('Fixed-number bins cannot be written back');
|
|
177
|
+
});
|
|
178
|
+
it('rejects filters that the YAML serializer would otherwise drop', () => {
|
|
179
|
+
expect(() => new LightdashModelEditor(source, 'models/orders.yml').addCustomMetrics([
|
|
180
|
+
{
|
|
181
|
+
...metric,
|
|
182
|
+
filters: [{ ...metric.filters[0], includeNull: true }],
|
|
183
|
+
},
|
|
184
|
+
])).toThrow('without changing its meaning');
|
|
185
|
+
});
|
|
186
|
+
it('rejects a second metric with the same name rather than overwriting the first', () => {
|
|
187
|
+
expect(() => new LightdashModelEditor(source, 'models/orders.yml').addCustomMetrics([
|
|
188
|
+
metric,
|
|
189
|
+
{ ...metric, label: 'Different meaning' },
|
|
190
|
+
])).toThrow('already exists');
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
//# sourceMappingURL=LightdashModelEditor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LightdashModelEditor.test.js","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,OAAO,EACP,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,UAAU,GAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;CAed,CAAC;AACF,MAAM,MAAM,GAAqB;IAC7B,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,cAAc;IACrB,WAAW,EAAE,yBAAyB;IACtC,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,GAAG,EAAE,qBAAqB;IAC1B,IAAI,EAAE,UAAU,CAAC,GAAG;IACpB,OAAO,EAAE;QACL;YACI,EAAE,EAAE,MAAM;YACV,MAAM,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;YACrC,QAAQ,EAAE,cAAc,CAAC,MAAM;YAC/B,MAAM,EAAE,CAAC,MAAM,CAAC;SACnB;KACJ;CACJ,CAAC;AAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,mGAAmG,EAAE,KAAK,IAAI,EAAE;QAC/G,MAAM,MAAM,GAAG,IAAI,oBAAoB,CACnC,MAAM,EACN,0BAA0B,CAC7B;aACI,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;aAC1B,QAAQ,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACvC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,sBAAsB,CAAC;YAC3C,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,CAAC;YAChE,mBAAmB,EAAE,mBAAmB;YACxC,sBAAsB,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE;SAClE,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACxD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC;YAC7D,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,IAAI,EAAE,UAAU,CAAC,GAAG;YACpB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,kBAAkB,EAAE,eAAe;YACnC,OAAO,EAAE;gBACL,MAAM,CAAC,gBAAgB,CAAC;oBACpB,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;oBAC9B,MAAM,EAAE,CAAC,MAAM,CAAC;iBACnB,CAAC;aACL;SACJ,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACJ,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACrC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE;QACtC,EAAE,GAAG,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE;QAC3C,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,kBAA2B,EAAE;QAC1D,EAAE,GAAG,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE;KAC9C,CAAC,CACE,8EAA8E,EAC9E,CAAC,KAAK,EAAE,EAAE;QACN,MAAM,CAAC,GAAG,EAAE,CACR,IAAI,oBAAoB,CACpB,MAAM,EACN,mBAAmB,CACtB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAC9B,CAAC,OAAO,EAAE,CAAC;IAChB,CAAC,CACJ,CAAC;IAEF,MAAM,gBAAgB,GAAsB;QACxC;YACI,EAAE,EAAE,kBAAkB;YACtB,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,mBAAmB,CAAC,GAAG;YAC7B,aAAa,EAAE,aAAa,CAAC,MAAM;YACnC,GAAG,EAAE,uBAAuB;SAC/B;QACD;YACI,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,mBAAmB,CAAC,GAAG;YAC7B,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,QAAQ,EAAE,EAAE;SACf;QACD;YACI,EAAE,EAAE,cAAc;YAClB,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,mBAAmB,CAAC,GAAG;YAC7B,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,WAAW,EAAE;gBACT,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE;gBAC3B,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;aAC9B;SACJ;QACD;YACI,EAAE,EAAE,cAAc;YAClB,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,mBAAmB,CAAC,GAAG;YAC7B,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,YAAY,EAAE;gBACV;oBACI,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE;wBACJ,EAAE,SAAS,EAAE,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;qBACxD;iBACJ;aACJ;SACJ;KACJ,CAAC;IAEF,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CACrB,wEAAwE,EACxE,KAAK,EAAE,SAAS,EAAE,EAAE;QAChB,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC;aAC/D,mBAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC;aACrD,QAAQ,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,CACvB,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,GAAG;YACtC,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,qBAAqB,CAC9B,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,sBAAsB,CAAC;YAC3C,MAAM,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC;YACvD,mBAAmB,EAAE,mBAAmB;YACxC,sBAAsB,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE;SAClE,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACxD,MAAM,CACF,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,WAAW,CAC7D,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC,CACJ,CAAC;IAEF,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAC9E,MAAM,MAAM,GAAG,kDAAkD,CAAC;QAClE,MAAM,MAAM,GAAG,IAAI,oBAAoB,CACnC,MAAM,GAAG,MAAM,EACf,mBAAmB,CACtB;aACI,mBAAmB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC;aAC/D,QAAQ,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QAClF,MAAM,CAAC,GAAG,EAAE,CACR,IAAI,oBAAoB,CACpB,MAAM,EACN,mBAAmB,CACtB,CAAC,mBAAmB,CACjB;YACI;gBACI,EAAE,EAAE,aAAa;gBACjB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,mBAAmB,CAAC,GAAG;gBAC7B,WAAW,EAAE,eAAe;gBAC5B,OAAO,EAAE,OAAO,CAAC,YAAY;gBAC7B,SAAS,EAAE,CAAC;aACf;SACJ,EACD,mBAAmB,CACtB,CACJ,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,GAAG,EAAE,CACR,IAAI,oBAAoB,CACpB,MAAM,EACN,mBAAmB,CACtB,CAAC,gBAAgB,CAAC;YACf;gBACI,GAAG,MAAM;gBACT,OAAO,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,OAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;aAC1D;SACJ,CAAC,CACL,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACpF,MAAM,CAAC,GAAG,EAAE,CACR,IAAI,oBAAoB,CACpB,MAAM,EACN,mBAAmB,CACtB,CAAC,gBAAgB,CAAC;YACf,MAAM;YACN,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE;SAC5C,CAAC,CACL,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type LightdashModelMetric } from '../types/lightdashModel';
|
|
2
|
+
import { type AdditionalMetric } from '../types/metricQuery';
|
|
3
|
+
export declare const convertCustomMetricToLightdash: (metric: AdditionalMetric) => LightdashModelMetric;
|
|
4
|
+
//# sourceMappingURL=convertCustomMetricToLightdash.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"convertCustomMetricToLightdash.d.ts","sourceRoot":"","sources":["../../../src/lightdash/convertCustomMetricToLightdash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG7D,eAAO,MAAM,8BAA8B,WAC/B,gBAAgB,KACzB,oBAoCF,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { ParameterError } from '../types/errors';
|
|
2
|
+
import { FilterOperator } from '../types/filter';
|
|
3
|
+
import { convertCustomMetricToDbt } from '../utils/convertCustomMetricsToYaml';
|
|
4
|
+
export const convertCustomMetricToLightdash = (metric) => {
|
|
5
|
+
if (metric.generationType ||
|
|
6
|
+
!metric.baseDimensionName ||
|
|
7
|
+
!metric.sql.trim()) {
|
|
8
|
+
throw new ParameterError(`Metric ${metric.name} cannot be written back to native YAML. Only metrics based on a native dimension are supported; generated period comparisons and metrics without a base dimension are not supported.`);
|
|
9
|
+
}
|
|
10
|
+
for (const filter of metric.filters ?? []) {
|
|
11
|
+
const noValues = [
|
|
12
|
+
FilterOperator.NULL,
|
|
13
|
+
FilterOperator.NOT_NULL,
|
|
14
|
+
].includes(filter.operator);
|
|
15
|
+
const parts = filter.target.fieldRef.split('.');
|
|
16
|
+
if (filter.includeNull ||
|
|
17
|
+
(!noValues && !filter.values?.length) ||
|
|
18
|
+
(!noValues &&
|
|
19
|
+
filter.operator !== FilterOperator.EQUALS &&
|
|
20
|
+
filter.values.length !== 1) ||
|
|
21
|
+
(parts.length > 1 &&
|
|
22
|
+
(parts.length !== 2 || parts[0] !== metric.table))) {
|
|
23
|
+
throw new ParameterError(`Filter ${filter.id} on metric ${metric.name} cannot be represented in native YAML without changing its meaning.`);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
...convertCustomMetricToDbt(metric),
|
|
28
|
+
sql: metric.sql,
|
|
29
|
+
hidden: metric.hidden,
|
|
30
|
+
distinct_keys: metric.distinctKeys,
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
//# sourceMappingURL=convertCustomMetricToLightdash.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"convertCustomMetricToLightdash.js","sourceRoot":"","sources":["../../../src/lightdash/convertCustomMetricToLightdash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC1C,MAAwB,EACJ,EAAE;IACtB,IACI,MAAM,CAAC,cAAc;QACrB,CAAC,MAAM,CAAC,iBAAiB;QACzB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EACpB,CAAC;QACC,MAAM,IAAI,cAAc,CACpB,UAAU,MAAM,CAAC,IAAI,sLAAsL,CAC9M,CAAC;IACN,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG;YACb,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,QAAQ;SAC1B,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,IACI,MAAM,CAAC,WAAW;YAClB,CAAC,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;YACrC,CAAC,CAAC,QAAQ;gBACN,MAAM,CAAC,QAAQ,KAAK,cAAc,CAAC,MAAM;gBACzC,MAAM,CAAC,MAAO,CAAC,MAAM,KAAK,CAAC,CAAC;YAChC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;gBACb,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EACxD,CAAC;YACC,MAAM,IAAI,cAAc,CACpB,UAAU,MAAM,CAAC,EAAE,cAAc,MAAM,CAAC,IAAI,qEAAqE,CACpH,CAAC;QACN,CAAC;IACL,CAAC;IACD,OAAO;QACH,GAAG,wBAAwB,CAAC,MAAM,CAAC;QACnC,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,aAAa,EAAE,MAAM,CAAC,YAAY;KACrC,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type LightdashModel, type LightdashModelWithSource } from '../types/lightdashModel';
|
|
2
|
+
export declare function loadLightdashModel(filePath: string): Promise<LightdashModel>;
|
|
3
|
+
export declare function findLightdashModelFiles(projectDir: string): Promise<string[]>;
|
|
4
|
+
export declare function loadLightdashModels(projectDir: string): Promise<LightdashModelWithSource[]>;
|
|
5
|
+
//# sourceMappingURL=loader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/lightdash/loader.ts"],"names":[],"mappings":"AAMA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAChC,MAAM,yBAAyB,CAAC;AAgBjC,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAQzB;AAED,wBAAsB,uBAAuB,CACzC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA8DnB;AAED,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAmBrC"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import Ajv from 'ajv';
|
|
2
|
+
import fs from 'fs/promises';
|
|
3
|
+
import * as yaml from 'js-yaml';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import modelSchema from '../schemas/json/model-as-code-1.0.json';
|
|
6
|
+
import { ParseError } from '../types/errors';
|
|
7
|
+
const ajv = new Ajv({ allErrors: true, strict: false });
|
|
8
|
+
const validateModel = ajv.compile(modelSchema);
|
|
9
|
+
const modelTypes = new Set(['model', 'model/v1beta', 'model/v1']);
|
|
10
|
+
async function readYaml(filePath) {
|
|
11
|
+
try {
|
|
12
|
+
return yaml.load(await fs.readFile(filePath, 'utf8'));
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
throw new ParseError(`Failed to read YAML from ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
export async function loadLightdashModel(filePath) {
|
|
19
|
+
const parsed = await readYaml(filePath);
|
|
20
|
+
if (!validateModel(parsed)) {
|
|
21
|
+
throw new ParseError(`Invalid Lightdash model in ${filePath}: ${ajv.errorsText(validateModel.errors)}`);
|
|
22
|
+
}
|
|
23
|
+
return parsed;
|
|
24
|
+
}
|
|
25
|
+
export async function findLightdashModelFiles(projectDir) {
|
|
26
|
+
const possibleDirs = [
|
|
27
|
+
path.join(projectDir, 'models'),
|
|
28
|
+
path.join(projectDir, 'lightdash', 'models'),
|
|
29
|
+
];
|
|
30
|
+
let modelsDir;
|
|
31
|
+
for await (const dir of possibleDirs) {
|
|
32
|
+
try {
|
|
33
|
+
if ((await fs.stat(dir)).isDirectory()) {
|
|
34
|
+
modelsDir = dir;
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (!(error instanceof Error &&
|
|
40
|
+
'code' in error &&
|
|
41
|
+
error.code === 'ENOENT'))
|
|
42
|
+
throw error;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (!modelsDir)
|
|
46
|
+
return [];
|
|
47
|
+
const relativeModelsDir = path.relative(await fs.realpath(projectDir), await fs.realpath(modelsDir));
|
|
48
|
+
if (relativeModelsDir === '..' ||
|
|
49
|
+
relativeModelsDir.startsWith(`..${path.sep}`) ||
|
|
50
|
+
path.isAbsolute(relativeModelsDir)) {
|
|
51
|
+
throw new ParseError('Native models directory must stay within the project directory');
|
|
52
|
+
}
|
|
53
|
+
const files = [];
|
|
54
|
+
async function walk(dir) {
|
|
55
|
+
const entries = await fs.readdir(dir, { withFileTypes: true });
|
|
56
|
+
entries.sort((a, b) => a.name.localeCompare(b.name));
|
|
57
|
+
for await (const entry of entries) {
|
|
58
|
+
const filePath = path.join(dir, entry.name);
|
|
59
|
+
if (entry.isDirectory()) {
|
|
60
|
+
await walk(filePath);
|
|
61
|
+
}
|
|
62
|
+
else if (entry.isFile() && /\.ya?ml$/.test(entry.name)) {
|
|
63
|
+
const parsed = await readYaml(filePath);
|
|
64
|
+
if (parsed &&
|
|
65
|
+
typeof parsed === 'object' &&
|
|
66
|
+
'type' in parsed &&
|
|
67
|
+
typeof parsed.type === 'string' &&
|
|
68
|
+
modelTypes.has(parsed.type))
|
|
69
|
+
files.push(filePath);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
await walk(modelsDir);
|
|
74
|
+
return files;
|
|
75
|
+
}
|
|
76
|
+
export async function loadLightdashModels(projectDir) {
|
|
77
|
+
const files = await findLightdashModelFiles(projectDir);
|
|
78
|
+
const models = [];
|
|
79
|
+
const names = new Map();
|
|
80
|
+
for await (const filePath of files) {
|
|
81
|
+
const model = await loadLightdashModel(filePath);
|
|
82
|
+
const sourcePath = path
|
|
83
|
+
.relative(projectDir, filePath)
|
|
84
|
+
.split(path.sep)
|
|
85
|
+
.join('/');
|
|
86
|
+
const previousPath = names.get(model.name);
|
|
87
|
+
if (previousPath !== undefined)
|
|
88
|
+
throw new ParseError(`Duplicate Lightdash model "${model.name}" in ${previousPath} and ${sourcePath}`);
|
|
89
|
+
names.set(model.name, sourcePath);
|
|
90
|
+
models.push({ ...model, sourcePath });
|
|
91
|
+
}
|
|
92
|
+
return models;
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lightdash/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader.test.d.ts","sourceRoot":"","sources":["../../../src/lightdash/loader.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import fs from 'fs/promises';
|
|
2
|
+
import os from 'os';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { compileLightdashModels } from '../compiler/compileLightdashModels';
|
|
5
|
+
import { warehouseClientMock } from '../compiler/exploreCompiler.mock';
|
|
6
|
+
import { isExploreError } from '../types/explore';
|
|
7
|
+
import { DEFAULT_SPOTLIGHT_CONFIG } from '../types/lightdashProjectConfig';
|
|
8
|
+
import { loadLightdashModels } from './loader';
|
|
9
|
+
const modelYaml = `type: model
|
|
10
|
+
name: orders
|
|
11
|
+
order_fields_by: label
|
|
12
|
+
sql_from: public.orders
|
|
13
|
+
dimensions:
|
|
14
|
+
- name: id
|
|
15
|
+
type: number
|
|
16
|
+
sql: id
|
|
17
|
+
`;
|
|
18
|
+
describe('native model loading and compilation', () => {
|
|
19
|
+
let projectDir;
|
|
20
|
+
beforeEach(async () => {
|
|
21
|
+
projectDir = await fs.mkdtemp(path.join(os.tmpdir(), 'native-models-'));
|
|
22
|
+
});
|
|
23
|
+
afterEach(async () => {
|
|
24
|
+
await fs.rm(projectDir, { recursive: true, force: true });
|
|
25
|
+
});
|
|
26
|
+
const writeModel = async (sourcePath, contents = modelYaml) => {
|
|
27
|
+
const filePath = path.join(projectDir, sourcePath);
|
|
28
|
+
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
29
|
+
await fs.writeFile(filePath, contents);
|
|
30
|
+
};
|
|
31
|
+
it.each(['models/nested/sales.yaml', 'lightdash/models/nested/sales.yml'])('preserves the actual source path %s through explore compilation', async (sourcePath) => {
|
|
32
|
+
await writeModel(sourcePath);
|
|
33
|
+
const models = await loadLightdashModels(projectDir);
|
|
34
|
+
const explores = await compileLightdashModels({
|
|
35
|
+
models,
|
|
36
|
+
warehouseSqlBuilder: warehouseClientMock,
|
|
37
|
+
lightdashProjectConfig: { spotlight: DEFAULT_SPOTLIGHT_CONFIG },
|
|
38
|
+
loadSources: true,
|
|
39
|
+
});
|
|
40
|
+
expect(explores).toHaveLength(1);
|
|
41
|
+
const explore = explores[0];
|
|
42
|
+
if (!explore || isExploreError(explore))
|
|
43
|
+
throw new Error('Expected compiled explore');
|
|
44
|
+
expect(explore.tables.orders.ymlPath).toBe(sourcePath);
|
|
45
|
+
expect(explore.tables.orders.orderFieldsBy).toBe('LABEL');
|
|
46
|
+
expect(explore.tables.orders.dimensions.id).toBeDefined();
|
|
47
|
+
});
|
|
48
|
+
it('prefers models/ over the legacy directory and ignores content YAML', async () => {
|
|
49
|
+
await writeModel('models/orders.yml');
|
|
50
|
+
await writeModel('models/space.yml', 'type: space\nname: My space\n');
|
|
51
|
+
await writeModel('lightdash/models/ignored.yml');
|
|
52
|
+
expect((await loadLightdashModels(projectDir)).map((model) => model.sourcePath)).toEqual(['models/orders.yml']);
|
|
53
|
+
});
|
|
54
|
+
it.each(['type: model\nname: broken\n', 'type: model\ndimensions: ['])('rejects invalid YAML instead of deploying only the remaining models', async (contents) => {
|
|
55
|
+
await writeModel('models/orders.yml');
|
|
56
|
+
await writeModel('models/broken.yml', contents);
|
|
57
|
+
await expect(loadLightdashModels(projectDir)).rejects.toThrow(/broken.yml/);
|
|
58
|
+
});
|
|
59
|
+
it('rejects duplicate model names and identifies both source files', async () => {
|
|
60
|
+
await writeModel('models/a.yml');
|
|
61
|
+
await writeModel('models/nested/b.yml');
|
|
62
|
+
await expect(loadLightdashModels(projectDir)).rejects.toThrow('Duplicate Lightdash model "orders" in models/a.yml and models/nested/b.yml');
|
|
63
|
+
});
|
|
64
|
+
it('rejects a models directory symlink that leaves the project', async () => {
|
|
65
|
+
const nestedProject = path.join(projectDir, 'nested-project');
|
|
66
|
+
await writeModel('outside/orders.yml');
|
|
67
|
+
await fs.mkdir(nestedProject);
|
|
68
|
+
await fs.symlink(path.join(projectDir, 'outside'), path.join(nestedProject, 'models'));
|
|
69
|
+
await expect(loadLightdashModels(nestedProject)).rejects.toThrow('within the project directory');
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
//# sourceMappingURL=loader.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader.test.js","sourceRoot":"","sources":["../../../src/lightdash/loader.test.ts"],"names":[],"mappings":"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"}
|