@reldens/cms 0.13.0 → 0.15.0

package/lib/installer.js

@@ -5,7 +5,7 @@
  */
 
 const { FileHandler, Encryptor } = require('@reldens/server-utils');
-const { DriversMap, EntitiesGenerator, PrismaSchemaGenerator } = require('@reldens/storage');
+const { DriversMap, DriversClassMap, EntitiesGenerator, PrismaSchemaGenerator } = require('@reldens/storage');
 const { EntitiesLoader } = require('./entities-loader');
 const { Logger, sc } = require('@reldens/utils');
 
@@ -244,21 +244,65 @@ class Installer
 
     async generateEntities(server, isOverride = false)
     {
+        let driverType = sc.get(DriversClassMap, server.constructor.name, '');
+        Logger.debug('Driver type detected: '+driverType+', Server constructor: '+server.constructor.name);
+        if('prisma' === driverType){
+            let dbConfig = this.extractDbConfigFromServer(server);
+            Logger.debug('Extracted DB config:', dbConfig);
+            if(dbConfig){
+                let generatedPrismaSchema = await this.generatePrismaSchema(dbConfig);
+                if(!generatedPrismaSchema){
+                    Logger.error('Could not generate Prisma schema for entities generation.');
+                    return false;
+                }
+                Logger.info('Generated Prisma schema for entities generation.');
+            }
+        }
         let generator = new EntitiesGenerator({server, projectPath: this.projectRoot, isOverride});
         let success = await generator.generate();
         if(!success){
             Logger.error('Entities generation failed.');
             return false;
         }
-        Logger.info('Entities generation success.');
         return true;
     }
 
-    async generatePrismaSchema(connectionData)
+    extractDbConfigFromServer(server)
     {
+        let config = sc.get(server, 'config');
+        if(!config){
+            Logger.warning('Could not extract database config from server.');
+            return false;
+        }
+        let dbConfig = {
+            client: sc.get(server, 'client', 'mysql'),
+            config: {
+                host: sc.get(config, 'host', 'localhost'),
+                port: sc.get(config, 'port', 3306),
+                database: sc.get(config, 'database', ''),
+                user: sc.get(config, 'user', ''),
+                password: sc.get(config, 'password', ''),
+                multipleStatements: true
+            },
+            debug: false
+        };
+        Logger.debug('Extracted DB config structure:', {
+            client: dbConfig.client,
+            host: dbConfig.config.host,
+            database: dbConfig.config.database
+        });
+        return dbConfig;
+    }
+
+    async generatePrismaSchema(connectionData, useDataProxy = false)
+    {
+        if(!connectionData){
+            Logger.error('Missing "connectionData" to generate Prisma Schema.');
+            return false;
+        }
         let generator = new PrismaSchemaGenerator({
             ...connectionData,
-            dataProxy: true,
+            dataProxy: useDataProxy,
             prismaSchemaPath: this.projectRoot+'/prisma'
         });
         let success = await generator.generate();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.13.0",
+    "version": "0.15.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -34,8 +34,8 @@
     },
     "dependencies": {
         "@reldens/server-utils": "^0.18.0",
-        "@reldens/storage": "^0.49.0",
-        "@reldens/utils": "^0.49.0",
+        "@reldens/storage": "^0.51.0",
+        "@reldens/utils": "^0.50.0",
         "dotenv": "^16.5.0",
         "mustache": "^4.2.0"
     }