@gaias/basenode 1.0.8 → 1.0.9
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/utils/YamlUtil.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.loadConfig = void 0;
|
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const glob_promise_1 = __importDefault(require("glob-promise"));
|
|
9
9
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
10
|
-
const
|
|
10
|
+
const mergeJSON = require('merge-json');
|
|
11
11
|
const configFiles = [];
|
|
12
12
|
const find = (path) => {
|
|
13
13
|
return configFiles.find((f) => f === `${path}.yml`);
|
|
@@ -35,7 +35,7 @@ const loadConfig = (name) => {
|
|
|
35
35
|
const file = find(configFile);
|
|
36
36
|
if (file) {
|
|
37
37
|
const config = js_yaml_1.default.load(fs_1.default.readFileSync(file, 'utf8'));
|
|
38
|
-
cfg =
|
|
38
|
+
cfg = mergeJSON.merge(cfg, config);
|
|
39
39
|
}
|
|
40
40
|
return cfg;
|
|
41
41
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlUtil.js","sourceRoot":"","sources":["../../../src/utils/YamlUtil.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gEAAgC;AAChC,sDAA2B;AAG3B,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACxC,MAAM,WAAW,GAAa,EAAE,CAAC;AAEjC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE;IAC5B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC;AACtD,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,IAAY,EAAO,EAAE;IAC9C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,sBAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9D;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClC,MAAM,aAAa,GAAG,SAAS,IAAI,IAAI,WAAW,EAAE,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,SAAS,IAAI,EAAE,CAAC;IACnC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,IAAI,OAAO,EAAE;QACX,MAAM,SAAS,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;KAC/B;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,IAAI,QAAQ,EAAE;QACZ,MAAM,UAAU,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;KAChC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,IAAI,IAAI,EAAE;QACR,MAAM,MAAM,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACxD,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"YamlUtil.js","sourceRoot":"","sources":["../../../src/utils/YamlUtil.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gEAAgC;AAChC,sDAA2B;AAG3B,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACxC,MAAM,WAAW,GAAa,EAAE,CAAC;AAEjC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE;IAC5B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC;AACtD,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,IAAY,EAAO,EAAE;IAC9C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,sBAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9D;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClC,MAAM,aAAa,GAAG,SAAS,IAAI,IAAI,WAAW,EAAE,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,SAAS,IAAI,EAAE,CAAC;IACnC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,IAAI,OAAO,EAAE;QACX,MAAM,SAAS,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;KAC/B;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,IAAI,QAAQ,EAAE;QACZ,MAAM,UAAU,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;KAChC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,IAAI,IAAI,EAAE;QACR,MAAM,MAAM,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACxD,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA3BW,QAAA,UAAU,cA2BrB"}
|