@tachybase/database 1.3.52 → 1.3.54-alpha.0

package/lib/database.js

@@ -618,7 +618,7 @@ const _Database = class _Database extends import_node_events.EventEmitter {
       const result = await this.sequelize.query(`SHOW VARIABLES LIKE 'lower_case_table_names'`, { plain: true });
       if ((result == null ? void 0 : result.Value) === "1" && !this.options.underscored) {
         console.log(
-          `Your database lower_case_table_names=1, please add ${import_chalk.default.yellow("DB_UNDERSCORED=true")} to the .env file`
+          `Your database lower_case_table_names=1, please add ${import_chalk.default.yellow("database.underscored=true")} to the settings.js file`
         );
         process.exit();
       }

package/lib/helpers.js

@@ -33,11 +33,8 @@ __export(helpers_exports, {
 });
 module.exports = __toCommonJS(helpers_exports);
 var import_node_fs = __toESM(require("node:fs"));
+var import_globals = __toESM(require("@tachybase/globals"));
 var import_semver = __toESM(require("semver"));
-function getEnvValue(key, defaultValue) {
-  return process.env[key] || defaultValue;
-}
-__name(getEnvValue, "getEnvValue");
 function isFilePath(value) {
   return import_node_fs.default.promises.stat(value).then((stats) => stats.isFile()).catch((err) => {
     if (err.code === "ENOENT") {
@@ -47,29 +44,32 @@ function isFilePath(value) {
   });
 }
 __name(isFilePath, "isFilePath");
-function getValueOrFileContent(envVarName) {
-  const value = getEnvValue(envVarName);
+function getValueOrFileContent(value) {
   if (!value) {
     return Promise.resolve(null);
   }
+  if (typeof value === "boolean") {
+    return Promise.resolve(value);
+  }
   return isFilePath(value).then((isFile) => {
     if (isFile) {
       return import_node_fs.default.promises.readFile(value, "utf8");
     }
     return value;
   }).catch((error) => {
-    console.error(`Failed to read file content for environment variable ${envVarName}.`);
+    console.error(`Failed to read file content for value.`);
     throw error;
   });
 }
 __name(getValueOrFileContent, "getValueOrFileContent");
 function extractSSLOptionsFromEnv() {
+  var _a, _b, _c, _d, _e;
   return Promise.all([
-    getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_MODE"),
-    getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_CA"),
-    getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_KEY"),
-    getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_CERT"),
-    getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_REJECT_UNAUTHORIZED")
+    getValueOrFileContent((_a = import_globals.default.settings.database.ssl) == null ? void 0 : _a.mode),
+    getValueOrFileContent((_b = import_globals.default.settings.database.ssl) == null ? void 0 : _b.ca),
+    getValueOrFileContent((_c = import_globals.default.settings.database.ssl) == null ? void 0 : _c.key),
+    getValueOrFileContent((_d = import_globals.default.settings.database.ssl) == null ? void 0 : _d.cert),
+    getValueOrFileContent((_e = import_globals.default.settings.database.ssl) == null ? void 0 : _e.rejectUnauthorized)
   ]).then(([mode, ca, key, cert, rejectUnauthorized]) => {
     const sslOptions = {};
     if (mode) sslOptions["mode"] = mode;
@@ -83,18 +83,18 @@ function extractSSLOptionsFromEnv() {
 __name(extractSSLOptionsFromEnv, "extractSSLOptionsFromEnv");
 async function parseDatabaseOptionsFromEnv() {
   const databaseOptions = {
-    logging: process.env.DB_LOGGING === "on" ? customLogger : false,
-    dialect: process.env.DB_DIALECT,
-    storage: process.env.DB_STORAGE,
-    username: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    host: process.env.DB_HOST,
-    port: process.env.DB_PORT,
-    timezone: process.env.DB_TIMEZONE,
-    tablePrefix: process.env.DB_TABLE_PREFIX,
-    schema: process.env.DB_SCHEMA,
-    underscored: process.env.DB_UNDERSCORED === "true"
+    logging: import_globals.default.settings.database.logging ? customLogger : false,
+    dialect: import_globals.default.settings.database.dialect,
+    storage: import_globals.default.settings.database.storage,
+    username: import_globals.default.settings.database.user,
+    password: import_globals.default.settings.database.password,
+    database: import_globals.default.settings.database.database,
+    host: import_globals.default.settings.database.host,
+    port: import_globals.default.settings.database.port,
+    timezone: import_globals.default.settings.database.timezone,
+    tablePrefix: import_globals.default.settings.database.tablePrefix,
+    schema: import_globals.default.settings.database.schema,
+    underscored: import_globals.default.settings.database.underscored
   };
   const sslOptions = await extractSSLOptionsFromEnv();
   if (Object.keys(sslOptions).length) {

package/lib/mock-database.d.ts

@@ -3,21 +3,21 @@ export declare class MockDatabase extends Database {
     constructor(options: IDatabaseOptions);
 }
 export declare function getConfigByEnv(): {
-    username: string;
-    password: string;
-    database: string;
-    host: string;
-    port: string;
-    dialect: string;
+    username: any;
+    password: any;
+    database: any;
+    host: any;
+    port: any;
+    dialect: any;
     logging: boolean | typeof customLogger;
-    storage: string;
+    storage: any;
     define: {
         charset: string;
         collate: string;
     };
-    timezone: string;
-    underscored: boolean;
-    schema: string;
+    timezone: any;
+    underscored: any;
+    schema: any;
     dialectOptions: {};
 };
 declare function customLogger(queryString: any, queryObject: any): void;

package/lib/mock-database.js

@@ -34,9 +34,9 @@ __export(mock_database_exports, {
 });
 module.exports = __toCommonJS(mock_database_exports);
 var import_node_path = __toESM(require("node:path"));
+var import_globals = __toESM(require("@tachybase/globals"));
 var import_utils = require("@tachybase/utils");
 var import_nanoid = require("nanoid");
-var import_node_fetch = __toESM(require("node-fetch"));
 var import_database = require("./database");
 const _MockDatabase = class _MockDatabase extends import_database.Database {
   constructor(options) {
@@ -51,24 +51,24 @@ __name(_MockDatabase, "MockDatabase");
 let MockDatabase = _MockDatabase;
 function getConfigByEnv() {
   const options = {
-    username: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    host: process.env.DB_HOST,
-    port: process.env.DB_PORT,
-    dialect: process.env.DB_DIALECT || "sqlite",
-    logging: process.env.DB_LOGGING === "on" ? customLogger : false,
-    storage: process.env.DB_STORAGE,
+    username: import_globals.default.settings.database.user,
+    password: import_globals.default.settings.database.password,
+    database: import_globals.default.settings.database.database,
+    host: import_globals.default.settings.database.host,
+    port: import_globals.default.settings.database.port,
+    dialect: import_globals.default.settings.database.dialect,
+    logging: import_globals.default.settings.database.logging ? customLogger : false,
+    storage: import_globals.default.settings.database.storage,
     define: {
       charset: "utf8mb4",
       collate: "utf8mb4_unicode_ci"
     },
-    timezone: process.env.DB_TIMEZONE,
-    underscored: process.env.DB_UNDERSCORED === "true",
-    schema: process.env.DB_SCHEMA !== "public" ? process.env.DB_SCHEMA : void 0,
+    timezone: import_globals.default.settings.database.timezone,
+    underscored: import_globals.default.settings.database.underscored,
+    schema: import_globals.default.settings.database.schema,
     dialectOptions: {}
   };
-  if (process.env.DB_DIALECT === "postgres") {
+  if (import_globals.default.settings.database.dialect === "postgres") {
     options.dialectOptions["application_name"] = "tachybase.main";
   }
   return options;
@@ -110,7 +110,7 @@ function mockDatabase(options = {}) {
       dbOptions.hooks = dbOptions.hooks || {};
       dbOptions.hooks.beforeConnect = async (config) => {
         const url = `http://127.0.0.1:${process.env["DB_TEST_DISTRIBUTOR_PORT"]}/acquire?via=${db.instanceId}&name=${config.database}`;
-        await (0, import_node_fetch.default)(url);
+        await fetch(url);
       };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "1.3.52",
+  "version": "1.3.54-alpha.0",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -9,7 +9,7 @@
     "async-mutex": "^0.5.0",
     "chalk": "^4.1.2",
     "dayjs": "1.11.13",
-    "debug": "4.4.1",
+    "debug": "4.4.3",
     "deepmerge": "^4.3.1",
     "dottie": "2.0.6",
     "excel-date-to-js": "^1.1.5",
@@ -17,19 +17,20 @@
     "flat": "^5.0.2",
     "glob": "11.0.0",
     "lodash": "^4.17.21",
-    "nanoid": "^3.3.8",
-    "node-fetch": "^2.7.0",
+    "nanoid": "^3.3.11",
     "qs": "^6.14.0",
     "semver": "7.7.2",
-    "sequelize": "^6.37.5",
+    "sequelize": "^6.37.7",
     "umzug": "^3.8.2",
-    "@tachybase/logger": "1.3.52",
-    "@tachybase/utils": "1.3.52"
+    "@tachybase/logger": "1.3.54-alpha.0",
+    "@tachybase/globals": "1.3.54-alpha.0",
+    "@tachybase/utils": "1.3.54-alpha.0"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",
     "@types/glob": "^7.2.0",
     "@types/lodash": "^4.17.20",
-    "@types/semver": "7.7.0"
+    "@types/semver": "7.7.1",
+    "china-division": "^2.7.0"
   }
 }