@gaias/client_node 1.1.1 → 1.1.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yamls.d.ts","sourceRoot":"","sources":["../../src/restclient/Yamls.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,
|
|
1
|
+
{"version":3,"file":"Yamls.d.ts","sourceRoot":"","sources":["../../src/restclient/Yamls.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,GAoBzC,CAAC"}
|
package/dist/restclient/Yamls.js
CHANGED
|
@@ -8,17 +8,18 @@ const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const mergeJSON = require('merge-json');
|
|
10
10
|
const loadConfig = (name) => {
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const configFile = `./cfg/${name}.yml`;
|
|
11
|
+
const baseConfigFile = `./cfg/${name}.yml`;
|
|
12
|
+
const localConfigFile = `./cfg/${name}.local.yml`;
|
|
14
13
|
let config = {};
|
|
15
|
-
if (fs_1.default.existsSync(
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
if (fs_1.default.existsSync(baseConfigFile)) {
|
|
15
|
+
console.log(`loadConfig base configFile: ${baseConfigFile}`);
|
|
16
|
+
const baseConfig = js_yaml_1.default.load(fs_1.default.readFileSync(baseConfigFile, 'utf8'));
|
|
17
|
+
Object.assign(config, baseConfig);
|
|
18
18
|
}
|
|
19
|
-
if (fs_1.default.existsSync(
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
if (process.env.NODE_ENV === 'development' && fs_1.default.existsSync(localConfigFile)) {
|
|
20
|
+
console.log(`loadConfig local configFile: ${localConfigFile} (development mode)`);
|
|
21
|
+
const localConfig = js_yaml_1.default.load(fs_1.default.readFileSync(localConfigFile, 'utf8'));
|
|
22
|
+
config = mergeJSON.merge(config, localConfig);
|
|
22
23
|
}
|
|
23
24
|
return config;
|
|
24
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yamls.js","sourceRoot":"","sources":["../../src/restclient/Yamls.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA2B;AAC3B,4CAAoB;AACpB,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEjC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAO,EAAE;IAC5C,MAAM,
|
|
1
|
+
{"version":3,"file":"Yamls.js","sourceRoot":"","sources":["../../src/restclient/Yamls.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA2B;AAC3B,4CAAoB;AACpB,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEjC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAO,EAAE;IAC5C,MAAM,cAAc,GAAG,SAAS,IAAI,MAAM,CAAC;IAC3C,MAAM,eAAe,GAAG,SAAS,IAAI,YAAY,CAAC;IAClD,IAAI,MAAM,GAAG,EAAE,CAAC;IAGhB,IAAI,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,+BAA+B,cAAc,EAAE,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAGD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,IAAI,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,gCAAgC,eAAe,qBAAqB,CAAC,CAAC;QAClF,MAAM,WAAW,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;QACxE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AApBW,QAAA,UAAU,cAoBrB"}
|