@reldens/storage 0.49.0 → 0.50.0

package/lib/entities-generator.js

@@ -100,7 +100,7 @@ class EntitiesGenerator
             Logger.critical('Failed to write entity file: '+filePath);
             return false;
         }
-        Logger.info('Generated entity file: '+filePath);
+        Logger.info('Generated entity file: '+fileName);
         this.generatedEntities[tableName] = {
             entityClassName,
             entityFileName: fileName,
@@ -347,10 +347,10 @@ class EntitiesGenerator
         }
         let filePath = FileHandler.joinPaths(driverFolder, fileName);
         if(!FileHandler.writeFile(filePath, modelContent)){
-            Logger.critical('Failed to write model file: '+filePath);
+            Logger.critical('Failed to write model file: '+fileName);
             return false;
         }
-        Logger.info('Generated model file: '+filePath);
+        Logger.info('Generated model file: '+fileName);
         this.generatedEntities[tableName].modelClassName = modelClassName;
         this.generatedEntities[tableName].modelFileName = fileName;
         this.generatedEntities[tableName].driverKey = driverKey;
@@ -437,6 +437,14 @@ class EntitiesGenerator
     }
 
     generateEntitiesConfigFile()
+    {
+        if(this.isOverride){
+            return this.regenerateEntitiesConfigFile();
+        }
+        return this.appendToEntitiesConfigFile();
+    }
+
+    regenerateEntitiesConfigFile()
     {
         let configTemplateContent = FileHandler.fetchFileContents(this.templates['entities-config']);
         if(!configTemplateContent) {
@@ -455,7 +463,66 @@ class EntitiesGenerator
             Logger.critical('Failed to write entities config file: '+this.entitiesConfigPath);
             return false;
         }
-        Logger.info('Generated entities config file: '+this.entitiesConfigPath);
+        Logger.info('Regenerated entities config file: '+this.entitiesConfigPath);
+        return true;
+    }
+
+    appendToEntitiesConfigFile()
+    {
+        if(0 === Object.keys(this.generatedEntities).length){
+            return true;
+        }
+        if(!FileHandler.exists(this.entitiesConfigPath)){
+            Logger.error('Entities config file does not exist, cannot append new entities.');
+            return false;
+        }
+        let existingContent = FileHandler.readFile(this.entitiesConfigPath);
+        if(!existingContent){
+            Logger.error('Could not read existing entities config file.');
+            return false;
+        }
+        let newRequires = [];
+        let newConfigs = [];
+        for(let tableName of Object.keys(this.generatedEntities)){
+            let entity = this.generatedEntities[tableName];
+            let entityClassName = sc.get(entity, 'entityClassName', sc.capitalizedCamelCase(tableName)+'Entity');
+            let entityFileName = sc.get(entity, 'entityFileName', sc.kebabCase(tableName)+'-entity').replace('.js', '');
+            let requireStatement = 'const { '+ entityClassName+' } = require(\'./entities/'+entityFileName+'\');';
+            let configEntry = sc.camelCase(tableName)+': '+entityClassName+'.propertiesConfig()';
+            if(!existingContent.includes(requireStatement)){
+                newRequires.push(requireStatement);
+            }
+            if(!existingContent.includes(sc.camelCase(tableName)+':')){
+                newConfigs.push(configEntry);
+            }
+        }
+        if(0 === newRequires.length && 0 === newConfigs.length){
+            return true;
+        }
+        let firstRequirePosition = existingContent.indexOf('const {');
+        let entitiesConfigEnd = existingContent.indexOf('};\n\nmodule.exports');
+        if(-1 === firstRequirePosition || -1 === entitiesConfigEnd){
+            Logger.error('Could not find insertion points in config file.');
+            return false;
+        }
+        let beforeFirstRequire = existingContent.substring(0, firstRequirePosition);
+        let afterFirstRequire = existingContent.substring(firstRequirePosition, entitiesConfigEnd);
+        let updatedContent = beforeFirstRequire;
+        if(0 < newRequires.length){
+            updatedContent += newRequires.join('\n') + '\n';
+        }
+        updatedContent += afterFirstRequire;
+        if(0 < newConfigs.length){
+            if(!afterFirstRequire.trim().endsWith(',')){
+                updatedContent = updatedContent.trimEnd() + ',';
+            }
+            updatedContent += '\n    ' + newConfigs.join(',\n    ') + '\n';
+        }
+        updatedContent += existingContent.substring(entitiesConfigEnd);
+        if(!FileHandler.writeFile(this.entitiesConfigPath, updatedContent)){
+            Logger.error('Failed to append to entities config file: '+this.entitiesConfigPath);
+            return false;
+        }
         return true;
     }
 
@@ -487,6 +554,14 @@ class EntitiesGenerator
     }
 
     generateEntitiesTranslationsFile()
+    {
+        if(this.isOverride){
+            return this.regenerateEntitiesTranslationsFile();
+        }
+        return this.appendToEntitiesTranslationsFile();
+    }
+
+    regenerateEntitiesTranslationsFile()
     {
         let translationsTemplatePath = this.templates['entities-translations'];
         if(!FileHandler.exists(translationsTemplatePath)){
@@ -506,7 +581,52 @@ class EntitiesGenerator
             Logger.critical('Failed to write entities translations file: '+this.entitiesTranslationsPath);
             return false;
         }
-        Logger.info('Generated entities translations file: '+this.entitiesTranslationsPath);
+        Logger.info('Regenerated entities translations file: '+this.entitiesTranslationsPath);
+        return true;
+    }
+
+    appendToEntitiesTranslationsFile()
+    {
+        if(0 === Object.keys(this.generatedEntities).length){
+            return true;
+        }
+        if(!FileHandler.exists(this.entitiesTranslationsPath)){
+            Logger.error('Entities translations file does not exist, cannot append new entities.');
+            return false;
+        }
+        let existingContent = FileHandler.readFile(this.entitiesTranslationsPath);
+        if(!existingContent){
+            Logger.error('Could not read existing translations file.');
+            return false;
+        }
+        let newTranslations = [];
+        for(let tableName of Object.keys(this.generatedEntities)){
+            if(!existingContent.includes('\''+tableName+'\':')){
+                newTranslations.push(
+                    '\''+tableName+'\': \''
+                    +tableName.split('_').map(word => word.charAt(0).toUpperCase()+word.slice(1)).join(' ')+'\''
+                );
+            }
+        }
+        if(0 === newTranslations.length){
+            return true;
+        }
+        let labelsEnd = existingContent.indexOf('\n    }\n');
+        if(-1 === existingContent.indexOf('labels: {') || -1 === labelsEnd){
+            Logger.error('Could not find labels object boundaries in existing translations file.');
+            return false;
+        }
+        let beforeLabelsEnd = existingContent.substring(0, labelsEnd);
+        if(!beforeLabelsEnd.trim().endsWith(',')){
+            beforeLabelsEnd = beforeLabelsEnd.trimEnd() + ',';
+        }
+        if(!FileHandler.writeFile(
+            this.entitiesTranslationsPath,
+            beforeLabelsEnd + '\n        ' + newTranslations.join(',\n        ') + existingContent.substring(labelsEnd)
+        )){
+            Logger.error('Failed to append to entities translations file: '+this.entitiesTranslationsPath);
+            return false;
+        }
         return true;
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.49.0",
+    "version": "0.50.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -42,12 +42,12 @@
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
     "dependencies": {
-        "@mikro-orm/core": "^6.4.15",
-        "@mikro-orm/mongodb": "^6.4.15",
-        "@mikro-orm/mysql": "^6.4.15",
+        "@mikro-orm/core": "^6.4.16",
+        "@mikro-orm/mongodb": "^6.4.16",
+        "@mikro-orm/mysql": "^6.4.16",
         "@prisma/client": "^6.8.2",
         "@reldens/server-utils": "^0.18.0",
-        "@reldens/utils": "^0.49.0",
+        "@reldens/utils": "^0.50.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
         "mysql2": "^3.14.1",