@reldens/storage 0.44.0 → 0.45.0

package/lib/entities-generator.js

@@ -5,7 +5,7 @@
  */
 
 const { FileHandler } = require('@reldens/server-utils');
-const { ErrorManager, Logger, sc } = require('@reldens/utils');
+const { Logger, sc } = require('@reldens/utils');
 const { ObjectionJsDataServer } = require('./objection-js/objection-js-data-server');
 const { MikroOrmDataServer } = require('./mikro-orm/mikro-orm-data-server');
 const { PrismaDataServer } = require('./prisma/prisma-data-server');
@@ -61,7 +61,7 @@ class EntitiesGenerator
         }
         let entityClassName = sc.capitalizedCamelCase(tableName)+'Entity';
         let titleProperty = this.determineTitleProperty(tableData.columns);
-        for(let columnName in tableData.columns){
+        for(let columnName of Object.keys(tableData.columns)){
             tableData.columns[columnName].tableName = tableName;
         }
         let propertiesConfig = this.generatePropertiesConfig(tableData.columns, titleProperty);
@@ -76,16 +76,19 @@ class EntitiesGenerator
         }
         let editPropertiesRemoval = this.getEditPropertiesRemoval(fieldsToRemoveFromEdit);
         let listPropertiesDeclaration = this.getListPropertiesDeclaration(tableData.columns);
+        let showPropertiesDeclaration = this.getShowPropertiesDeclaration(tableData.columns);
         let needsSc = listPropertiesDeclaration.includes('sc.removeFromArray')
-            || editPropertiesRemoval.includes('sc.removeFromArray');
+            || editPropertiesRemoval.includes('sc.removeFromArray')
+            || showPropertiesDeclaration.includes('sc.removeFromArray');
         let scRequire = needsSc ? '\nconst { sc } = require(\'@reldens/utils\');' : '';
         let replacements = {
             entityClassName,
             propertiesConfig,
             titlePropertyDeclaration,
             titlePropertyReturn,
-            listPropertiesDeclaration,
+            showPropertiesDeclaration,
             editPropertiesRemoval,
+            listPropertiesDeclaration,
             scRequire
         };
         let entityContent = this.applyReplacements(entityTemplateContent, replacements);
@@ -105,14 +108,30 @@ class EntitiesGenerator
         return true;
     }
 
+    getFieldsToRemoveFromList(columns)
+    {
+        let fieldsToRemove = [];
+        for(let columnName of Object.keys(columns)){
+            let column = columns[columnName];
+            let type = column.type.toLowerCase();
+            if(['text', 'json', 'tinytext', 'mediumtext', 'longtext'].includes(type)){
+                fieldsToRemove.push(columnName);
+            }
+            if('password' === columnName.toLowerCase()){
+                fieldsToRemove.push(columnName);
+            }
+        }
+        return fieldsToRemove;
+    }
+
     getEditPropertiesRemoval(fieldsToRemove)
     {
         if(1 === fieldsToRemove.length){
-            return 'let editProperties = [...showProperties];\n        editProperties.splice(editProperties.indexOf(\''+
+            return 'let editProperties = [...propertiesKeys];\n        editProperties.splice(editProperties.indexOf(\''+
                 fieldsToRemove[0]
                 +'\'), 1);';
         }
-        return 'let editProperties = sc.removeFromArray([...showProperties], [\''+fieldsToRemove.join('\', \'')+'\']);';
+        return 'let editProperties = sc.removeFromArray([...propertiesKeys], [\''+fieldsToRemove.join('\', \'')+'\']);';
     }
 
     determineTitleProperty(columns)
@@ -135,7 +154,7 @@ class EntitiesGenerator
     generatePropertiesConfig(columns, titleProperty)
     {
         let propertiesConfig = [];
-        for(let columnName in columns){
+        for(let columnName of Object.keys(columns)){
             let column = columns[columnName];
             let propertyKey = titleProperty && columnName === titleProperty ? '[titleProperty]' : columnName;
             if('id' === columnName){
@@ -247,31 +266,53 @@ class EntitiesGenerator
         return refTableName;
     }
 
-    getListPropertiesDeclaration(columns)
+    getShowPropertiesDeclaration(columns)
     {
-        let fieldsToRemove = this.getTextAndJsonFields(columns);
-        if(0 === fieldsToRemove.length){
-            return 'let listProperties = showProperties;';
+        let passwordFields = this.getPasswordFields(columns);
+        if(0 === passwordFields.length){
+            return 'let showProperties = propertiesKeys;';
         }
-        if(1 === fieldsToRemove.length){
-            return 'let listProperties = [...showProperties];\n        listProperties.splice(listProperties.indexOf(\''+
-                fieldsToRemove[0]+
+        if(1 === passwordFields.length){
+            return 'let showProperties = [...propertiesKeys];\n        showProperties.splice(showProperties.indexOf(\''+
+                passwordFields[0]+
                 '\'), 1);';
         }
-        return 'let listProperties = sc.removeFromArray([...showProperties], [\''+fieldsToRemove.join('\', \'')+'\']);';
+        return 'let showProperties = sc.removeFromArray([...propertiesKeys], [\''+passwordFields.join('\', \'')+'\']);';
     }
 
-    getTextAndJsonFields(columns)
+    getPasswordFields(columns)
     {
-        let fieldsToRemove = [];
-        for(let columnName in columns){
-            let column = columns[columnName];
-            let type = column.type.toLowerCase();
-            if(['text', 'json', 'tinytext', 'mediumtext', 'longtext'].includes(type)){
-                fieldsToRemove.push(columnName);
+        let passwordFields = [];
+        for(let columnName of Object.keys(columns)){
+            if('password' === columnName.toLowerCase()){
+                passwordFields.push(columnName);
             }
         }
-        return fieldsToRemove;
+        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);
+        if(0 === fieldsToRemove.length){
+            return 'let listProperties = propertiesKeys;';
+        }
+        if(1 === fieldsToRemove.length){
+            return 'let listProperties = [...propertiesKeys];\n        listProperties.splice(listProperties.indexOf(\''+
+                fieldsToRemove[0]+
+                '\'), 1);';
+        }
+        return 'let listProperties = sc.removeFromArray([...propertiesKeys], [\''+fieldsToRemove.join('\', \'')+'\']);';
     }
 
     async generateModelFile(tableName, tableData, driverKey)
@@ -324,7 +365,7 @@ class EntitiesGenerator
     {
         if('mikro-orm' === driverKey){
             let entityProps = [];
-            for(let columnName in columns){
+            for(let columnName of Object.keys(columns)){
                 let column = columns[columnName];
                 let isPrimary = 'PRI' === column.key;
                 let type = TypeMapper.mapDbTypeToJsType(column.type);
@@ -342,7 +383,7 @@ class EntitiesGenerator
         }
         if('prisma' === driverKey){
             let prismaProps = [];
-            for(let columnName in columns){
+            for(let columnName of Object.keys(columns)){
                 let column = columns[columnName];
                 let prismaType = TypeMapper.mapDbTypeToPrismaType(column.type);
                 let isPrimary = 'PRI' === column.key;
@@ -391,7 +432,7 @@ class EntitiesGenerator
     getRequireStatements()
     {
         let requireStatements = [];
-        for(let tableName in this.generatedEntities){
+        for(let tableName of Object.keys(this.generatedEntities)){
             let entity = this.generatedEntities[tableName];
             let nameWithoutExtension = entity.entityFileName.replace('.js', '');
             requireStatements.push(
@@ -404,13 +445,9 @@ class EntitiesGenerator
     getEntitiesConfigExport()
     {
         let entitiesConfigExport = [];
-        for(let tableName in this.generatedEntities){
+        for(let tableName of Object.keys(this.generatedEntities)){
             let entity = this.generatedEntities[tableName];
-            let camelCaseKey = sc.camelCase(tableName);
-            let capitalizedCase = sc.capitalizedCamelCase(tableName);
-            entitiesConfigExport.push(
-                camelCaseKey+': '+entity.entityClassName+'.propertiesConfig({parentItemLabel: \''+capitalizedCase+'\'})'
-            );
+            entitiesConfigExport.push(sc.camelCase(tableName)+': '+entity.entityClassName+'.propertiesConfig()');
         }
         return entitiesConfigExport.join(',\n    ');
     }
@@ -440,7 +477,7 @@ class EntitiesGenerator
     getTranslationLabels()
     {
         let labels = [];
-        for(let tableName in this.generatedEntities){
+        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+'\'');
         }
@@ -477,7 +514,7 @@ class EntitiesGenerator
     getRegisteredModels(driverKey)
     {
         let registeredModels = [];
-        for(let tableName in this.generatedEntities){
+        for(let tableName of Object.keys(this.generatedEntities)){
             let entity = this.generatedEntities[tableName];
             if(driverKey !== entity.driverKey){
                 continue;
@@ -492,7 +529,7 @@ class EntitiesGenerator
     getRegisteredEntitiesObject(driverKey)
     {
         let registeredEntitiesObject = [];
-        for(let tableName in this.generatedEntities){
+        for(let tableName of Object.keys(this.generatedEntities)){
             let entity = this.generatedEntities[tableName];
             if(driverKey !== entity.driverKey){
                 continue;
@@ -511,7 +548,6 @@ class EntitiesGenerator
         return result;
     }
 
-
     async generate()
     {
         if(!this.server){
@@ -540,7 +576,7 @@ class EntitiesGenerator
             Logger.critical('Failed to fetch driver key.');
             return false;
         }
-        for(let tableName in tables){
+        for(let tableName of Object.keys(tables)){
             let tableData = tables[tableName];
             await this.generateEntityFile(tableName, tableData);
             await this.generateModelFile(tableName, tableData, driverKey);

package/lib/entity-templates/entity.template

@@ -14,7 +14,8 @@ class {{entityClassName}} extends EntityProperties
         let properties = {
             {{propertiesConfig}}
         };
-        let showProperties = Object.keys(properties);
+        let propertiesKeys = Object.keys(properties);
+        {{showPropertiesDeclaration}}
         {{editPropertiesRemoval}}
         {{listPropertiesDeclaration}}
         return {

package/lib/mysql-tables-provider.js

@@ -64,7 +64,7 @@ class MySQLTablesProvider
                 '    AND REFERENCED_TABLE_NAME IS NOT NULL;';
 
             let foreignKeysResult = await server.rawQuery(foreignKeysQuery);
-            if(!sc.isArray(foreignKeysResult) || 0 < foreignKeysResult.length){
+            if(!sc.isArray(foreignKeysResult) || 0 === foreignKeysResult.length){
                 return tables;
             }
             for(let row of foreignKeysResult){

package/lib/prisma/prisma-data-server.js

@@ -7,6 +7,7 @@
 const { BaseDataServer } = require('../base-data-server');
 const { PrismaDriver } = require('./prisma-driver');
 const { MySQLTablesProvider } = require('../mysql-tables-provider');
+const { PrismaClient } = require('@prisma/client');
 const { Logger } = require('@reldens/utils');
 
 class PrismaDataServer extends BaseDataServer
@@ -24,7 +25,6 @@ class PrismaDataServer extends BaseDataServer
             return this.initialized;
         }
         try {
-            let { PrismaClient } = require('@prisma/client');
             this.prisma = new PrismaClient({
                 log: this.debug ? ['query', 'info', 'warn', 'error'] : ['error']
             });
@@ -93,6 +93,7 @@ class PrismaDataServer extends BaseDataServer
                 }
             }
             if(0 === results.length){
+                Logger.error('Statement results length is zero.', results);
                 return false;
             }
             return 1 === results.length ? results[0] : results;
@@ -104,10 +105,19 @@ class PrismaDataServer extends BaseDataServer
 
     async executeStatement(statement)
     {
-        if(statement.trim().toUpperCase().startsWith('SELECT')){
+        let trimmedStatement = statement.trim().toUpperCase();
+        if(trimmedStatement.startsWith('SELECT')){
             return await this.prisma.$queryRawUnsafe(statement);
         }
-        return await this.prisma.$executeRawUnsafe(statement);
+        let result = await this.prisma.$executeRawUnsafe(statement);
+        if(
+            trimmedStatement.startsWith('CREATE')
+            || trimmedStatement.startsWith('ALTER')
+            || trimmedStatement.startsWith('DROP')
+        ){
+            return { affectedRows: result };
+        }
+        return result;
     }
 
     splitSqlStatements(sqlContent)

package/lib/prisma/prisma-driver.js

@@ -6,6 +6,7 @@
 
 const { BaseDriver } = require('../base-driver');
 const { ErrorManager, Logger, sc } = require('@reldens/utils');
+const { Prisma } = require('@prisma/client');
 
 class PrismaDriver extends BaseDriver
 {
@@ -14,30 +15,35 @@ class PrismaDriver extends BaseDriver
     {
         super(props);
         if(!props.prisma){
-            ErrorManager.error('Missing Prisma client on Prisma driver.');
+            Logger.critical('Missing Prisma client on Prisma driver.');
+            return false;
         }
         if(!props.model){
-            ErrorManager.error('Missing Prisma model on Prisma driver.');
+            Logger.critical('Missing Prisma model on Prisma driver.');
+            return false;
         }
         if(!props.server){
-            ErrorManager.error('Missing Server Driver on Prisma driver.');
+            Logger.critical('Missing Server Driver on Prisma driver.');
+            return false;
         }
         this.prisma = props.prisma;
         this.model = props.model;
         this.server = props.server;
         this.requiredFields = [];
         this.fieldTypes = {};
+        this.idFieldType = 'String';
         this.initFieldMetadata();
     }
 
     initFieldMetadata()
     {
         try {
-            let dmmf = this.prisma._baseDmmf;
+            let dmmf = this.prisma._runtimeDataModel || Prisma.dmmf?.datamodel;
             if(!dmmf){
                 return;
             }
-            let modelInfo = dmmf.modelMap[this.tableName().toLowerCase()];
+            let modelName = this.tableName().toLowerCase();
+            let modelInfo = dmmf.models?.[modelName] || dmmf.models?.find(m => m.name.toLowerCase() === modelName);
             if(!modelInfo){
                 return;
             }
@@ -46,12 +52,29 @@ class PrismaDriver extends BaseDriver
                     this.requiredFields.push(field.name);
                 }
                 this.fieldTypes[field.name] = field.type;
+                if(field.isId){
+                    this.idFieldType = field.type;
+                }
             }
         } catch(error) {
             Logger.warning('Could not initialize field metadata: '+error.message);
         }
     }
 
+    castIdValue(id)
+    {
+        if(null === id || undefined === id){
+            return id;
+        }
+        if('Int' === this.idFieldType || 'BigInt' === this.idFieldType){
+            let numericId = Number(id);
+            if(!isNaN(numericId)){
+                return numericId;
+            }
+        }
+        return String(id);
+    }
+
     databaseName()
     {
         return this.config.database || '';
@@ -69,7 +92,7 @@ class PrismaDriver extends BaseDriver
 
     tableName()
     {
-        return this.model._name || '';
+        return this.model.name || '';
     }
 
     property(propertyName)
@@ -80,14 +103,46 @@ class PrismaDriver extends BaseDriver
     prepareData(params)
     {
         let data = {...params};
-        for(let key in data){
+        for(let key of Object.keys(data)){
             if('status' === key && 'number' === typeof data[key]){
                 data[key] = String(data[key]);
             }
+            if(this.isDateTimeField(key)){
+                data[key] = this.convertToDate(data[key], key);
+            }
         }
         return data;
     }
 
+    isDateTimeField(fieldName)
+    {
+        let fieldType = this.fieldTypes[fieldName];
+        return fieldType === 'DateTime' || fieldType === 'Date';
+    }
+
+    convertToDate(dateValue, fieldName)
+    {
+        if(dateValue instanceof Date){
+            return dateValue;
+        }
+        if(!dateValue || '' === dateValue){
+            return null;
+        }
+        let dateString = String(dateValue);
+        if(dateString.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/)){
+            return new Date(dateString.replace(' ', 'T') + 'Z');
+        }
+        if(dateString.match(/^\d{4}-\d{2}-\d{2}$/)){
+            return new Date(dateString + 'T00:00:00Z');
+        }
+        try {
+            return new Date(dateString);
+        } catch(error) {
+            Logger.warning('Failed to convert date value: '+dateString);
+            return dateValue;
+        }
+    }
+
     ensureRequiredFields(data)
     {
         let missingFields = [];
@@ -130,12 +185,12 @@ class PrismaDriver extends BaseDriver
                     let relationData = params[relation];
                     if(sc.isArray(relationData)){
                         createData.data[relation] = {
-                            connect: relationData.map(item => ({id: item.id}))
+                            connect: relationData.map(item => ({id: this.castIdValue(item.id)}))
                         };
                         continue;
                     }
                     createData.data[relation] = {
-                        connect: {id: relationData.id}
+                        connect: {id: this.castIdValue(relationData.id)}
                     };
                 }
             }
@@ -178,13 +233,14 @@ class PrismaDriver extends BaseDriver
     async updateById(id, params)
     {
         try {
-            let found = await this.loadById(id);
+            let castedId = this.castIdValue(id);
+            let found = await this.loadById(castedId);
             if(!found){
                 return false;
             }
             let preparedData = this.prepareData(params);
             return await this.model.update({
-                where: {id},
+                where: {id: castedId},
                 data: preparedData
             });
         } catch(error) {
@@ -199,12 +255,13 @@ class PrismaDriver extends BaseDriver
             let preparedData = this.prepareData(params);
             let existing = false;
             if(params.id){
-                existing = await this.loadById(params.id);
+                let castedId = this.castIdValue(params.id);
+                existing = await this.loadById(castedId);
                 if(existing){
                     let patch = Object.assign({}, preparedData);
                     delete patch.id;
                     return await this.model.update({
-                        where: {id: params.id},
+                        where: {id: castedId},
                         data: patch
                     });
                 }
@@ -213,7 +270,7 @@ class PrismaDriver extends BaseDriver
                 let existing = await this.loadOne(filters);
                 if(existing){
                     return await this.model.update({
-                        where: {id: existing.id},
+                        where: {id: this.castIdValue(existing.id)},
                         data: preparedData
                     });
                 }
@@ -240,12 +297,13 @@ class PrismaDriver extends BaseDriver
     async deleteById(id)
     {
         try {
-            let found = await this.loadById(id);
+            let castedId = this.castIdValue(id);
+            let found = await this.loadById(castedId);
             if(!found){
                 return false;
             }
             return await this.model.delete({
-                where: {id}
+                where: {id: castedId}
             });
         } catch(error) {
             Logger.error('Delete by ID error: '+error.message);
@@ -364,8 +422,9 @@ class PrismaDriver extends BaseDriver
     async loadById(id)
     {
         try {
+            let castedId = this.castIdValue(id);
             return await this.model.findUnique({
-                where: {id}
+                where: {id: castedId}
             });
         } catch(error) {
             Logger.error('Load by ID error: '+error.message);
@@ -376,8 +435,9 @@ class PrismaDriver extends BaseDriver
     async loadByIdWithRelations(id, relations)
     {
         try {
+            let castedId = this.castIdValue(id);
             let query = {
-                where: {id}
+                where: {id: castedId}
             };
             if(sc.isArray(relations) && 0 < relations.length){
                 query.include = this.buildIncludeObject(relations);
@@ -392,9 +452,10 @@ class PrismaDriver extends BaseDriver
     async loadByIds(ids)
     {
         try {
+            let castedIds = ids.map(id => this.castIdValue(id));
             return await this.model.findMany({
                 where: {
-                    id: {in: ids}
+                    id: {in: castedIds}
                 }
             });
         } catch(error) {

package/package.json

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