@reldens/storage 0.60.0 → 0.62.0

package/lib/base-data-server.js

@@ -5,7 +5,7 @@
  */
 
 const { EntityManager } = require('./entity-manager');
-const { ErrorManager, sc } = require('@reldens/utils');
+const { ErrorManager, Logger, sc } = require('@reldens/utils');
 
 class BaseDataServer
 {
@@ -16,6 +16,9 @@ class BaseDataServer
         if(!this.config.host){
             this.config.host = 'localhost';
         }
+        if(!this.config.port){
+            this.config.port = 3306;
+        }
         this.client = sc.get(props, 'client', '');
         this.poolConfig = sc.get(props, 'poolConfig', {});
         this.connectStringOptions = sc.get(props, 'connectStringOptions', '');
@@ -33,11 +36,17 @@ class BaseDataServer
 
     createConnectionString()
     {
-        return (this.client || 'client-not-specified')+'://'
-            +(this.config.user || 'user-not-specified')
+        if('' === this.client){
+            Logger.warning('Client is empty, connection may fail.');
+        }
+        if('' === this.config.user){
+            Logger.warning('User is empty, connection may fail.');
+        }
+        return (this.client || '')+'://'
+            +(this.config.user || '')
             +(this.config.password ? ':'+this.config.password : '')
             +'@'+this.config.host
-            +':'+(this.config.port || 3306)
+            +':'+this.config.port
             +(this.config.database ? '/'+this.config.database : '')
             +(this.connectStringOptions ? '?'+this.connectStringOptions : '');
     }

package/lib/mikro-orm/mikro-orm-driver.js

@@ -5,7 +5,7 @@
  */
 
 const { BaseDriver } = require('../base-driver');
-const { ErrorManager, Logger, sc } = require('@reldens/utils');
+const { Logger, sc } = require('@reldens/utils');
 
 class MikroOrmDriver extends BaseDriver
 {
@@ -14,13 +14,16 @@ class MikroOrmDriver extends BaseDriver
     {
         super(props);
         if(!props.orm){
-            ErrorManager.error('Missing ORM on Mikro ORM driver.');
+            Logger.critical('Missing ORM on Mikro ORM driver.');
+            return false;
         }
         if(!props.server){
-            ErrorManager.error('Missing Server Driver on Mikro ORM driver.');
+            Logger.critical('Missing Server Driver on Mikro ORM driver.');
+            return false;
         }
         if(!this.rawModel){
-            ErrorManager.error('Missing raw entity on Mikro ORM driver.');
+            Logger.critical('Missing raw entity on Mikro ORM driver.');
+            return false;
         }
         this.orm = props.orm;
         this.server = props.server;
@@ -52,6 +55,14 @@ class MikroOrmDriver extends BaseDriver
         return this.rawModel[propertyName] || null;
     }
 
+    getAllRelations()
+    {
+        if('function' !== typeof this.rawModel.entity.relationMappings){
+            return [];
+        }
+        return Object.keys(this.rawModel.entity.relationMappings() || {});
+    }
+
     async create(params)
     {
         let newInstance = await this.orm.em.create(this.rawModel, params);
@@ -61,9 +72,12 @@ class MikroOrmDriver extends BaseDriver
 
     async createWithRelations(params, relations)
     {
-        let newInstance = await this.create(params, relations);
-        await this.createNested(newInstance, params);
-        return newInstance;
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
+        let newInstance = await this.create(params);
+        await this.createNested(newInstance, params, relations);
+        return await this.appendRelationsToCollection(newInstance, relations);
     }
 
     async update(filters, updatePatch)
@@ -143,8 +157,42 @@ class MikroOrmDriver extends BaseDriver
 
     async countWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
-        return this.repository.count(processedFilters);
+        if(0 === relations.length || 'function' !== typeof this.rawModel.entity.relationMappings){
+            return this.repository.count(processedFilters);
+        }
+        let queryBuilder = this.orm.em.createQueryBuilder(this.rawModel);
+        let relationMappings = this.rawModel.entity.relationMappings();
+        let aliasCounter = 0;
+        for(let relationName of relations){
+            let relation = relationMappings[relationName];
+            if(!relation){
+                continue;
+            }
+            let relationEntity = this.server.entityManager.get(relation.entityName);
+            if(!relationEntity || !relationEntity.rawModel){
+                continue;
+            }
+            let alias = 'rel_'+aliasCounter;
+            let joinField = relation.join.from;
+            let targetField = relation.join.to;
+            let isManyToOne = 'm:1' === relation.reference;
+            let isOneToMany = '1:m' === relation.reference;
+            if(isManyToOne){
+                queryBuilder.leftJoin(relationEntity.rawModel, alias, 'e.'+joinField+' = '+alias+'.'+targetField);
+            }
+            if(isOneToMany){
+                queryBuilder.leftJoin(relationEntity.rawModel, alias, 'e.'+joinField+' = '+alias+'.'+targetField);
+            }
+            aliasCounter++;
+        }
+        if(sc.isObject(processedFilters) && 0 < Object.keys(processedFilters).length){
+            queryBuilder.where(processedFilters);
+        }
+        return queryBuilder.getCount();
     }
 
     loadAll()
@@ -154,6 +202,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadAllWithRelations(relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let entities = await this.loadAll();
         return await this.appendRelationsToCollection(entities, relations);
     }
@@ -166,6 +217,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
         let entitiesCollection = await this.repository.find(processedFilters, this.queryBuilder(true, true, true));
         return await this.appendRelationsToCollection(entitiesCollection, relations);
@@ -180,6 +234,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadByWithRelations(field, fieldValue, relations, operator = null)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let filter = this.createSingleFilter(field, fieldValue, operator);
         let processedFilters = this.processFilters(filter);
         let entitiesCollection = await this.repository.find(processedFilters, this.queryBuilder(true, true, true));
@@ -193,6 +250,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadByIdWithRelations(id, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let entity = await this.loadBy('id', id);
         return await this.appendRelationsToCollection(entity, relations);
     }
@@ -211,6 +271,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadOneWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
         let entitiesCollection = await this.repository.findOne(processedFilters, this.queryBuilder(false, true, true));
         return this.appendRelationsToCollection(entitiesCollection, relations);
@@ -225,6 +288,9 @@ class MikroOrmDriver extends BaseDriver
 
     async loadOneByWithRelations(field, fieldValue, relations, operator = null)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let filter = this.createSingleFilter(field, fieldValue, operator);
         let processedFilters = this.processFilters(filter);
         let entitiesCollection = await this.repository.findOne(processedFilters, this.queryBuilder(false, true, true));
@@ -321,7 +387,7 @@ class MikroOrmDriver extends BaseDriver
             return entitiesCollection;
         }
         if(!sc.isArray(relations) || 0 === relations.length){
-            relations = Object.keys(this.rawModel.entity.relationMappings() || {});
+            relations = this.getAllRelations();
         }
         if(0 === relations.length){
             return entitiesCollection;
@@ -358,13 +424,16 @@ class MikroOrmDriver extends BaseDriver
         return entity;
     }
 
-    async createNested(newInstance, params)
+    async createNested(newInstance, params, relations)
     {
         if('function' !== typeof this.rawModel.entity.relationMappings){
             return false;
         }
         let relationMappings = this.rawModel.entity.relationMappings();
         for(let i of Object.keys(relationMappings)){
+            if(sc.isArray(relations) && 0 < relations.length && -1 === relations.indexOf(i)){
+                continue;
+            }
             let relation = relationMappings[i];
             let relationEntity = this.server.entityManager.get(relation.entityName).rawModel.entity;
             if(!relationEntity){

package/lib/prisma/prisma-driver.js

@@ -38,7 +38,7 @@ class PrismaDriver extends BaseDriver
 
     initModelMetadata()
     {
-        let dmmf = this.prisma._runtimeDataModel || Prisma.dmmf?.datamodel;
+        let dmmf = this.getDmmf();
         if(!dmmf){
             Logger.warning('Could not access Prisma DMMF metadata');
             return;
@@ -61,6 +61,28 @@ class PrismaDriver extends BaseDriver
         }
     }
 
+    getDmmf()
+    {
+        try {
+            if(this.prisma._dmmf){
+                return this.prisma._dmmf.datamodel;
+            }
+            if(this.prisma._getDmmf && sc.isFunction(this.prisma._getDmmf)){
+                return this.prisma._getDmmf().datamodel;
+            }
+            if(this.prisma._runtimeDataModel){
+                return this.prisma._runtimeDataModel;
+            }
+            if(Prisma.dmmf && Prisma.dmmf.datamodel){
+                return Prisma.dmmf.datamodel;
+            }
+            return null;
+        } catch(error) {
+            Logger.warning('Failed to access DMMF: '+error.message);
+            return null;
+        }
+    }
+
     processFieldMetadata(field)
     {
         this.fieldTypes[field.name] = field.type;
@@ -102,6 +124,11 @@ class PrismaDriver extends BaseDriver
         }
     }
 
+    getAllRelations()
+    {
+        return Object.keys(this.relationMetadata || {});
+    }
+
     isNumericFieldType(fieldType)
     {
         return ('Int' === fieldType || 'BigInt' === fieldType || 'Float' === fieldType || 'Decimal' === fieldType);
@@ -312,7 +339,7 @@ class PrismaDriver extends BaseDriver
 
     tableName()
     {
-        return this.model.name || '';
+        return this.model.$name || this.model.name || '';
     }
 
     property(propertyName)
@@ -337,7 +364,7 @@ class PrismaDriver extends BaseDriver
         return data;
     }
 
-    prepareDataWithRelations(params)
+    prepareDataWithRelations(params, isCreate = false)
     {
         let data = {};
         let relations = {};
@@ -351,9 +378,11 @@ class PrismaDriver extends BaseDriver
                     };
                     continue;
                 }
-                relations[relationName] = {
-                    disconnect: true
-                };
+                if(!isCreate){
+                    relations[relationName] = {
+                        disconnect: true
+                    };
+                }
                 continue;
             }
             let fieldType = this.fieldTypes[key];
@@ -476,7 +505,7 @@ class PrismaDriver extends BaseDriver
 
     async create(params)
     {
-        let preparedData = this.prepareDataWithRelations(params);
+        let preparedData = this.prepareDataWithRelations(params, true);
         this.ensureRequiredFields(preparedData);
         try {
             return await this.model.create({
@@ -490,10 +519,15 @@ class PrismaDriver extends BaseDriver
 
     async createWithRelations(params, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let preparedData = this.prepareData(params);
         this.ensureRequiredFields(preparedData);
         let createData = {data: preparedData};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
+            let includeConfig = this.buildIncludeObject(relations);
+            createData.include = includeConfig;
             for(let relation of relations){
                 if(!sc.hasOwn(params, relation)){
                     continue;
@@ -511,7 +545,7 @@ class PrismaDriver extends BaseDriver
             }
         }
         try {
-            return await this.model.create(createData);
+            return this.transformRelationResults(await this.model.create(createData), createData.include);
         } catch(error) {
             Logger.error('Create with relations error: '+error.message);
             return false;
@@ -650,11 +684,14 @@ class PrismaDriver extends BaseDriver
 
     async countWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
         let query = {
             where: processedFilters
         };
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             query.include = this.buildIncludeObject(relations);
         }
         try {
@@ -677,9 +714,12 @@ class PrismaDriver extends BaseDriver
 
     async loadAllWithRelations(relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let query = this.buildQueryOptions();
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }
@@ -707,11 +747,14 @@ class PrismaDriver extends BaseDriver
 
     async loadWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
         let query = this.buildQueryOptions();
         query.where = processedFilters;
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }
@@ -739,11 +782,14 @@ class PrismaDriver extends BaseDriver
 
     async loadByWithRelations(field, fieldValue, relations, operator = null)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let filter = this.createSingleFilter(field, fieldValue, operator);
         let query = this.buildQueryOptions();
         query.where = filter;
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }
@@ -771,12 +817,15 @@ class PrismaDriver extends BaseDriver
 
     async loadByIdWithRelations(id, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let castedId = this.castToIdType(id);
         let query = {
             where: {id: castedId}
         };
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }
@@ -819,11 +868,14 @@ class PrismaDriver extends BaseDriver
 
     async loadOneWithRelations(filters, relations)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let processedFilters = this.processFilters(filters);
         let query = this.buildQueryOptions(false);
         query.where = processedFilters;
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }
@@ -851,11 +903,14 @@ class PrismaDriver extends BaseDriver
 
     async loadOneByWithRelations(field, fieldValue, relations, operator = null)
     {
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
+        }
         let filter = this.createSingleFilter(field, fieldValue, operator);
         let query = this.buildQueryOptions(false);
         query.where = filter;
         let includeConfig = {};
-        if(sc.isArray(relations) && 0 < relations.length){
+        if(0 < relations.length){
             includeConfig = this.buildIncludeObject(relations);
             query.include = includeConfig;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.60.0",
+    "version": "0.62.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -45,13 +45,13 @@
         "@mikro-orm/core": "^6.4.16",
         "@mikro-orm/mongodb": "^6.4.16",
         "@mikro-orm/mysql": "^6.4.16",
-        "@prisma/client": "^6.10.1",
-        "@reldens/server-utils": "^0.20.0",
+        "@prisma/client": "^6.12.0",
+        "@reldens/server-utils": "^0.23.0",
         "@reldens/utils": "^0.50.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
-        "mysql2": "^3.14.1",
+        "mysql2": "^3.14.2",
         "objection": "^3.1.5",
-        "prisma": "^6.10.1"
+        "prisma": "^6.12.0"
     }
 }