@jsnw/srv-utils 1.0.9 → 1.0.10
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/config/config-loader.js +18 -8
- package/package.json +1 -1
|
@@ -110,15 +110,25 @@ class ConfigLoader {
|
|
|
110
110
|
const node = nodesToVisit[i];
|
|
111
111
|
if (typeof node !== 'object' || Array.isArray(node))
|
|
112
112
|
continue;
|
|
113
|
-
if (node['$include']
|
|
114
|
-
const
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
113
|
+
if (node['$include']) {
|
|
114
|
+
const $includePaths = [];
|
|
115
|
+
if (typeof node['$include'] === 'string') {
|
|
116
|
+
$includePaths.push(node['$include']);
|
|
117
|
+
}
|
|
118
|
+
else if (Array.isArray(node['$include'])) {
|
|
119
|
+
$includePaths.push(...(node['$include']
|
|
120
|
+
.filter(v => v && typeof v === 'string' && v.trim() !== '')));
|
|
118
121
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
+
delete node['$include'];
|
|
123
|
+
for (const path of $includePaths) {
|
|
124
|
+
const [loadedYaml, loadError] = this.loadYamlFile(this.resolveIncludePath(mainYamlDirname, path));
|
|
125
|
+
if (loadError) {
|
|
126
|
+
errors.push(loadError);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
for (const [k, v] of Object.entries(loadedYaml))
|
|
130
|
+
node[k] = v;
|
|
131
|
+
}
|
|
122
132
|
}
|
|
123
133
|
}
|
|
124
134
|
for (const k of Object.keys(node)) {
|
package/package.json
CHANGED