mythix-orm 1.11.1 → 1.11.3

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

@@ -52,7 +52,7 @@ function applyOrderClause(extraData, ...args) {
 function wrapOrderClause(func) {
   const applyQueryOrder = (_order, replace) => {
     let query = this;
-    let order = Nife.toArray(_order).filter(Boolean);
+    let order = Nife.arrayFlatten(Nife.toArray(_order).filter(Boolean));
 
     let asc = order.filter((thisOrder) => {
       if (!Nife.instanceOf(thisOrder, 'string'))
@@ -303,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;
@@ -328,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;
@@ -343,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.11.1",
+  "version": "1.11.3",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",
@@ -34,18 +34,18 @@
   "homepage": "https://github.com/th317erd/mythix-orm#readme",
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "@types/node": "^18.7.17",
-    "better-sqlite3": "^7.6.2",
+    "@types/node": "^18.11.9",
+    "better-sqlite3": "^8.0.0",
     "colors": "^1.4.0",
     "diff": "^5.1.0",
-    "eslint": "^8.23.1",
-    "jasmine": "^4.4.0",
+    "eslint": "^8.28.0",
+    "jasmine": "^4.5.0",
     "nyc": "^15.1.0"
   },
   "dependencies": {
     "events": "^3.3.0",
-    "inflection": "^1.13.2",
-    "luxon": "^3.0.4",
+    "inflection": "^2.0.0",
+    "luxon": "^3.1.0",
     "nife": "^1.12.1",
     "sqlstring": "^2.3.3",
     "uuid": "^9.0.0",