tego 1.3.54-alpha.7 → 1.3.54-alpha.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/lib/utils.js +6 -2
- package/package.json +16 -16
- package/src/utils.ts +7 -2
package/lib/utils.js
CHANGED
|
@@ -212,7 +212,7 @@ function convertEnvToSettings(flatEnv) {
|
|
|
212
212
|
};
|
|
213
213
|
for (const key in flatEnv) {
|
|
214
214
|
const value = flatEnv[key];
|
|
215
|
-
if (value === void 0) continue;
|
|
215
|
+
if (value === void 0 || value === "") continue;
|
|
216
216
|
if (key.startsWith("LOGGER_")) {
|
|
217
217
|
const subKey = key.replace("LOGGER_", "").toLowerCase();
|
|
218
218
|
if (subKey === "transport") {
|
|
@@ -235,7 +235,11 @@ function convertEnvToSettings(flatEnv) {
|
|
|
235
235
|
settings.database.ssl = settings.database.ssl || {};
|
|
236
236
|
settings.database.ssl[sslKey] = value;
|
|
237
237
|
} else {
|
|
238
|
-
|
|
238
|
+
if (subKey === "logging" || subKey === "underscored") {
|
|
239
|
+
settings.database[subKey] = value === "true";
|
|
240
|
+
} else {
|
|
241
|
+
settings.database[subKey] = value;
|
|
242
|
+
}
|
|
239
243
|
}
|
|
240
244
|
continue;
|
|
241
245
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tego",
|
|
3
|
-
"version": "1.3.54-alpha.
|
|
3
|
+
"version": "1.3.54-alpha.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"tego",
|
|
@@ -49,21 +49,21 @@
|
|
|
49
49
|
"umzug": "3.8.2",
|
|
50
50
|
"winston": "3.17.0",
|
|
51
51
|
"winston-daily-rotate-file": "^5.0.0",
|
|
52
|
-
"@tachybase/acl": "1.3.54-alpha.
|
|
53
|
-
"@tachybase/actions": "1.3.54-alpha.
|
|
54
|
-
"@tachybase/
|
|
55
|
-
"@tachybase/
|
|
56
|
-
"@tachybase/
|
|
57
|
-
"@tachybase/
|
|
58
|
-
"@tachybase/
|
|
59
|
-
"@tachybase/
|
|
60
|
-
"@tachybase/
|
|
61
|
-
"@tachybase/
|
|
62
|
-
"@tachybase/resourcer": "1.3.54-alpha.
|
|
63
|
-
"@
|
|
64
|
-
"@tachybase/
|
|
65
|
-
"@
|
|
66
|
-
"@tego/server": "1.3.54-alpha.
|
|
52
|
+
"@tachybase/acl": "1.3.54-alpha.9",
|
|
53
|
+
"@tachybase/actions": "1.3.54-alpha.9",
|
|
54
|
+
"@tachybase/auth": "1.3.54-alpha.9",
|
|
55
|
+
"@tachybase/cache": "1.3.54-alpha.9",
|
|
56
|
+
"@tachybase/data-source": "1.3.54-alpha.9",
|
|
57
|
+
"@tachybase/evaluators": "1.3.54-alpha.9",
|
|
58
|
+
"@tachybase/database": "1.3.54-alpha.9",
|
|
59
|
+
"@tachybase/loader": "1.3.54-alpha.9",
|
|
60
|
+
"@tachybase/logger": "1.3.54-alpha.9",
|
|
61
|
+
"@tachybase/globals": "1.3.54-alpha.9",
|
|
62
|
+
"@tachybase/resourcer": "1.3.54-alpha.9",
|
|
63
|
+
"@tachybase/schema": "1.3.54-alpha.9",
|
|
64
|
+
"@tachybase/utils": "1.3.54-alpha.9",
|
|
65
|
+
"@tego/core": "1.3.54-alpha.9",
|
|
66
|
+
"@tego/server": "1.3.54-alpha.9"
|
|
67
67
|
},
|
|
68
68
|
"devDependencies": {
|
|
69
69
|
"@types/lodash": "4.17.20",
|
package/src/utils.ts
CHANGED
|
@@ -224,7 +224,7 @@ export function convertEnvToSettings(flatEnv: Record<string, string | undefined>
|
|
|
224
224
|
// LOGGER_
|
|
225
225
|
for (const key in flatEnv) {
|
|
226
226
|
const value = flatEnv[key];
|
|
227
|
-
if (value === undefined) continue;
|
|
227
|
+
if (value === undefined || value === '') continue;
|
|
228
228
|
|
|
229
229
|
if (key.startsWith('LOGGER_')) {
|
|
230
230
|
const subKey = key.replace('LOGGER_', '').toLowerCase();
|
|
@@ -251,7 +251,12 @@ export function convertEnvToSettings(flatEnv: Record<string, string | undefined>
|
|
|
251
251
|
settings.database.ssl = settings.database.ssl || {};
|
|
252
252
|
settings.database.ssl[sslKey] = value;
|
|
253
253
|
} else {
|
|
254
|
-
|
|
254
|
+
// Convert boolean-like strings to actual boolean
|
|
255
|
+
if (subKey === 'logging' || subKey === 'underscored') {
|
|
256
|
+
settings.database[subKey] = value === 'true';
|
|
257
|
+
} else {
|
|
258
|
+
settings.database[subKey] = value;
|
|
259
|
+
}
|
|
255
260
|
}
|
|
256
261
|
continue;
|
|
257
262
|
}
|