tego 1.3.55-alpha.1 → 1.6.0-alpha.1

package/lib/constants.js

@@ -38,13 +38,16 @@ module.exports = __toCommonJS(constants_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_globals = __toESM(require("@tachybase/globals"));
+var import_lodash = __toESM(require("lodash"));
 var import_utils = require("./utils");
 (0, import_utils.parseEnvironment)();
 if (!import_node_fs.default.existsSync(`${process.env.TEGO_RUNTIME_HOME}/settings.js`)) {
   import_node_fs.default.mkdirSync(`${process.env.TEGO_RUNTIME_HOME}`, { recursive: true });
   import_node_fs.default.copyFileSync(import_node_path.default.join(__dirname, "../presets/settings.js"), `${process.env.TEGO_RUNTIME_HOME}/settings.js`);
 }
-import_globals.default.settings = require(`${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+const baseSettings = require(`${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+const envSettings = (0, import_utils.convertEnvToSettings)(process.env);
+import_globals.default.settings = import_lodash.default.merge({}, baseSettings, envSettings);
 for (const key in import_globals.default.settings.env) {
   if (!process.env[key]) {
     process.env[key] = import_globals.default.settings.env[key];

package/lib/utils.js

@@ -212,7 +212,7 @@ function convertEnvToSettings(flatEnv) {
   };
   for (const key in flatEnv) {
     const value = flatEnv[key];
-    if (value === void 0) continue;
+    if (value === void 0 || value === "") continue;
     if (key.startsWith("LOGGER_")) {
       const subKey = key.replace("LOGGER_", "").toLowerCase();
       if (subKey === "transport") {
@@ -235,7 +235,11 @@ function convertEnvToSettings(flatEnv) {
         settings.database.ssl = settings.database.ssl || {};
         settings.database.ssl[sslKey] = value;
       } else {
-        settings.database[subKey] = value;
+        if (subKey === "logging" || subKey === "underscored") {
+          settings.database[subKey] = value === "true";
+        } else {
+          settings.database[subKey] = value;
+        }
       }
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tego",
-  "version": "1.3.55-alpha.1",
+  "version": "1.6.0-alpha.1",
   "description": "",
   "keywords": [
     "tego",
@@ -49,21 +49,21 @@
     "umzug": "3.8.2",
     "winston": "3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "@tachybase/acl": "1.3.55-alpha.1",
-    "@tachybase/actions": "1.3.55-alpha.1",
-    "@tachybase/auth": "1.3.55-alpha.1",
-    "@tachybase/cache": "1.3.55-alpha.1",
-    "@tachybase/data-source": "1.3.55-alpha.1",
-    "@tachybase/database": "1.3.55-alpha.1",
-    "@tachybase/evaluators": "1.3.55-alpha.1",
-    "@tachybase/loader": "1.3.55-alpha.1",
-    "@tachybase/resourcer": "1.3.55-alpha.1",
-    "@tachybase/globals": "1.3.55-alpha.1",
-    "@tachybase/logger": "1.3.55-alpha.1",
-    "@tachybase/schema": "1.3.55-alpha.1",
-    "@tachybase/utils": "1.3.55-alpha.1",
-    "@tego/core": "1.3.55-alpha.1",
-    "@tego/server": "1.3.55-alpha.1"
+    "@tachybase/acl": "1.6.0-alpha.1",
+    "@tachybase/auth": "1.6.0-alpha.1",
+    "@tachybase/database": "1.6.0-alpha.1",
+    "@tachybase/evaluators": "1.6.0-alpha.1",
+    "@tachybase/cache": "1.6.0-alpha.1",
+    "@tachybase/data-source": "1.6.0-alpha.1",
+    "@tachybase/globals": "1.6.0-alpha.1",
+    "@tachybase/actions": "1.6.0-alpha.1",
+    "@tachybase/loader": "1.6.0-alpha.1",
+    "@tachybase/logger": "1.6.0-alpha.1",
+    "@tachybase/resourcer": "1.6.0-alpha.1",
+    "@tachybase/schema": "1.6.0-alpha.1",
+    "@tachybase/utils": "1.6.0-alpha.1",
+    "@tego/core": "1.6.0-alpha.1",
+    "@tego/server": "1.6.0-alpha.1"
   },
   "devDependencies": {
     "@types/lodash": "4.17.20",

package/src/constants.ts

@@ -2,7 +2,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import TachybaseGlobal from '@tachybase/globals';
 
-import { parseEnvironment } from './utils';
+import _ from 'lodash';
+
+import { convertEnvToSettings, parseEnvironment } from './utils';
 
 // 解析环境变量
 parseEnvironment();
@@ -12,7 +14,11 @@ if (!fs.existsSync(`${process.env.TEGO_RUNTIME_HOME}/settings.js`)) {
   fs.mkdirSync(`${process.env.TEGO_RUNTIME_HOME}`, { recursive: true });
   fs.copyFileSync(path.join(__dirname, '../presets/settings.js'), `${process.env.TEGO_RUNTIME_HOME}/settings.js`);
 }
-TachybaseGlobal.settings = require(`${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+const baseSettings = require(`${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+
+// 用环境变量覆盖 settings.js 的配置 (环境变量优先)
+const envSettings = convertEnvToSettings(process.env as any);
+TachybaseGlobal.settings = _.merge({}, baseSettings, envSettings);
 
 for (const key in TachybaseGlobal.settings.env) {
   if (!process.env[key]) {

package/src/utils.ts

@@ -224,7 +224,7 @@ export function convertEnvToSettings(flatEnv: Record<string, string | undefined>
   // LOGGER_
   for (const key in flatEnv) {
     const value = flatEnv[key];
-    if (value === undefined) continue;
+    if (value === undefined || value === '') continue;
 
     if (key.startsWith('LOGGER_')) {
       const subKey = key.replace('LOGGER_', '').toLowerCase();
@@ -251,7 +251,12 @@ export function convertEnvToSettings(flatEnv: Record<string, string | undefined>
         settings.database.ssl = settings.database.ssl || {};
         settings.database.ssl[sslKey] = value;
       } else {
-        settings.database[subKey] = value;
+        // Convert boolean-like strings to actual boolean
+        if (subKey === 'logging' || subKey === 'underscored') {
+          settings.database[subKey] = value === 'true';
+        } else {
+          settings.database[subKey] = value;
+        }
       }
       continue;
     }