@reldens/cms 0.85.0 → 0.86.0

package/lib/mysql-installer.js

@@ -1,104 +1,104 @@
-/**
- *
- * Reldens - CMS - MySQLInstaller
- *
- */
-
-const { execSync } = require('child_process');
-const { FileHandler } = require('@reldens/server-utils');
-const { Logger, sc } = require('@reldens/utils');
-const { PrismaSchemaGenerator, PrismaClientLoader } = require('@reldens/storage');
-
-class MySQLInstaller
-{
-
-    static migrationFiles()
-    {
-        return {
-            'install-cms-tables': 'install.sql',
-            'install-user-auth': 'users-authentication.sql',
-            'install-default-user': 'default-user.sql',
-            'install-default-homepage': 'default-homepage.sql',
-            'install-default-blocks': 'default-blocks.sql',
-            'install-entity-access': 'default-entity-access.sql',
-            'install-dynamic-forms': 'default-forms.sql',
-            'install-seo-files': 'default-sitemaps-and-robots.sql'
-        };
-    }
-
-    static async executeQueryFile(isMarked, fileName, dbDriver, migrationsPath)
-    {
-        if('on' !== isMarked){
-            return '';
-        }
-        let sqlFileContent = FileHandler.readFile(FileHandler.joinPaths(migrationsPath, fileName));
-        if(!sqlFileContent){
-            Logger.error('SQL file "'+fileName+'" not found.');
-            return '/?error=sql-file-not-found&file-name='+fileName;
-        }
-        let queryExecutionResult = await dbDriver.rawQuery(sqlFileContent);
-        if(!queryExecutionResult){
-            Logger.error('SQL file "'+fileName+'" raw execution failed.');
-            return '/?error=sql-file-execution-error&file-name='+fileName;
-        }
-        Logger.info('SQL file "'+fileName+'" raw execution successfully.');
-        return '';
-    }
-
-    static normalizePrismaProvider(client)
-    {
-        if(-1 !== client.indexOf('mysql')){
-            return 'mysql';
-        }
-        if('postgresql' === client || 'postgres' === client){
-            return 'postgresql';
-        }
-        if('mongodb' === client){
-            return 'mongodb';
-        }
-        return client;
-    }
-
-    static buildMinimalSchemaContent(provider)
-    {
-        return 'generator client {\n  provider = "prisma-client-js"\n  output = "./client"\n}\n\n'
-            +'datasource db {\n  provider = "'+provider+'"\n}';
-    }
-
-    static async generateMinimalPrismaClient(dbConfig, projectRoot)
-    {
-        PrismaSchemaGenerator.ensureStubFiles(projectRoot);
-        let generator = new PrismaSchemaGenerator({
-            ...dbConfig,
-            config: sc.get(dbConfig, 'config', dbConfig),
-            clientOutputPath: FileHandler.joinPaths(projectRoot, 'prisma', 'client'),
-            prismaSchemaPath: FileHandler.joinPaths(projectRoot, 'prisma')
-        });
-        FileHandler.createFolder(FileHandler.joinPaths(projectRoot, 'prisma'));
-        FileHandler.writeFile(
-            FileHandler.joinPaths(projectRoot, 'prisma', 'schema.prisma'),
-            MySQLInstaller.buildMinimalSchemaContent(
-                MySQLInstaller.normalizePrismaProvider(sc.get(dbConfig, 'client', 'mysql'))
-            )
-        );
-        generator.setDatabaseEnvironmentVariables();
-        generator.generateConfigFile();
-        Logger.info('Running prisma generate...');
-        try {
-            execSync('npx prisma generate', { stdio: 'inherit', cwd: projectRoot });
-        } catch(error) {
-            Logger.error('Prisma generate failed: '+error.message);
-            return false;
-        }
-        let { PrismaClient } = require(FileHandler.joinPaths(projectRoot, 'prisma', 'client'));
-        return PrismaClientLoader.createWithAdapter(PrismaClient, process.env.DATABASE_URL) || false;
-    }
-
-    static createPrismaClient(projectRoot)
-    {
-        return PrismaClientLoader.load(projectRoot, null, null);
-    }
-
-}
-
-module.exports.MySQLInstaller = MySQLInstaller;
+/**
+ *
+ * Reldens - CMS - MySQLInstaller
+ *
+ */
+
+const { execSync } = require('child_process');
+const { ManagerServicesInitializer } = require('./manager-services-initializer');
+const { FileHandler } = require('@reldens/server-utils');
+const { Logger, sc } = require('@reldens/utils');
+const { PrismaSchemaGenerator } = require('@reldens/storage');
+
+class MySQLInstaller
+{
+
+    static migrationFiles()
+    {
+        return {
+            'install-cms-tables': 'install.sql',
+            'install-user-auth': 'users-authentication.sql',
+            'install-default-user': 'default-user.sql',
+            'install-default-homepage': 'default-homepage.sql',
+            'install-default-blocks': 'default-blocks.sql',
+            'install-entity-access': 'default-entity-access.sql',
+            'install-dynamic-forms': 'default-forms.sql',
+            'install-seo-files': 'default-sitemaps-and-robots.sql'
+        };
+    }
+
+    static async executeQueryFile(isMarked, fileName, dbDriver, migrationsPath)
+    {
+        if('on' !== isMarked){
+            return '';
+        }
+        let sqlFileContent = FileHandler.readFile(FileHandler.joinPaths(migrationsPath, fileName));
+        if(!sqlFileContent){
+            Logger.error('SQL file "'+fileName+'" not found.');
+            return '/?error=sql-file-not-found&file-name='+fileName;
+        }
+        let queryExecutionResult = await dbDriver.rawQuery(sqlFileContent);
+        if(!queryExecutionResult){
+            Logger.error('SQL file "'+fileName+'" raw execution failed.');
+            return '/?error=sql-file-execution-error&file-name='+fileName;
+        }
+        Logger.info('SQL file "'+fileName+'" raw execution successfully.');
+        return '';
+    }
+
+    static normalizePrismaProvider(client)
+    {
+        if(-1 !== client.indexOf('mysql')){
+            return 'mysql';
+        }
+        if('postgresql' === client || 'postgres' === client){
+            return 'postgresql';
+        }
+        if('mongodb' === client){
+            return 'mongodb';
+        }
+        return client;
+    }
+
+    static buildMinimalSchemaContent(provider)
+    {
+        return 'generator client {\n  provider = "prisma-client-js"\n  output = "./client"\n}\n\n'
+            +'datasource db {\n  provider = "'+provider+'"\n}';
+    }
+
+    static async generateMinimalPrismaClient(dbConfig, projectRoot, prismaAdapter, prismaAdapterClass)
+    {
+        PrismaSchemaGenerator.ensureStubFiles(projectRoot);
+        let generator = new PrismaSchemaGenerator({
+            ...dbConfig,
+            config: sc.get(dbConfig, 'config', dbConfig),
+            clientOutputPath: FileHandler.joinPaths(projectRoot, 'prisma', 'client'),
+            prismaSchemaPath: FileHandler.joinPaths(projectRoot, 'prisma')
+        });
+        FileHandler.createFolder(FileHandler.joinPaths(projectRoot, 'prisma'));
+        FileHandler.writeFile(
+            FileHandler.joinPaths(projectRoot, 'prisma', 'schema.prisma'),
+            MySQLInstaller.buildMinimalSchemaContent(
+                MySQLInstaller.normalizePrismaProvider(sc.get(dbConfig, 'client', 'mysql'))
+            )
+        );
+        generator.setDatabaseEnvironmentVariables();
+        generator.generateConfigFile();
+        Logger.info('Running prisma generate...');
+        try {
+            execSync('npx prisma generate', { stdio: 'inherit', cwd: projectRoot });
+        } catch(error) {
+            Logger.error('Prisma generate failed: '+error.message);
+            return false;
+        }
+        return MySQLInstaller.createPrismaClient(projectRoot, prismaAdapter, prismaAdapterClass);
+    }
+
+    static createPrismaClient(projectRoot, prismaAdapter, prismaAdapterClass)
+    {
+        return ManagerServicesInitializer.loadPrismaModules(projectRoot, null, null, prismaAdapter, prismaAdapterClass);
+    }
+
+}
+
+module.exports.MySQLInstaller = MySQLInstaller;

package/lib/prisma-subprocess-worker.js

@@ -46,12 +46,17 @@ class PrismaSubprocessWorker
         let projectRoot = sc.get(message, 'projectRoot', './');
         PrismaSchemaGenerator.ensureStubFiles(projectRoot);
         let { MySQLInstaller } = require('./mysql-installer');
-        let generatedClient = await MySQLInstaller.generateMinimalPrismaClient(dbConfig, projectRoot);
-        if(!generatedClient){
+        let generatedModules = await MySQLInstaller.generateMinimalPrismaClient(
+            dbConfig,
+            projectRoot,
+            sc.get(message, 'prismaAdapter', '@prisma/adapter-mariadb'),
+            sc.get(message, 'prismaAdapterClass', 'PrismaMariaDb')
+        );
+        if(!generatedModules){
             this.sendErrorResponse('Failed to generate Prisma client.');
             return;
         }
-        dbConfig.prismaClient = generatedClient;
+        dbConfig.prismaModules = generatedModules;
         let { DriversMap } = require('@reldens/storage');
         let driverClass = DriversMap['prisma'];
         if(!driverClass){
@@ -77,7 +82,7 @@ class PrismaSubprocessWorker
                 return;
             }
         }
-        await generatedClient.$disconnect();
+        await generatedModules.client.$disconnect();
         this.sendSuccessResponse('Subprocess installation completed.');
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.85.0",
+    "version": "0.86.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -34,9 +34,9 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.56.0",
-        "@reldens/storage": "^0.112.0",
-        "@reldens/utils": "^0.57.0",
+        "@reldens/server-utils": "^0.57.0",
+        "@reldens/storage": "^0.116.0",
+        "@reldens/utils": "^0.58.0",
         "dotenv": "17.4.2",
         "mustache": "4.2.0"
     }

package/templates/.env.dist

@@ -7,6 +7,8 @@ RELDENS_DB_NAME={{&dbName}}
 RELDENS_DB_USER={{&dbUser}}
 RELDENS_DB_PASSWORD={{&dbPassword}}
 RELDENS_DB_URL={{&dbClient}}://{{&dbUser}}:{{&dbPassword}}@{{&dbHost}}:{{&dbPort}}/{{&dbName}}
+RELDENS_PRISMA_ADAPTER={{&prismaAdapter}}
+RELDENS_PRISMA_ADAPTER_CLASS={{&prismaAdapterClass}}
 
 # Admin Panel Configuration
 RELDENS_ADMIN_ROUTE_PATH={{&adminPath}}

package/templates/index.js.dist

@@ -1,30 +1,30 @@
-/**
- *
- * Reldens - CMS
- *
- */
-
-const { Manager } = require('@reldens/cms');
-const { Logger } = require('@reldens/utils');
-const { rawRegisteredEntities, entitiesConfig, entitiesTranslations } = require('./generated-entities/models/{{driverKey}}/registered-models-{{driverKey}}');
-{{&prismaClientImports}}
-
-let manager = new Manager({
-    projectRoot: __dirname,
-    rawRegisteredEntities,
-    entitiesConfig,
-    entitiesTranslations{{&prismaClientParam}}
-});
-Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
-
-manager.start().then((result) => {
-    if(!result){
-        Logger.info('Reldens CMS started by command failed.');
-        return false;
-    }
-    Logger.info('Reldens CMS started by command.');
-    return true;
-}).catch((error) => {
-    Logger.critical('Failed to start CMS: ' + error.message);
-    process.exit();
-});
+/**
+ *
+ * Reldens - CMS
+ *
+ */
+
+const { Manager } = require('@reldens/cms');
+const { Logger } = require('@reldens/utils');
+const { rawRegisteredEntities, entitiesConfig, entitiesTranslations } = require('./generated-entities/models/{{driverKey}}/registered-models-{{driverKey}}');
+{{&prismaClientImports}}
+
+let manager = new Manager({
+    projectRoot: __dirname,
+    rawRegisteredEntities,
+    entitiesConfig,
+    entitiesTranslations{{&prismaClientParam}}
+});
+Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
+
+manager.start().then((result) => {
+    if(!result){
+        Logger.info('Reldens CMS started by command failed.');
+        return false;
+    }
+    Logger.info('Reldens CMS started by command.');
+    return true;
+}).catch((error) => {
+    Logger.critical('Failed to start CMS: ' + error.message);
+    process.exit();
+});