@lightdash/common 0.1834.1 → 0.1834.2
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/schemas/json/lightdash-project-config-1.0.json +1 -0
- package/dist/cjs/utils/loadLightdashProjectConfig.d.ts.map +1 -1
- package/dist/cjs/utils/loadLightdashProjectConfig.js +11 -4
- package/dist/cjs/utils/loadLightdashProjectConfig.js.map +1 -1
- package/dist/esm/schemas/json/lightdash-project-config-1.0.json +1 -0
- package/dist/esm/utils/loadLightdashProjectConfig.d.ts.map +1 -1
- package/dist/esm/utils/loadLightdashProjectConfig.js +11 -4
- package/dist/esm/utils/loadLightdashProjectConfig.js.map +1 -1
- package/dist/tsconfig.types.tsbuildinfo +1 -1
- package/dist/types/utils/loadLightdashProjectConfig.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLightdashProjectConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"loadLightdashProjectConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,iCAAiC,CAAC;AAKzC,eAAO,MAAM,0BAA0B,qBACjB,MAAM,aACb,CAAC,MAAM,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,KAC7D,OAAO,CAAC,sBAAsB,CAuChC,CAAC"}
|
|
@@ -8,13 +8,20 @@ const yaml = tslib_1.__importStar(require("js-yaml"));
|
|
|
8
8
|
const lightdash_project_config_1_0_json_1 = tslib_1.__importDefault(require("../schemas/json/lightdash-project-config-1.0.json"));
|
|
9
9
|
const errors_1 = require("../types/errors");
|
|
10
10
|
const lightdashProjectConfig_1 = require("../types/lightdashProjectConfig");
|
|
11
|
+
const defaultConfig = {
|
|
12
|
+
spotlight: lightdashProjectConfig_1.DEFAULT_SPOTLIGHT_CONFIG,
|
|
13
|
+
};
|
|
11
14
|
const loadLightdashProjectConfig = async (yamlFileContents, onLoaded) => {
|
|
12
15
|
if (yamlFileContents.trim() === '') {
|
|
13
|
-
return
|
|
14
|
-
spotlight: lightdashProjectConfig_1.DEFAULT_SPOTLIGHT_CONFIG,
|
|
15
|
-
};
|
|
16
|
+
return defaultConfig;
|
|
16
17
|
}
|
|
17
|
-
|
|
18
|
+
// Type assertion for the loaded YAML config
|
|
19
|
+
const loadedConfig = yaml.load(yamlFileContents);
|
|
20
|
+
// Merge the loaded config with the default config
|
|
21
|
+
const configFile = {
|
|
22
|
+
...defaultConfig,
|
|
23
|
+
...loadedConfig,
|
|
24
|
+
};
|
|
18
25
|
const ajv = new ajv_1.default({ coerceTypes: true });
|
|
19
26
|
const validate = ajv.compile(lightdash_project_config_1_0_json_1.default);
|
|
20
27
|
if (!validate(configFile)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLightdashProjectConfig.js","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":";;;;AAAA,sDAAsB;AACtB,kFAAgD;AAChD,sDAAgC;AAChC,kIAA6F;AAC7F,4CAA6C;AAC7C,4EAGyC;
|
|
1
|
+
{"version":3,"file":"loadLightdashProjectConfig.js","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":";;;;AAAA,sDAAsB;AACtB,kFAAgD;AAChD,sDAAgC;AAChC,kIAA6F;AAC7F,4CAA6C;AAC7C,4EAGyC;AAEzC,MAAM,aAAa,GAA2B;IAC1C,SAAS,EAAE,iDAAwB;CACtC,CAAC;AACK,MAAM,0BAA0B,GAAG,KAAK,EAC3C,gBAAwB,EACxB,QAA4D,EAC7B,EAAE;IACjC,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC;IACzB,CAAC;IACD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC1B,gBAAgB,CACgB,CAAC;IACrC,kDAAkD;IAClD,MAAM,UAAU,GAA2B;QACvC,GAAG,aAAa;QAChB,GAAG,YAAY;KAClB,CAAC;IACF,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CACxB,2CAA4B,CAC/B,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,IAAA,2BAAe,EAC1B,2CAA4B,EAC5B,UAAU,EACV,QAAQ,CAAC,MAAM,IAAI,EAAE,EACrB,EAAE,MAAM,EAAE,CAAC,EAAE,CAChB,CAAC;QACF,MAAM,IAAI,mBAAU,CAChB,8CAA8C,MAAM,EAAE,CACzD,CAAC;IACN,CAAC;IAED,IAAI,UAAU,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAChC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AA1CW,QAAA,0BAA0B,8BA0CrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLightdashProjectConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"loadLightdashProjectConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,iCAAiC,CAAC;AAKzC,eAAO,MAAM,0BAA0B,qBACjB,MAAM,aACb,CAAC,MAAM,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,KAC7D,OAAO,CAAC,sBAAsB,CAuChC,CAAC"}
|
|
@@ -4,13 +4,20 @@ import * as yaml from 'js-yaml';
|
|
|
4
4
|
import lightdashProjectConfigSchema from '../schemas/json/lightdash-project-config-1.0.json';
|
|
5
5
|
import { ParseError } from '../types/errors';
|
|
6
6
|
import { DEFAULT_SPOTLIGHT_CONFIG, } from '../types/lightdashProjectConfig';
|
|
7
|
+
const defaultConfig = {
|
|
8
|
+
spotlight: DEFAULT_SPOTLIGHT_CONFIG,
|
|
9
|
+
};
|
|
7
10
|
export const loadLightdashProjectConfig = async (yamlFileContents, onLoaded) => {
|
|
8
11
|
if (yamlFileContents.trim() === '') {
|
|
9
|
-
return
|
|
10
|
-
spotlight: DEFAULT_SPOTLIGHT_CONFIG,
|
|
11
|
-
};
|
|
12
|
+
return defaultConfig;
|
|
12
13
|
}
|
|
13
|
-
|
|
14
|
+
// Type assertion for the loaded YAML config
|
|
15
|
+
const loadedConfig = yaml.load(yamlFileContents);
|
|
16
|
+
// Merge the loaded config with the default config
|
|
17
|
+
const configFile = {
|
|
18
|
+
...defaultConfig,
|
|
19
|
+
...loadedConfig,
|
|
20
|
+
};
|
|
14
21
|
const ajv = new Ajv({ coerceTypes: true });
|
|
15
22
|
const validate = ajv.compile(lightdashProjectConfigSchema);
|
|
16
23
|
if (!validate(configFile)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLightdashProjectConfig.js","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACH,wBAAwB,GAE3B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC3C,gBAAwB,EACxB,QAA4D,EAC7B,EAAE;IACjC,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACjC,OAAO
|
|
1
|
+
{"version":3,"file":"loadLightdashProjectConfig.js","sourceRoot":"","sources":["../../../src/utils/loadLightdashProjectConfig.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACH,wBAAwB,GAE3B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,aAAa,GAA2B;IAC1C,SAAS,EAAE,wBAAwB;CACtC,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC3C,gBAAwB,EACxB,QAA4D,EAC7B,EAAE;IACjC,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC;IACzB,CAAC;IACD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC1B,gBAAgB,CACgB,CAAC;IACrC,kDAAkD;IAClD,MAAM,UAAU,GAA2B;QACvC,GAAG,aAAa;QAChB,GAAG,YAAY;KAClB,CAAC;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CACxB,4BAA4B,CAC/B,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,eAAe,CAC1B,4BAA4B,EAC5B,UAAU,EACV,QAAQ,CAAC,MAAM,IAAI,EAAE,EACrB,EAAE,MAAM,EAAE,CAAC,EAAE,CAChB,CAAC;QACF,MAAM,IAAI,UAAU,CAChB,8CAA8C,MAAM,EAAE,CACzD,CAAC;IACN,CAAC;IAED,IAAI,UAAU,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAChC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC"}
|