@reldens/storage 0.10.0-beta.37 → 0.11.0

package/README.md

@@ -5,13 +5,13 @@
 ## About this package
 This package is designed to provide a standard drivers support for managing Reldens project data.
 
-This way in Reldens project we can trust that any driver implement will have the exact same methods available to fetch and manage the project entities.
+This way in any Reldens project we can trust that any driver implementation will have the exact same methods available to fetch and manage the project entities.
 
 Every time you need to load, create, update or delete data in Reldens, the drivers from this package will be used.
 
 ## Current features
-The current drivers are to support two other ORMs:
-- Objection JS (with Knex), for everything that's SQL related.
+The package currently has drivers to support two ORMs:
+- Objection JS (with Knex), for everything that's SQL related (this is our base and recommended package).
 ```javascript
 let server = new ObjectionJsDataServer({
     client: 'mysql',
@@ -23,7 +23,7 @@ let server = new ObjectionJsDataServer({
     }
 });
 ```
-- Mikro-ORM, to offer support for MongoDB.
+- Mikro-ORM, to offer support for nonSQL/MongoDB (this package is not finished, if you like to use it please contact us).
 ```javascript
 let server = new MikroOrmDataServer({
     client: 'mongodb',

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

@@ -56,6 +56,7 @@ class MikroOrmDriver extends BaseDriver
     {
         let newInstance = this.rawModel.entity.createByProps(params);
         await this.repository.persist(newInstance).flush();
+        await this.orm.em.flush();
         return newInstance;
     }
 
@@ -74,7 +75,8 @@ class MikroOrmDriver extends BaseDriver
         }
         for(let entity of entities){
             Object.assign(entity, updatePatch);
-            this.repository.persist(entity).flush();
+            await this.repository.persist(entity).flush();
+            await this.orm.em.flush();
         }
         return entities;
     }
@@ -88,7 +90,8 @@ class MikroOrmDriver extends BaseDriver
         }
         for(let entity of entities){
             Object.assign(entity, updatePatch);
-            this.repository.persist(entity).flush();
+            await this.repository.persist(entity).flush();
+            await this.orm.em.flush();
         }
         return entities;
     }
@@ -200,6 +203,7 @@ class MikroOrmDriver extends BaseDriver
         return this.appendRelationsToCollection(entitiesCollection, relations);
     }
 
+    // @TODO - BETA - Refactor and improve.
     queryBuilder(useLimit = false, useOffset = false, useSort = false)
     {
         let queryBuilder = {};
@@ -217,6 +221,7 @@ class MikroOrmDriver extends BaseDriver
         return queryBuilder;
     }
 
+    // @TODO - BETA - Refactor and improve.
     createSingleFilter(field, fieldValue, operator = null)
     {
         let filter = {};
@@ -229,33 +234,39 @@ class MikroOrmDriver extends BaseDriver
         return filter;
     }
 
+    // @TODO - BETA - Refactor and improve.
     async appendRelationsToCollection(entitiesCollection, relations)
     {
         // @TODO - BETA - Refactor. I would like to use populate but it may not work if the driver is not Mongo DB.
-        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
+        if('function' !== typeof this.rawModel.entity.relationMappings){
             return entitiesCollection;
         }
         if(!sc.isArray(relations) || 0 === relations.length){
-            relations = Object.keys(this.rawModel.entity.relationsMappings() || {});
+            relations = Object.keys(this.rawModel.entity.relationMappings() || {});
         }
         if(0 === relations.length){
             return entitiesCollection;
         }
-        for(let entity of entitiesCollection){
-            await this.appendRelatedEntities(entity, relations);
+        if(sc.isArray(entitiesCollection)){
+            for(let entity of entitiesCollection){
+                await this.appendRelatedEntities(entity, relations);
+            }
+        }
+        if(!sc.isArray(entitiesCollection)){
+            await this.appendRelatedEntities(entitiesCollection, relations);
         }
         return entitiesCollection;
     }
 
+    // @TODO - BETA - Refactor and improve.
     async appendRelatedEntities(entity, relations)
     {
-        // @TODO - BETA - Refactor and improve.
-        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
+        if('function' !== typeof this.rawModel.entity.relationMappings){
             return entity;
         }
-        let relationsMappings = this.rawModel.entity.relationsMappings();
+        let relationMappings = this.rawModel.entity.relationMappings();
         for(let i of relations){
-            let relation = relationsMappings[i];
+            let relation = relationMappings[i];
             let relationRepository = this.server.getEntity(relation.entityName);
             let isManyToOne = 'm:1' === relation.reference;
             let isOneToMany = '1:m' === relation.reference;
@@ -269,49 +280,50 @@ class MikroOrmDriver extends BaseDriver
         return entity;
     }
 
+    // @TODO - BETA - Refactor and improve.
     async createNested(newInstance, params)
     {
-        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
+        if('function' !== typeof this.rawModel.entity.relationMappings){
             return false;
         }
-        let relationsMappings = this.rawModel.entity.relationsMappings();
-        for(let i of Object.keys(relationsMappings)){
-            // @TODO - BETA - Refactor and improve.
-            let relationData = relationsMappings[i];
-            let relationEntity = this.server.entityManager.get(relationData.entityName).rawModel.entity;
+        let relationMappings = this.rawModel.entity.relationMappings();
+        for(let i of Object.keys(relationMappings)){
+            let relation = relationMappings[i];
+            let relationEntity = this.server.entityManager.get(relation.entityName).rawModel.entity;
             if(!relationEntity){
-                Logger.warning('Factory not found for relation definition:', relationData);
+                Logger.warning('Factory not found for relation definition:', relation);
                 continue;
             }
-            let isManyToOne = 'm:1' === relationData.reference;
-            let isOneToMany = '1:m' === relationData.reference;
-            if(isManyToOne){
-                if(!sc.hasOwn(params, relationData.join.from) || !params[relationData.join.from]){
+            let isArray = sc.isArray(params);
+            if(!isArray){
+                if(!sc.hasOwn(params, relation.join.from) || !params[relation.join.from]){
                     continue;
                 }
-                await this.createOne(params, i, relationEntity, newInstance, relationData);
+                await this.createOne(params, i, relationEntity, newInstance, relation);
                 continue;
             }
-            if(isOneToMany){
-                await this.createMany(params, i, relationEntity, newInstance, relationData);
+            if(isArray){
+                await this.createMany(params, i, relationEntity, newInstance, relation);
             }
         }
     }
 
-    async createOne(params, i, relationEntity, newInstance, relationData)
+    // @TODO - BETA - Refactor and improve.
+    async createOne(params, i, relationEntity, newInstance, relation)
     {
-        params[i] = newInstance[relationData.join.from];
+        params[i] = newInstance[relation.join.from];
         let nestedObject = relationEntity.createByProps(params[i]);
         await this.repository.persist(nestedObject).flush();
         await this.orm.em.flush();
         newInstance[i] = nestedObject;
     }
 
-    async createMany(params, i, relationEntity, newInstance, relationData)
+    // @TODO - BETA - Refactor and improve.
+    async createMany(params, i, relationEntity, newInstance, relation)
     {
         let nestedArray = [];
         for(let objectData of params[i]){
-            objectData[relationData.join.to] = newInstance[relationData.join.from];
+            objectData[relation.join.to] = newInstance[relation.join.from];
             let nestedObject = relationEntity.createByProps(objectData);
             await this.repository.persist(nestedObject).flush();
             await this.orm.em.flush();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.10.0-beta.37",
+    "version": "0.11.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -44,9 +44,9 @@
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
     "dependencies": {
-        "@mikro-orm/core": "^5.0.1",
-        "@mikro-orm/mongodb": "^5.0.1",
-        "@reldens/utils": "^0.10.0-beta.4",
+        "@mikro-orm/core": "^5.0.3",
+        "@mikro-orm/mongodb": "^5.0.3",
+        "@reldens/utils": "^0.11.0",
         "knex": "^1.0.3",
         "mysql": "^2.18.1",
         "objection": "^3.0.1"