@reldens/storage 0.29.0 → 0.30.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/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.30.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -44,11 +44,11 @@
         "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.3.13",
+        "@mikro-orm/mongodb": "^6.3.13",
+        "@reldens/utils": "^0.38.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
-        "objection": "^3.1.4"
+        "objection": "^3.1.5"
     }
 }