@reldens/storage 0.47.0 → 0.49.0

package/lib/entities-generator.js

@@ -44,7 +44,9 @@ class EntitiesGenerator
         };
         this.server = sc.get(props, 'server', false);
         this.connectionData = sc.get(props, 'connectionData', false);
+        this.isOverride = sc.get(props, 'isOverride', false);
         this.generatedEntities = {};
+        this.existingEntities = {};
     }
 
     async generateEntityFile(tableName, tableData)
@@ -193,6 +195,10 @@ class EntitiesGenerator
             props.push('type: \'datetime\'');
             return;
         }
+        if('text' === type || 'longtext' === type || 'mediumtext' === type || 'tinytext' === type){
+            props.push('type: \'textarea\'');
+            return;
+        }
         if('tinyint' === type){
             props.push('type: \'boolean\'');
             return;
@@ -291,16 +297,6 @@ class EntitiesGenerator
         return passwordFields;
     }
 
-    getEditPropertiesRemoval(fieldsToRemove)
-    {
-        if(1 === fieldsToRemove.length){
-            return 'let editProperties = [...propertiesKeys];\n        editProperties.splice(editProperties.indexOf(\''+
-                fieldsToRemove[0]
-                +'\'), 1);';
-        }
-        return 'let editProperties = sc.removeFromArray([...propertiesKeys], [\''+fieldsToRemove.join('\', \'')+'\']);';
-    }
-
     getListPropertiesDeclaration(columns)
     {
         let fieldsToRemove = this.getFieldsToRemoveFromList(columns);
@@ -402,26 +398,60 @@ class EntitiesGenerator
         return '';
     }
 
-    generateEntitiesConfigFile()
+    detectExistingEntities()
     {
-        let configTemplatePath = this.templates['entities-config'];
-        if(!FileHandler.exists(configTemplatePath)){
-            Logger.critical('Entities config template file not found: '+configTemplatePath);
-            return false;
+        if(!FileHandler.exists(this.entitiesFolder)){
+            return;
+        }
+        let entityFiles = FileHandler.getFilesInFolder(this.entitiesFolder, ['.js']);
+        for(let file of entityFiles){
+            if(!file.endsWith('-entity.js')){
+                continue;
+            }
+            let tableName = file.replace('-entity.js', '').replace(/-/g, '_');
+            this.existingEntities[tableName] = {entityFileName: file, tableName};
         }
-        let configTemplateContent = FileHandler.fetchFileContents(configTemplatePath);
+        Logger.info('Detected '+Object.keys(this.existingEntities).length+' existing entities.');
+    }
+
+    filterTablesToGenerate(tables)
+    {
+        if(this.isOverride){
+            return tables;
+        }
+        let filteredTables = {};
+        let newTablesCount = 0;
+        for(let tableName of Object.keys(tables)){
+            if(!this.existingEntities[tableName]){
+                filteredTables[tableName] = tables[tableName];
+                newTablesCount++;
+            }
+        }
+        if(0 === newTablesCount){
+            Logger.info('No new tables found. All entities are up to date.');
+        }
+        if(0 < newTablesCount){
+            Logger.info('Found '+newTablesCount+' new tables to generate entities for.');
+        }
+        return filteredTables;
+    }
+
+    generateEntitiesConfigFile()
+    {
+        let configTemplateContent = FileHandler.fetchFileContents(this.templates['entities-config']);
         if(!configTemplateContent) {
-            Logger.critical('Failed to read entities config template file: '+configTemplatePath);
+            Logger.critical('Failed to read entities config template file: '+this.templates['entities-config']);
             return false;
         }
-        let requireStatements = this.getRequireStatements();
-        let entitiesConfigExport = this.getEntitiesConfigExport();
+        let allEntities = Object.assign({}, this.existingEntities, this.generatedEntities);
         let replacements = {
-            requireStatements,
-            entitiesConfigExport
+            requireStatements: this.getRequireStatements(allEntities),
+            entitiesConfigExport: this.getEntitiesConfigExport(allEntities)
         };
-        let configContent = this.applyReplacements(configTemplateContent, replacements);
-        if (!FileHandler.writeFile(this.entitiesConfigPath, configContent)){
+        if(!FileHandler.writeFile(
+            this.entitiesConfigPath,
+            this.applyReplacements(configTemplateContent, replacements)
+        )){
             Logger.critical('Failed to write entities config file: '+this.entitiesConfigPath);
             return false;
         }
@@ -429,25 +459,29 @@ class EntitiesGenerator
         return true;
     }
 
-    getRequireStatements()
+    getRequireStatements(allEntities)
     {
         let requireStatements = [];
-        for(let tableName of Object.keys(this.generatedEntities)){
-            let entity = this.generatedEntities[tableName];
-            let nameWithoutExtension = entity.entityFileName.replace('.js', '');
+        for(let tableName of Object.keys(allEntities)){
+            let entity = allEntities[tableName];
+            let entityClassName = sc.get(entity, 'entityClassName', sc.capitalizedCamelCase(tableName)+'Entity');
+            let entityFileName = sc.get(entity, 'entityFileName', sc.kebabCase(tableName)+'-entity').replace('.js', '');
             requireStatements.push(
-                'const { '+ entity.entityClassName+' } = require(\'./entities/'+nameWithoutExtension+'\');'
+                'const { '+ entityClassName+' } = require(\'./entities/'+entityFileName+'\');'
             );
         }
         return requireStatements.join('\n');
     }
 
-    getEntitiesConfigExport()
+    getEntitiesConfigExport(allEntities)
     {
         let entitiesConfigExport = [];
-        for(let tableName of Object.keys(this.generatedEntities)){
-            let entity = this.generatedEntities[tableName];
-            entitiesConfigExport.push(sc.camelCase(tableName)+': '+entity.entityClassName+'.propertiesConfig()');
+        for(let tableName of Object.keys(allEntities)){
+            entitiesConfigExport.push(
+                sc.camelCase(tableName)+': '
+                +sc.get(allEntities[tableName], 'entityClassName', sc.capitalizedCamelCase(tableName)+'Entity')
+                +'.propertiesConfig()'
+            );
         }
         return entitiesConfigExport.join(',\n    ');
     }
@@ -464,8 +498,10 @@ class EntitiesGenerator
             Logger.critical('Failed to read entities translations template file: '+translationsTemplatePath);
             return false;
         }
-        let labels = this.getTranslationLabels();
-        let translationsContent = translationsTemplateContent.replace(/{{labels}}/g, labels);
+        let translationsContent = translationsTemplateContent.replace(
+            /{{labels}}/g,
+            this.getTranslationLabels(Object.assign({}, this.existingEntities, this.generatedEntities))
+        );
         if(!FileHandler.writeFile(this.entitiesTranslationsPath, translationsContent)){
             Logger.critical('Failed to write entities translations file: '+this.entitiesTranslationsPath);
             return false;
@@ -474,12 +510,15 @@ class EntitiesGenerator
         return true;
     }
 
-    getTranslationLabels()
+    getTranslationLabels(allEntities)
     {
         let labels = [];
-        for(let tableName of Object.keys(this.generatedEntities)){
-            let humanReadable = tableName.split('_').map(word => word.charAt(0).toUpperCase()+word.slice(1)).join(' ');
-            labels.push('\''+tableName+'\': \''+humanReadable+'\'');
+        for(let tableName of Object.keys(allEntities)){
+            labels.push(
+                '\''+tableName+'\': \''
+                +tableName.split('_').map(word => word.charAt(0).toUpperCase()+word.slice(1)).join(' ')
+                +'\''
+            );
         }
         return labels.join(',\n        ');
     }
@@ -496,9 +535,10 @@ class EntitiesGenerator
             Logger.critical('Failed to read registered models template file: '+registeredTemplatePath);
             return false;
         }
+        let allEntities = Object.assign({}, this.existingEntities, this.generatedEntities);
         let replacements = {
-            registeredModels: this.getRegisteredModels(driverKey),
-            registeredEntitiesObject: this.getRegisteredEntitiesObject(driverKey)
+            registeredModels: this.getRegisteredModels(allEntities, driverKey),
+            registeredEntitiesObject: this.getRegisteredEntitiesObject(allEntities, driverKey)
         };
         let registeredContent = this.applyReplacements(registeredTemplateContent, replacements);
         let driverFolder = FileHandler.joinPaths(this.modelsFolder, driverKey);
@@ -511,30 +551,33 @@ class EntitiesGenerator
         return true;
     }
 
-    getRegisteredModels(driverKey)
+    getRegisteredModels(allEntities, driverKey)
     {
         let registeredModels = [];
-        for(let tableName of Object.keys(this.generatedEntities)){
-            let entity = this.generatedEntities[tableName];
-            if(driverKey !== entity.driverKey){
+        for(let tableName of Object.keys(allEntities)){
+            let entity = allEntities[tableName];
+            if(entity.driverKey && driverKey !== entity.driverKey){
                 continue;
             }
+            let modelClassName = entity.modelClassName || sc.capitalizedCamelCase(tableName)+'Model';
+            let modelFileName = entity.modelFileName || sc.kebabCase(tableName)+'-model.js';
             registeredModels.push(
-                'const { '+entity.modelClassName+' } = require(\'./'+entity.modelFileName.replace('.js', '')+'\');'
+                'const { '+modelClassName+' } = require(\'./'+modelFileName.replace('.js', '')+'\');'
             );
         }
         return registeredModels.join('\n');
     }
 
-    getRegisteredEntitiesObject(driverKey)
+    getRegisteredEntitiesObject(allEntities, driverKey)
     {
         let registeredEntitiesObject = [];
-        for(let tableName of Object.keys(this.generatedEntities)){
-            let entity = this.generatedEntities[tableName];
-            if(driverKey !== entity.driverKey){
+        for(let tableName of Object.keys(allEntities)){
+            let entity = allEntities[tableName];
+            if(entity.driverKey && driverKey !== entity.driverKey){
                 continue;
             }
-            registeredEntitiesObject.push(sc.camelCase(tableName)+': '+entity.modelClassName);
+            let modelClassName = entity.modelClassName || sc.capitalizedCamelCase(tableName)+'Model';
+            registeredEntitiesObject.push(sc.camelCase(tableName)+': '+modelClassName);
         }
         return registeredEntitiesObject.join(',\n    ');
     }
@@ -567,6 +610,11 @@ class EntitiesGenerator
         if(!this.ensureFoldersExist()){
             return false;
         }
+        this.detectExistingEntities();
+        let tablesToGenerate = this.filterTablesToGenerate(tables);
+        if(0 === Object.keys(tablesToGenerate).length && !this.isOverride){
+            return true;
+        }
         let driverKey = sc.get(
             this.connectionData,
             'driver',
@@ -576,8 +624,8 @@ class EntitiesGenerator
             Logger.critical('Failed to fetch driver key.');
             return false;
         }
-        for(let tableName of Object.keys(tables)){
-            let tableData = tables[tableName];
+        for(let tableName of Object.keys(tablesToGenerate)){
+            let tableData = tablesToGenerate[tableName];
             await this.generateEntityFile(tableName, tableData);
             await this.generateModelFile(tableName, tableData, driverKey);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.47.0",
+    "version": "0.49.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",