@lightdash/common 2.397.2 → 2.398.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/lightdash/LightdashModelEditor.d.ts.map +1 -1
- package/dist/cjs/lightdash/LightdashModelEditor.js +12 -2
- package/dist/cjs/lightdash/LightdashModelEditor.js.map +1 -1
- package/dist/cjs/lightdash/loader.d.ts.map +1 -1
- package/dist/cjs/lightdash/loader.js +14 -4
- package/dist/cjs/lightdash/loader.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/lightdash/LightdashModelEditor.d.ts.map +1 -1
- package/dist/esm/lightdash/LightdashModelEditor.js +12 -2
- package/dist/esm/lightdash/LightdashModelEditor.js.map +1 -1
- package/dist/esm/lightdash/loader.d.ts.map +1 -1
- package/dist/esm/lightdash/loader.js +14 -4
- package/dist/esm/lightdash/loader.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/lightdash/LightdashModelEditor.d.ts.map +1 -1
- package/dist/types/lightdash/LightdashModelEditor.js +12 -2
- package/dist/types/lightdash/LightdashModelEditor.js.map +1 -1
- package/dist/types/lightdash/loader.d.ts.map +1 -1
- package/dist/types/lightdash/loader.js +14 -4
- package/dist/types/lightdash/loader.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightdashModelEditor.d.ts","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC7B,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEH,KAAK,uBAAuB,EAC/B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"LightdashModelEditor.d.ts","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC7B,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEH,KAAK,uBAAuB,EAC/B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAsB9D,yFAAyF;AACzF,qBAAa,oBAAoB;IAQzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;IAE/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IAExD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiC;IAE/D,YACqB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAIpC;IAED,OAAO,CAAC,QAAQ;IAWhB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,uBAAuB;IAqB/B,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAsBvD;IAED,4BAA4B,CACxB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,wBAAwB,EACtD,mBAAmB,EAAE,mBAAmB,GACzC,uBAAuB,CAiCzB;IAED,mBAAmB,CACf,UAAU,EAAE,wBAAwB,EAAE,EACtC,mBAAmB,EAAE,mBAAmB,GACzC,IAAI,CAWN;IAED,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;KAAE,GAAG,MAAM,CA0DpD;CACJ"}
|
|
@@ -9,8 +9,17 @@ const errors_1 = require("../types/errors");
|
|
|
9
9
|
const field_1 = require("../types/field");
|
|
10
10
|
const convertCustomDimensionsToYaml_1 = require("../utils/convertCustomDimensionsToYaml");
|
|
11
11
|
const convertCustomMetricToLightdash_1 = require("./convertCustomMetricToLightdash");
|
|
12
|
-
|
|
13
|
-
const
|
|
12
|
+
let modelValidator;
|
|
13
|
+
const getModelValidator = () => {
|
|
14
|
+
if (!modelValidator) {
|
|
15
|
+
const ajv = new ajv_1.default({ allErrors: true, strict: false });
|
|
16
|
+
modelValidator = {
|
|
17
|
+
ajv,
|
|
18
|
+
validate: ajv.compile(model_as_code_1_0_json_1.default),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
return modelValidator;
|
|
22
|
+
};
|
|
14
23
|
/** Edits the original native model document, preserving comments and unrelated nodes. */
|
|
15
24
|
class LightdashModelEditor {
|
|
16
25
|
constructor(contents, filename) {
|
|
@@ -23,6 +32,7 @@ class LightdashModelEditor {
|
|
|
23
32
|
}
|
|
24
33
|
validate() {
|
|
25
34
|
const model = this.doc.toJS();
|
|
35
|
+
const { ajv, validate } = getModelValidator();
|
|
26
36
|
if (this.doc.errors.length > 0 || !validate(model)) {
|
|
27
37
|
throw new errors_1.ParseError(`Invalid Lightdash model in ${this.filename}: ${this.doc.errors.map((error) => error.message).join('; ') || ajv.errorsText(validate.errors)}`);
|
|
28
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightdashModelEditor.js","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"LightdashModelEditor.js","sourceRoot":"","sources":["../../../src/lightdash/LightdashModelEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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;
|
|
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;AA4BjC,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CASzB;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"}
|
|
@@ -10,8 +10,17 @@ const yaml = tslib_1.__importStar(require("js-yaml"));
|
|
|
10
10
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
11
11
|
const model_as_code_1_0_json_1 = tslib_1.__importDefault(require("../schemas/json/model-as-code-1.0.json"));
|
|
12
12
|
const errors_1 = require("../types/errors");
|
|
13
|
-
|
|
14
|
-
const
|
|
13
|
+
let modelValidator;
|
|
14
|
+
const getModelValidator = () => {
|
|
15
|
+
if (!modelValidator) {
|
|
16
|
+
const ajv = new ajv_1.default({ allErrors: true, strict: false });
|
|
17
|
+
modelValidator = {
|
|
18
|
+
ajv,
|
|
19
|
+
validate: ajv.compile(model_as_code_1_0_json_1.default),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
return modelValidator;
|
|
23
|
+
};
|
|
15
24
|
const modelTypes = new Set(['model', 'model/v1beta', 'model/v1']);
|
|
16
25
|
async function readYaml(filePath) {
|
|
17
26
|
try {
|
|
@@ -23,8 +32,9 @@ async function readYaml(filePath) {
|
|
|
23
32
|
}
|
|
24
33
|
async function loadLightdashModel(filePath) {
|
|
25
34
|
const parsed = await readYaml(filePath);
|
|
26
|
-
|
|
27
|
-
|
|
35
|
+
const { ajv, validate } = getModelValidator();
|
|
36
|
+
if (!validate(parsed)) {
|
|
37
|
+
throw new errors_1.ParseError(`Invalid Lightdash model in ${filePath}: ${ajv.errorsText(validate.errors)}`);
|
|
28
38
|
}
|
|
29
39
|
return parsed;
|
|
30
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lightdash/loader.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lightdash/loader.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAiD;AACjD,mEAA6B;AAC7B,MAAY,IAAI,4CAAgB;AAChC,wDAAwB;AACxB,4GAAiE;AACjE,4CAA6C;AAS7C,IAAI,cAA0C,CAAC;AAC/C,MAAM,iBAAiB,GAAG,GAAmB,EAAE;IAC3C,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,cAAc,GAAG;YACb,GAAG;YACH,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAiB,gCAAW,CAAC;SACrD,CAAC;IACN,CAAC;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC,CAAC;AACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;AAElE,KAAK,UAAU,QAAQ,CAAC,QAAgB;IACpC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,mBAAU,CAChB,4BAA4B,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;IACN,CAAC;AACL,CAAC;AAEM,KAAK,6BACR,QAAgB;IAEhB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,mBAAU,CAChB,8BAA8B,QAAQ,KAAK,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAC/E,CAAC;IACN,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAEM,KAAK,kCACR,UAAkB;IAElB,MAAM,YAAY,GAAG;QACjB,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC;QAC/B,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC;KAC/C,CAAC;IACF,IAAI,SAA6B,CAAC;IAClC,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QACnC,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,kBAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrC,SAAS,GAAG,GAAG,CAAC;gBAChB,MAAM;YACV,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IACI,CAAC,CACG,KAAK,YAAY,KAAK;gBACtB,MAAM,IAAI,KAAK;gBACf,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC1B;gBAED,MAAM,KAAK,CAAC;QACpB,CAAC;IACL,CAAC;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAE1B,MAAM,iBAAiB,GAAG,cAAI,CAAC,QAAQ,CACnC,MAAM,kBAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC7B,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC/B,CAAC;IACF,IACI,iBAAiB,KAAK,IAAI;QAC1B,iBAAiB,CAAC,UAAU,CAAC,KAAK,cAAI,CAAC,GAAG,EAAE,CAAC;QAC7C,cAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EACpC,CAAC;QACC,MAAM,IAAI,mBAAU,CAChB,gEAAgE,CACnE,CAAC;IACN,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,UAAU,IAAI,CAAC,GAAW;QAC3B,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACxC,IACI,MAAM;oBACN,OAAO,MAAM,KAAK,QAAQ;oBAC1B,MAAM,IAAI,MAAM;oBAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;oBAC/B,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;oBAE3B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;IACD,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;IACtB,OAAO,KAAK,CAAC;AACjB,CAAC;AAEM,KAAK,8BACR,UAAkB;IAElB,MAAM,KAAK,GAAG,MAAM,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAA+B,EAAE,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,cAAI;aAClB,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC;aAC9B,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,YAAY,KAAK,SAAS;YAC1B,MAAM,IAAI,mBAAU,CAChB,8BAA8B,KAAK,CAAC,IAAI,QAAQ,YAAY,QAAQ,UAAU,EAAE,CACnF,CAAC;QACN,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|