breeze-sequelize - npm Package Compare versions

Comparing version 0.2.2 to 0.3.0

package.json

 {
   "name": "breeze-sequelize",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Breeze Sequelize server implementation",
@@ -16,11 +16,11 @@ "keywords": [
   "dependencies": {
-    "bluebird": "^3.5.1",
-    "breeze-client": "*",
-    "lodash": "^4.17.5",
-    "sequelize": "^4.36.0",
-    "toposort": "^1.0.6"
+    "bluebird": "^3.5.5",
+    "breeze-client": "^1.7.2",
+    "lodash": "^4.17.15",
+    "sequelize": "^5.18.1",
+    "toposort": "^2.0.2"
   },
   "devDependencies": {
-    "mocha": "*",
-    "chai": "*"
+    "chai": "^4.2.0",
+    "mocha": "^6.2.0"
   },
@@ -27,0 +27,0 @@ "scripts": {

SequelizeQuery.json.js

@@ -6,2 +6,3 @@ var Sequelize = require('sequelize');
 var _ = require('lodash');
+var Op = Sequelize.Op;
 
@@ -498,2 +499,3 @@ var EntityQuery = breeze.EntityQuery;
       var crit;
+      var like = _boolOpMap.like.sequelizeOp;
       if (this.expr2.visitorMethodName === "litExpr") {
@@ -506,7 +508,7 @@ p2Value = this.expr2.value;
         } else if (op == "startswith") {
-          crit = { like: p2Value + "%" };
+          crit = { [like]: p2Value + "%" };
         } else if (op === "endswith") {
-          crit = { like: "%" + p2Value };
+          crit = { [like]: "%" + p2Value };
         } else if (op === "contains") {
-          crit =  { like: "%" + p2Value + "%" };
+          crit =  { [like]: "%" + p2Value + "%" };
         } else {
@@ -528,7 +530,7 @@ crit = {};
         } else if (op === "startswith") {
-          crit =  { like: Sequelize.literal("concat(" + p2Value + ",'%')") };
+          crit =  { [like]: Sequelize.literal("concat(" + p2Value + ",'%')") };
         } else if (op === "endswith") {
-          crit =  { like: Sequelize.literal("concat('%'," + p2Value + ")") };
+          crit =  { [like]: Sequelize.literal("concat('%'," + p2Value + ")") };
         } else if (op === "contains") {
-          crit = { like: Sequelize.literal("concat('%'," + p2Value + ",'%')") };
+          crit = { [like]: Sequelize.literal("concat('%'," + p2Value + ",'%')") };
         } else {
@@ -604,3 +606,3 @@ var crit = {};
         if (wheres.length > 0) {
-          result.where = wheres.length == 1 ? wheres[0] : { and: wheres };
+          result.where = wheres.length == 1 ? wheres[0] : { [Op.and]: wheres };
         }
@@ -613,3 +615,3 @@ // q = Sequelize.and(q1, q2);
         if (wheres.length > 0) {
-          result.where = wheres.length == 1 ? wheres[0] : { or: wheres };
+          result.where = wheres.length == 1 ? wheres[0] : { [Op.or]: wheres };
         }
@@ -639,5 +641,6 @@ // q = Sequelize.or(q1, q2);
       var r = this.pred.visit(newContext);
-      include.where = r.where;
+      include.where = r.where || {};
+      include.require = true;
       if (r.include) include.include = r.include;
-      return { include: parent.include }
+      return { include: parent.include };
 
@@ -794,8 +797,9 @@ },
   var results = [], result;
-  for (var k in q1) {
+  var keys = Reflect.ownKeys(q1);
+  for (var k of keys) {
     var v = q1[k];
-    if (k === "or") {
-      result = { and: [ applyNot(v[0]), applyNot(v[1]) ] };
-    } else if (k === "and") {
-      result = { or: [ applyNot(v[0]), applyNot(v[1]) ] };
+    if (k === Op.or) {
+      result = { [Op.and]: [ applyNot(v[0]), applyNot(v[1]) ] };
+    } else if (k === Op.and) {
+      result = { [Op.or]: [ applyNot(v[0]), applyNot(v[1]) ] };
     } else if ( _notOps[k] ) {
@@ -809,3 +813,3 @@ result = {};
       } else {
-        result[k] = { "ne": v };
+        result[k] = { [Op.ne]: v };
       }
@@ -821,3 +825,3 @@ }
     // queries should only have a single node
-    return { "or": results };
+    return { [Op.or]: results };
   }
@@ -835,5 +839,7 @@ }
   });
+  console.trace(parent);
 }
 
 function processAndOrClause(where) {
+  console.log("processAndOrClause", where);
   if (where.and) {
@@ -856,10 +862,10 @@ clauses = where.and.map(function (clause) {
 var _boolOpMap = {
-  eq: { not: "ne"},
-  gt: { sequelizeOp: "gt",  not: "le" },
-  ge: { sequelizeOp: "gte", not: "lt"  },
-  lt: { sequelizeOp: "lt",  not: "ge"},
-  le: { sequelizeOp: "lte", not: "gt" },
-  ne: { sequelizeOp: "ne",  not: "eq" },
-  in: { sequelizeOp: "in" },
-  like: { sequelizeOp: "like"}
+  eq: { not: Op.ne },
+  gt: { sequelizeOp: Op.gt,  not: Op.le },
+  ge: { sequelizeOp: Op.gte, not: Op.lt },
+  lt: { sequelizeOp: Op.lt,  not: Op.ge },
+  le: { sequelizeOp: Op.lte, not: Op.gt },
+  ne: { sequelizeOp: Op.ne,  not: Op.eq },
+  in: { sequelizeOp: Op.in },
+  like: { sequelizeOp: Op.like }
 };
@@ -877,3 +883,14 @@
   in: "notIn",
-  notIn: "in"
+  notIn: "in",
+
+  [Op.gt]: Op.lte,
+  [Op.lte]: Op.gt,
+  [Op.gte]: Op.lt,
+  [Op.lt]: Op.gte,
+  [Op.ne]: Op.eq,
+  [Op.like]: Op.notLike,
+  [Op.notLike]: Op.like,
+  [Op.in]: Op.notIn,
+  [Op.notIn]: Op.in
+
 };
@@ -891,4 +908,1 @@
 // --------------------------------
-
-
-

Fixed alerts

Floating dependency

Quality

Package has a dependency with a floating version range. This can cause issues if the dependency publishes a new major version.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

642789

increased by900.92%

Number of package files

11

increased by10%

Lines of code

1574

increased by0.96%

Number of medium quality alerts

1

decreased by-50%

Dependency changes

• + Addedany-promise@1.3.0(transitive)

• + Addedbreeze-client@1.7.2(transitive)

• + Addeddebug@4.3.5(transitive)

• + Addedms@2.1.2(transitive)

• + Addedretry-as-promised@3.2.0(transitive)

• + Addedsemver@6.3.1(transitive)

• + Addedsequelize@5.22.5(transitive)

• + Addedsequelize-pool@2.3.0(transitive)

• + Addedtoposort@2.0.2(transitive)

• + Addeduuid@8.3.2(transitive)

• + Addedvalidator@13.12.0(transitive)

• - Removed@types/geojson@1.0.6(transitive)

• - Removedbreeze-client@2.1.5(transitive)

• - Removeddebug@2.6.93.2.7(transitive)

• - Removeddepd@1.1.2(transitive)

• - Removedgeneric-pool@3.5.0(transitive)

• - Removedms@2.0.02.1.3(transitive)

• - Removedretry-as-promised@2.3.2(transitive)

• - Removedsemver@5.7.2(transitive)

• - Removedsequelize@4.44.4(transitive)

• - Removedterraformer@1.0.12(transitive)

• - Removedterraformer-wkt-parser@1.2.1(transitive)

• - Removedtoposort@1.0.7(transitive)

• - Removedtslib@1.14.1(transitive)

• - Removeduuid@3.4.0(transitive)

• - Removedvalidator@10.11.0(transitive)

• Updatedbluebird@^3.5.5

• Updatedbreeze-client@^1.7.2

• Updatedlodash@^4.17.15

• Updatedsequelize@^5.18.1

• Updatedtoposort@^2.0.2