@reldens/cms 0.64.0 → 0.66.0

package/lib/mysql-installer.js

@@ -1,108 +1,104 @@
-/**
- *
- * Reldens - CMS - MySQLInstaller
- *
- */
-
-const { execSync } = require('child_process');
-const { FileHandler } = require('@reldens/server-utils');
-const { Logger, sc } = require('@reldens/utils');
-
-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 async generateMinimalPrismaClient(dbConfig, projectRoot)
-    {
-        let prismaPath = FileHandler.joinPaths(projectRoot, 'prisma');
-        let schemaPath = FileHandler.joinPaths(prismaPath, 'schema.prisma');
-        FileHandler.createFolder(prismaPath);
-        let provider = MySQLInstaller.normalizePrismaProvider(sc.get(dbConfig, 'client', 'mysql'));
-        let schemaContent = 'generator client {\n'
-            + '  provider = "prisma-client-js"\n'
-            + '  output = "./client"\n'
-            + '}\n'
-            + '\n'
-            + 'datasource db {\n'
-            + '  provider = "'+provider+'"\n'
-            + '  url = env("RELDENS_DB_URL")\n'
-            + '}';
-        FileHandler.writeFile(schemaPath, schemaContent);
-        Logger.info('Running prisma generate...');
-        try {
-            execSync('npx prisma generate', { stdio: 'inherit', cwd: projectRoot });
-            let clientPath = FileHandler.joinPaths(projectRoot, 'prisma', 'client');
-            let { PrismaClient } = require(clientPath);
-            return new PrismaClient();
-        } catch(error) {
-            Logger.error('Prisma generate failed: '+error.message);
-            return false;
-        }
-    }
-
-    static async createPrismaClient(projectRoot)
-    {
-        try {
-            let clientPath = FileHandler.joinPaths(projectRoot, 'prisma', 'client');
-            if(!FileHandler.exists(clientPath)){
-                return false;
-            }
-            const { PrismaClient } = require(clientPath);
-            let client = new PrismaClient();
-            await client.$connect();
-            return client;
-        } catch(error){
-            Logger.error('Prisma client creation failed: '+error.message);
-            return false;
-        }
-    }
-
-}
-
-module.exports.MySQLInstaller = MySQLInstaller;
+/**
+ *
+ * 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;

package/lib/prisma-subprocess-worker.js

@@ -4,10 +4,8 @@
  *
  */
 
-const { DriversMap } = require('@reldens/storage');
-const { MySQLInstaller } = require('./mysql-installer');
-const { Logger } = require('@reldens/utils');
-const { sc } = require('@reldens/utils');
+const { PrismaSchemaGenerator } = require('@reldens/storage/lib/prisma/prisma-schema-generator');
+const { Logger, sc } = require('@reldens/utils');
 
 class PrismaSubprocessWorker
 {
@@ -25,18 +23,18 @@ class PrismaSubprocessWorker
             } catch(error) {
                 Logger.error('PrismaSubprocessWorker error: '+error.message);
                 this.sendErrorResponse(error.message);
-                setTimeout(() => process.exit(1), 100);
+                process.exit(1);
             }
         });
         process.on('uncaughtException', (error) => {
             Logger.error('PrismaSubprocessWorker uncaught exception: '+error.message);
             this.sendErrorResponse(error.message);
-            setTimeout(() => process.exit(1), 100);
+            process.exit(1);
         });
         process.on('unhandledRejection', (error) => {
             Logger.error('PrismaSubprocessWorker unhandled rejection: '+error.message);
             this.sendErrorResponse(error.message);
-            setTimeout(() => process.exit(1), 100);
+            process.exit(1);
         });
     }
 
@@ -46,12 +44,15 @@ class PrismaSubprocessWorker
         let templateVariables = sc.get(message, 'templateVariables', {});
         let migrationsPath = sc.get(message, 'migrationsPath', './migrations');
         let projectRoot = sc.get(message, 'projectRoot', './');
+        PrismaSchemaGenerator.ensureStubFiles(projectRoot);
+        let { MySQLInstaller } = require('./mysql-installer');
         let generatedClient = await MySQLInstaller.generateMinimalPrismaClient(dbConfig, projectRoot);
         if(!generatedClient){
             this.sendErrorResponse('Failed to generate Prisma client.');
             return;
         }
         dbConfig.prismaClient = generatedClient;
+        let { DriversMap } = require('@reldens/storage');
         let driverClass = DriversMap['prisma'];
         if(!driverClass){
             this.sendErrorResponse('Prisma driver class not found.');

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.64.0",
+    "version": "0.66.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -35,7 +35,7 @@
     },
     "dependencies": {
         "@reldens/server-utils": "^0.50.0",
-        "@reldens/storage": "^0.96.0",
+        "@reldens/storage": "^0.97.0",
         "@reldens/utils": "^0.56.0",
         "dotenv": "17.4.2",
         "mustache": "4.2.0"

package/.claude/hook-approvals.json

@@ -1 +0,0 @@
-{}