opticore-installer 1.2.58 → 1.2.59

package/dist/index.cjs

@@ -546,9 +546,11 @@ var import_fs4 = __toESM(require("fs"), 1);
 var SUpdateEnv = class {
   arg;
   argumentConnection;
-  constructor(arg, argumentConnection) {
+  dbUrlScheme;
+  constructor(arg, argumentConnection, dbUrlScheme) {
     this.arg = arg;
     this.argumentConnection = argumentConnection;
+    this.dbUrlScheme = dbUrlScheme;
     this.__init();
   }
   /**
@@ -559,6 +561,7 @@ var SUpdateEnv = class {
     const envFileLines = import_fs4.default.readFileSync("config/env/.env", "utf8").split("\n");
     this.updateDatabaseSection(envFileLines, this.arg);
     this.updateArgConnexionSection(envFileLines, this.argumentConnection);
+    this.updateDatabaseUrlSection(envFileLines, this.arg, this.dbUrlScheme);
     import_fs4.default.writeFileSync("config/env/.env", envFileLines.join("\n"));
   }
   /**
@@ -614,12 +617,39 @@ var SUpdateEnv = class {
       envFileLines.splice(insertPosition, 0, `${targetKey}=${argumentConnection}`);
     }
   }
+  /**
+   * Derives DATABASE_URL from the DATA_BASE_* values so both stay consistent.
+   * Only touches the file when the DATABASE_URL key already exists there and a scheme
+   * (e.g. "postgres", "mysql", "mongodb") is known for the chosen database.
+   *
+   * @param envFileLines
+   * @param arg
+   * @param dbUrlScheme
+   * @protected
+   */
+  updateDatabaseUrlSection(envFileLines, arg, dbUrlScheme) {
+    if (!dbUrlScheme || !arg?.dbName) {
+      return;
+    }
+    const targetKey = "DATABASE_URL";
+    const index = envFileLines.findIndex((line) => {
+      const trimmed = line.trim();
+      return !trimmed.startsWith("#") && trimmed.split("=")[0] === targetKey;
+    });
+    if (index === -1) {
+      return;
+    }
+    const user = encodeURIComponent(arg.dbUser ?? "");
+    const pwd = encodeURIComponent(arg.dbPwd ?? "");
+    const databaseUrl = `${dbUrlScheme}://${user}:${pwd}@${arg.dbHost ?? ""}:${arg.dbPort ?? ""}/${arg.dbName}`;
+    envFileLines[index] = `${targetKey}=${databaseUrl}`;
+  }
 };
 
 // src/presentations/middlewares/templateProject/templateProject.middleware.ts
-var MTemplateProject = async (repoGit, projectPath, currentPath, callback, arg, projectName, argumentConnection) => {
+var MTemplateProject = async (repoGit, projectPath, currentPath, callback, arg, projectName, argumentConnection, dbUrlScheme) => {
   await SProjectCreation(repoGit, projectPath, currentPath, projectName);
-  new SUpdateEnv(arg, argumentConnection);
+  new SUpdateEnv(arg, argumentConnection, dbUrlScheme);
   await callback([]);
 };
 
@@ -855,7 +885,8 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               async () => await createMySQLDatabase(mysqlParams),
               envParams,
               projectName,
-              CConnectionProperties
+              CConnectionProperties,
+              "mysql"
             );
             break;
           }
@@ -874,7 +905,9 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               currentPath,
               async () => await createPostgresDatabase(postgresParams),
               envParams,
-              projectName
+              projectName,
+              void 0,
+              "postgres"
             );
             break;
           }
@@ -886,7 +919,9 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               currentPath,
               async () => await createMongoDatabase(mongoParams),
               envParams,
-              projectName
+              projectName,
+              void 0,
+              "mongodb"
             );
             break;
           }

package/dist/index.js

@@ -523,9 +523,11 @@ import fs4 from "fs";
 var SUpdateEnv = class {
   arg;
   argumentConnection;
-  constructor(arg, argumentConnection) {
+  dbUrlScheme;
+  constructor(arg, argumentConnection, dbUrlScheme) {
     this.arg = arg;
     this.argumentConnection = argumentConnection;
+    this.dbUrlScheme = dbUrlScheme;
     this.__init();
   }
   /**
@@ -536,6 +538,7 @@ var SUpdateEnv = class {
     const envFileLines = fs4.readFileSync("config/env/.env", "utf8").split("\n");
     this.updateDatabaseSection(envFileLines, this.arg);
     this.updateArgConnexionSection(envFileLines, this.argumentConnection);
+    this.updateDatabaseUrlSection(envFileLines, this.arg, this.dbUrlScheme);
     fs4.writeFileSync("config/env/.env", envFileLines.join("\n"));
   }
   /**
@@ -591,12 +594,39 @@ var SUpdateEnv = class {
       envFileLines.splice(insertPosition, 0, `${targetKey}=${argumentConnection}`);
     }
   }
+  /**
+   * Derives DATABASE_URL from the DATA_BASE_* values so both stay consistent.
+   * Only touches the file when the DATABASE_URL key already exists there and a scheme
+   * (e.g. "postgres", "mysql", "mongodb") is known for the chosen database.
+   *
+   * @param envFileLines
+   * @param arg
+   * @param dbUrlScheme
+   * @protected
+   */
+  updateDatabaseUrlSection(envFileLines, arg, dbUrlScheme) {
+    if (!dbUrlScheme || !arg?.dbName) {
+      return;
+    }
+    const targetKey = "DATABASE_URL";
+    const index = envFileLines.findIndex((line) => {
+      const trimmed = line.trim();
+      return !trimmed.startsWith("#") && trimmed.split("=")[0] === targetKey;
+    });
+    if (index === -1) {
+      return;
+    }
+    const user = encodeURIComponent(arg.dbUser ?? "");
+    const pwd = encodeURIComponent(arg.dbPwd ?? "");
+    const databaseUrl = `${dbUrlScheme}://${user}:${pwd}@${arg.dbHost ?? ""}:${arg.dbPort ?? ""}/${arg.dbName}`;
+    envFileLines[index] = `${targetKey}=${databaseUrl}`;
+  }
 };
 
 // src/presentations/middlewares/templateProject/templateProject.middleware.ts
-var MTemplateProject = async (repoGit, projectPath, currentPath, callback, arg, projectName, argumentConnection) => {
+var MTemplateProject = async (repoGit, projectPath, currentPath, callback, arg, projectName, argumentConnection, dbUrlScheme) => {
   await SProjectCreation(repoGit, projectPath, currentPath, projectName);
-  new SUpdateEnv(arg, argumentConnection);
+  new SUpdateEnv(arg, argumentConnection, dbUrlScheme);
   await callback([]);
 };
 
@@ -832,7 +862,8 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               async () => await createMySQLDatabase(mysqlParams),
               envParams,
               projectName,
-              CConnectionProperties
+              CConnectionProperties,
+              "mysql"
             );
             break;
           }
@@ -851,7 +882,9 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               currentPath,
               async () => await createPostgresDatabase(postgresParams),
               envParams,
-              projectName
+              projectName,
+              void 0,
+              "postgres"
             );
             break;
           }
@@ -863,7 +896,9 @@ var MSelectDB = async (projectPath, currentPath, projectName) => {
               currentPath,
               async () => await createMongoDatabase(mongoParams),
               envParams,
-              projectName
+              projectName,
+              void 0,
+              "mongodb"
             );
             break;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "opticore-installer",
-    "version": "1.2.58",
+    "version": "1.2.59",
     "description": "opticore framework installer",
     "main": "dist/index.js",
     "module": "dist/index.js",