mythix-orm 1.11.0 → 1.11.2

package/lib/connection/literals/literal-base.js

@@ -93,6 +93,7 @@ class LiteralBase {
         let Model = connection.getModel(definition.modelName);
         if (Model) {
           return new Field({
+            ephemeral: true,
             fieldName: definition.fieldNames[0],
             Model,
           });

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.arrayFlatten(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;
 }
 
@@ -239,7 +303,7 @@ class ModelScope extends QueryEngineBase {
 
       if (!Nife.instanceOf(value, 'string')) {
         console.log(entities);
-        throw new Error(`QueryEngine::ModelScope::PROJECT: Invalid value provided [${value.toString()}]. All values provided must be strings.`);
+        throw new TypeError(`QueryEngine::ModelScope::PROJECT: Invalid value provided [${value.toString()}]. All values provided must be strings, fields, models, or literals.`);
       }
 
       return value;
@@ -264,10 +328,11 @@ class ModelScope extends QueryEngineBase {
     return this._fetchScope('model');
   }
 
-  DISTINCT = ProxyClass.autoCall(function(fullyQualifiedName) {
-    let currentQuery  = this;
-    let distinctValue = fullyQualifiedName;
-    let context       = this.getOperationContext();
+  DISTINCT = ProxyClass.autoCall(function(_fullyQualifiedName) {
+    let fullyQualifiedName  = _fullyQualifiedName;
+    let currentQuery        = this;
+    let distinctValue       = fullyQualifiedName;
+    let context             = this.getOperationContext();
 
     if (arguments.length === 0) {
       let rootModel = context.rootModel;
@@ -279,8 +344,17 @@ class ModelScope extends QueryEngineBase {
 
       if (!distinctValue)
         distinctValue = new DistinctLiteral();
-    } else if (fullyQualifiedName) {
+    } else if (Nife.instanceOf(fullyQualifiedName, 'string')) {
+      if (fullyQualifiedName.indexOf(':') < 0)
+        fullyQualifiedName = `${context.rootModel.getModelName()}:${fullyQualifiedName}`;
+
+      distinctValue = new DistinctLiteral(fullyQualifiedName);
+    } else if (typeof fullyQualifiedName.isField === 'function' && fullyQualifiedName.isField(fullyQualifiedName)) {
+      distinctValue = new DistinctLiteral(`${fullyQualifiedName.Model.getModelName()}:${fullyQualifiedName.fieldName}`);
+    } else if (LiteralBase.isLiteral(fullyQualifiedName)) {
       distinctValue = new DistinctLiteral(fullyQualifiedName);
+    } else {
+      throw new TypeError(`QueryEngine::ModelScope::DISTINCT: Invalid value provided [${(fullyQualifiedName) ? fullyQualifiedName.toString() : fullyQualifiedName}]. All values provided must be strings, fields, or literals.`);
     }
 
     currentQuery._pushOperationOntoStack({ sqlFunc: true, operator: 'DISTINCT', queryProp: 'DISTINCT', value: distinctValue, distinct: distinctValue });

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.2",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",