mythix-orm 1.11.0 → 1.11.1

package/lib/query-engine/model-scope.js

@@ -50,14 +50,78 @@ function applyOrderClause(extraData, ...args) {
 }
 
 function wrapOrderClause(func) {
-  func.DESC = (...args) => {
+  const applyQueryOrder = (_order, replace) => {
+    let query = this;
+    let order = Nife.toArray(_order).filter(Boolean);
+
+    let asc = order.filter((thisOrder) => {
+      if (!Nife.instanceOf(thisOrder, 'string'))
+        return true;
+
+      if (thisOrder.charAt(0) === '-')
+        return false;
+
+      return true;
+    });
+
+    let desc = order.filter((thisOrder) => {
+      if (!Nife.instanceOf(thisOrder, 'string'))
+        return false;
+
+      if (thisOrder.charAt(0) !== '-')
+        return false;
+
+      return true;
+    });
+
+    if (Nife.isNotEmpty(asc)) {
+      asc = asc.map((thisOrder) => {
+        if (!Nife.instanceOf(thisOrder, 'string'))
+          return thisOrder;
+
+        return thisOrder.replace(/^\+/, '');
+      });
+
+      // eslint-disable-next-line new-cap
+      query = (replace) ? ASC(asc) : ASC('+', asc);
+    }
+
+    if (Nife.isNotEmpty(desc)) {
+      desc = desc.map((thisOrder) => {
+        if (!Nife.instanceOf(thisOrder, 'string'))
+          return thisOrder;
+
+        return thisOrder.replace(/^-/, '');
+      });
+
+      // eslint-disable-next-line new-cap
+      query = (replace) ? DESC(desc) : DESC('+', desc);
+    }
+
+    return query;
+  };
+
+  const DESC = (...args) => {
     return applyOrderClause.call(this, { direction: '-' }, ...args);
   };
 
-  func.ASC = (...args) => {
+  const ASC = (...args) => {
     return applyOrderClause.call(this, { direction: '+' }, ...args);
   };
 
+  const ADD = (...args) => {
+    return applyQueryOrder(args, false);
+  };
+
+  const REPLACE = (...args) => {
+    return applyQueryOrder(args, true);
+  };
+
+  func.DESC = DESC;
+  func.ASC = ASC;
+  func.ADD = ADD;
+  func.REPLACE = REPLACE;
+
   return func;
 }
 

package/lib/query-engine/query-engine.d.ts

@@ -79,12 +79,22 @@ export declare class QueryEngine<T = ConnectionBase> {
   public Field(fieldName: string): QueryEngine;
   public LIMIT(value: number): QueryEngine;
   public OFFSET(value: number): QueryEngine;
-  public ORDER(...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>): QueryEngine;
   public GROUP_BY(...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>): QueryEngine;
   public HAVING(query: QueryEngine): QueryEngine;
   public EXISTS(query: QueryEngine): QueryEngine;
   public PROJECT(...args: Array<string | ModelClass | LiteralBase | Field | Array<string | ModelClass | LiteralBase | Field>>): QueryEngine;
 
+  declare public ORDER: {
+    (...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>): QueryEngine;
+
+    ASC: (...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>) => QueryEngine;
+    DESC: (...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>) => QueryEngine;
+    ADD: (...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>) => QueryEngine;
+    REPLACE: (...args: Array<LiteralBase | Field | string | Array<LiteralBase | Field | string>>) => QueryEngine;
+
+    name: QueryEngine;
+  };
+
   declare public NOT: {
     (): QueryEngine;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",