@reldens/storage 0.29.0 → 0.31.0

package/lib/base-driver.js

@@ -15,6 +15,7 @@ class BaseDriver
         this.rawModel = sc.get(props, 'rawModel', false);
         this.rawId = sc.get(props, 'id', false);
         this.rawName = sc.get(props, 'name', false);
+        this.select = sc.get(props, 'select', []);
         this.limit = sc.get(props, 'limit', 0);
         this.offset = sc.get(props, 'offset', 0);
         this.sortBy = sc.get(props, 'sortBy', false);

package/lib/mikro-orm/mikro-orm-data-server.js

@@ -7,6 +7,8 @@
 const { MikroOrmDriver } = require('./mikro-orm-driver');
 const { BaseDataServer } = require('../base-data-server');
 const { MikroORM } = require('@mikro-orm/core');
+const { MySqlDriver } = require('@mikro-orm/mysql');
+const { MongoDriver } = require('@mikro-orm/mongodb');
 const { Logger, ErrorManager } = require('@reldens/utils');
 
 class MikroOrmDataServer extends BaseDataServer
@@ -14,26 +16,43 @@ class MikroOrmDataServer extends BaseDataServer
 
     orm = {};
     clientsMapped = {
-        mysql: 'mysql',
-        mongodb: 'mongo'
+        mysql: MySqlDriver,
+        mongodb: MongoDriver
     };
 
+    constructor(props)
+    {
+        // @TODO - BETA - Finish implementation.
+        super(props);
+        this.entitiesPath = props.entitiesPath;
+    }
+
     async connect()
     {
         if(this.initialized){
             return this.initialized;
         }
-        this.orm = await MikroORM.init({
-            entities: Object.values(this.rawEntities),
-            type: this.clientsMapped[(this.client || 'mongo')],
+        let providedSetup = {
+            driver: this.clientsMapped[(this.client || 'mongodb')],
+            dbName: this.config.database,
             clientUrl: this.connectString,
             allowGlobalContext: true
-        });
+        };
+        if(this.rawEntities){
+            providedSetup.entities = Object.values(this.rawEntities);
+        }
+        if(0 < Object.keys(this.entities).length){
+            providedSetup.entities = this.entities;
+        }
+        if(this.entitiesPath){
+            providedSetup.entities = this.entitiesPath;
+        }
+        this.orm = await MikroORM.init(providedSetup);
         this.initialized = Date.now();
         return this.initialized;
     }
 
-    generateEntities(rawEntities)
+    generateEntities()
     {
         if(!this.initialized){
             Logger.critical('In order to generate entities with Mikro ORM driver you need to connect to the server.');
@@ -44,8 +63,8 @@ class MikroOrmDataServer extends BaseDataServer
             return {};
         }
         this.entities = {};
-        for(let i of Object.keys(rawEntities)){
-            let rawEntity = rawEntities[i];
+        for(let i of Object.keys(this.rawEntities)){
+            let rawEntity = this.rawEntities[i];
             this.entities[i] = new MikroOrmDriver({
                 rawModel: rawEntity,
                 id: i,

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

@@ -12,6 +12,7 @@ class MikroOrmDriver extends BaseDriver
 
     constructor(props)
     {
+        // @TODO - BETA - Finish implementation.
         super(props);
         if(!props.orm){
             ErrorManager.error('Missing ORM on Mikro ORM driver.');
@@ -24,7 +25,7 @@ class MikroOrmDriver extends BaseDriver
         }
         this.orm = props.orm;
         this.server = props.server;
-        this.repository = this.orm.em.getRepository(this.rawModel.entity);
+        this.repository = this.orm.em.getRepository(this.rawModel);
     }
 
     databaseName()
@@ -54,9 +55,8 @@ class MikroOrmDriver extends BaseDriver
 
     async create(params)
     {
-        let newInstance = this.rawModel.entity.createByProps(params);
-        await this.repository.persist(newInstance).flush();
-        await this.orm.em.flush();
+        let newInstance = await this.orm.em.create(this.rawModel, params);
+        await this.orm.em.upsert(newInstance);
         return newInstance;
     }
 
@@ -75,7 +75,7 @@ class MikroOrmDriver extends BaseDriver
         }
         for(let entity of entities){
             Object.assign(entity, updatePatch);
-            await this.repository.persist(entity).flush();
+            await this.orm.em.upsert(entity);
             await this.orm.em.flush();
         }
         return entities;
@@ -90,7 +90,7 @@ class MikroOrmDriver extends BaseDriver
         }
         for(let entity of entities){
             Object.assign(entity, updatePatch);
-            await this.repository.persist(entity).flush();
+            await this.orm.em.upsert(entity);
             await this.orm.em.flush();
         }
         return entities;
@@ -101,6 +101,22 @@ class MikroOrmDriver extends BaseDriver
         return this.update({id}, params);
     }
 
+    async upsert(params, filters)
+    {
+        if(params.id){
+            let patch = Object.assign({}, params);
+            delete patch.id;
+            return this.updateById(params.id, patch);
+        }
+        if(filters){
+            let existent = await this.loadOne(filters);
+            if(existent){
+                return this.updateById(existent.id, params);
+            }
+        }
+        return this.create(params);
+    }
+
     async delete(filters = {})
     {
         let entries = await this.load(filters);
@@ -207,6 +223,9 @@ class MikroOrmDriver extends BaseDriver
     queryBuilder(useLimit = false, useOffset = false, useSort = false)
     {
         let queryBuilder = {};
+        if(0 < this.select.length){
+            queryBuilder.select(...this.select);
+        }
         if(useLimit && 0 !== this.limit){
             queryBuilder.limit = this.limit;
         }

package/lib/objection-js/objection-js-driver.js

@@ -196,6 +196,9 @@ class ObjectionJsDriver extends BaseDriver
     queryBuilder(useLimit = false, useOffset = false, useSort = false)
     {
         let queryBuilder = this.rawModel.query();
+        if(0 < this.select.length){
+            queryBuilder.select(...this.select);
+        }
         if(useLimit && 0 !== this.limit){
             queryBuilder.limit(this.limit)
         }
@@ -232,6 +235,9 @@ class ObjectionJsDriver extends BaseDriver
                     queryBuilder.whereIn(i, filter.value);
                     continue;
                 }
+                if('NOT' === filterOperator){
+                    queryBuilder.whereNot(i, filter.value);
+                }
                 queryBuilder.where(i, filter.operator, filter.value);
                 continue;
             }
@@ -240,7 +246,7 @@ class ObjectionJsDriver extends BaseDriver
         return queryBuilder;
     }
 
-    appendRelationsToQuery(queryBuilder, relations)
+    appendRelationsToQuery(queryBuilder, relations, relationsModifiers)
     {
         if(!sc.isArray(relations) || 0 === relations.length){
             relations = Object.keys(this.rawModel.relationMappings || {});
@@ -248,9 +254,40 @@ class ObjectionJsDriver extends BaseDriver
         if(0 < relations.length){
             queryBuilder.withGraphFetched('['+relations.join(',')+']');
         }
+        this.appendRelationsModifiers(queryBuilder, relations, relationsModifiers);
         return queryBuilder;
     }
 
+    appendRelationsModifiers(queryBuilder, relations, relationsModifiers)
+    {
+        if(!sc.isArray(relationsModifiers)){
+            return queryBuilder;
+        }
+        for (let relationModifier of relationsModifiers) {
+            let relationKey = sc.get(relationModifier, 'key');
+            if (!relationKey) {
+                continue;
+            }
+            if (-1 === relations.indexOf(relationKey)) {
+                continue;
+            }
+            let relationOrderBy = sc.get(relationModifier, 'orderBy', {});
+            let relationOrderByField = sc.get(relationOrderBy, 'field', {});
+            let relationLimit = sc.get(relationModifier, 'limit');
+            if(!relationOrderByField && !relationLimit){
+                continue;
+            }
+            queryBuilder.modifyGraph(relationKey, builder => {
+                if(relationOrderByField) {
+                    builder.orderBy(relationOrderByField, sc.get(relationOrderBy, 'direction', 'desc'));
+                }
+                if(relationLimit){
+                    builder.limit(relationLimit);
+                }
+            });
+        }
+        return queryBuilder;
+    }
 }
 
 module.exports.ObjectionJsDriver = ObjectionJsDriver;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.29.0",
+    "version": "0.31.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -44,11 +44,13 @@
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
     "dependencies": {
-        "@mikro-orm/core": "^6.3.10",
-        "@mikro-orm/mongodb": "^6.3.10",
-        "@reldens/utils": "^0.37.0",
+        "@mikro-orm/core": "^6.4.0",
+        "@mikro-orm/mongodb": "^6.4.0",
+        "@mikro-orm/mysql": "^6.4.0",
+        "@reldens/utils": "^0.39.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
-        "objection": "^3.1.4"
+        "mysql2": "^3.11.5",
+        "objection": "^3.1.5"
     }
 }