tg-client-query-builder 2.14.1 → 2.14.3

package/index.js

@@ -1,3 +1,3 @@
-const QueryBuilder = require('./query-builder');
+const QueryBuilder = require("./query-builder");
 
-module.exports = QueryBuilder;
+module.exports = QueryBuilder;

package/package.json

@@ -1,25 +1,10 @@
 {
   "name": "tg-client-query-builder",
-  "version": "2.14.1",
+  "version": "2.14.3",
   "description": "Teselagen Client Side (browser) SQL Query Builder",
-  "main": "build/query-builder/index.js",
-  "repository": "https://github.com/TeselaGen/tg-query.git",
   "author": "TeselaGen",
   "license": "ISC",
-  "scripts": {
-    "prepublishOnly": "yarn build",
-    "build": "babel --presets=es2015 query-builder/ --out-dir build/query-builder/"
-  },
   "dependencies": {
     "lodash": "^4.17.4"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-preset-latest": "^6.24.1",
-    "chai": "^4.0.2",
-    "fs-extra": "^3.0.1",
-    "json-beautify": "^1.0.1",
-    "json-format": "^1.0.1",
-    "jsonfile": "^3.0.0"
   }
 }

package/query-builder/combine-queries.js

@@ -1,22 +1,27 @@
+module.exports = function combineQueries(qry1, qry2, joinOperator, opts) {
+  if (qry1.__objectType !== "query")
+    throw new Error("First query is not a query type.");
+  if (qry2.__objectType !== "query")
+    throw new Error("Second query is not a query type.");
+  if (qry1.entity != qry2.entity)
+    throw new Error(
+      "Queries are for different entities " +
+        qry1.entity +
+        " and " +
+        qry2.entity
+    );
 
+  if (joinOperator !== "or") joinOperator = "and";
 
-module.exports = function combineQueries(qry1, qry2, joinOperator, opts){
-    if(qry1.__objectType !== 'query') throw new Error("First query is not a query type.");
-    if(qry2.__objectType !== 'query') throw new Error("Second query is not a query type.");
-    if(qry1.entity != qry2.entity) throw new Error("Queries are for different entities " + qry1.entity + " and " + qry2.entity);
+  var combinedFilters = {
+    type: "group",
+    operator: joinOperator,
+    filters: []
+  };
 
-    if(joinOperator !== 'or') joinOperator = 'and';
+  combinedFilters.filters = qry1.filters.concat(qry2.filters);
 
-    var combinedFilters = 
-    {
-            type: "group",
-            operator: joinOperator,
-            filters: [ ]
-    };
-    
-    combinedFilters.filters = qry1.filters.concat(qry2.filters);
-    
-    qry1.filters = [combinedFilters];
+  qry1.filters = [combinedFilters];
 
-    return qry1;
-}
+  return qry1;
+};

package/query-builder/filter-expression/index.js

@@ -1,20 +1,17 @@
+module.exports = (function() {
+  function FilterExpression(opName, args) {
+    this.name = opName;
+    this.args = args;
+  }
 
-
-
-module.exports = (function(){
-    function FilterExpression(opName, args){
-        this.name = opName;
-        this.args = args;
-    }
-
-    FilterExpression.prototype.toFilter = function(filterBuilder, argName){
-        var filterDef = {
-            type: "expression",
-            operator: this.name,
-            field: argName,
-            args: this.args
-        };
-        return filterDef;
-    } 
-    return FilterExpression;
-})();
+  FilterExpression.prototype.toFilter = function(filterBuilder, argName) {
+    var filterDef = {
+      type: "expression",
+      operator: this.name,
+      field: argName,
+      args: this.args
+    };
+    return filterDef;
+  };
+  return FilterExpression;
+})();

package/query-builder/index.js

@@ -32,25 +32,33 @@ function isDateOrNumber(opName) {
   return () => {
     var args = [].slice.call(arguments);
     if (
-      args.some((arg) => {
+      args.some(arg => {
         return !(_.isDate(arg) || _.isString(arg) || _.isNumber(arg));
       })
     ) {
-      throw new Error(`QueryBuilderError: You must pass a date or number as args to ${opName}. You passed: Args ${args.join(",")}`);
+      throw new Error(
+        `QueryBuilderError: You must pass a date or number as args to ${opName}. You passed: Args ${args.join(
+          ","
+        )}`
+      );
     }
   };
 }
 function isArray(opName) {
-  return (arg) => {
+  return arg => {
     if (!_.isArray(arg)) {
-      throw new Error(`QueryBuilderError: You must pass an array for ${opName} filters. You passed:  ${arg}`);
+      throw new Error(
+        `QueryBuilderError: You must pass an array for ${opName} filters. You passed:  ${arg}`
+      );
     }
   };
 }
 function isString(opName) {
-  return (arg) => {
+  return arg => {
     if (!_.isString(arg)) {
-      throw new Error(`QueryBuilderError: You must pass a string for ${opName} filters. You passed:  ${arg}`);
+      throw new Error(
+        `QueryBuilderError: You must pass a string for ${opName} filters. You passed:  ${arg}`
+      );
     }
   };
 }
@@ -58,7 +66,9 @@ function isString(opName) {
 function numberOfArgs(opName, argLength) {
   return (...args) => {
     if (args.length !== argLength) {
-      throw new Error(`QueryBuilderError: Args for ${opName} are of length ${args.length}, but they should be of length ${argLength}`);
+      throw new Error(
+        `QueryBuilderError: Args for ${opName} are of length ${args.length}, but they should be of length ${argLength}`
+      );
     }
   };
 }
@@ -66,124 +76,139 @@ function numberOfArgs(opName, argLength) {
 const expressionOperators = [
   {
     opName: "greaterThan",
-    sanityChecks: [numberOfArgs("greaterThan", 1), isDateOrNumber("greaterThan")],
+    sanityChecks: [
+      numberOfArgs("greaterThan", 1),
+      isDateOrNumber("greaterThan")
+    ]
   },
   {
     opName: "inList",
-    sanityChecks: [numberOfArgs("inList", 1), isArray("inList")],
+    sanityChecks: [numberOfArgs("inList", 1), isArray("inList")]
   },
   {
     opName: "lessThan",
-    sanityChecks: [numberOfArgs("lessThan", 1), isDateOrNumber("lessThan")],
+    sanityChecks: [numberOfArgs("lessThan", 1), isDateOrNumber("lessThan")]
   },
   {
     opName: "lessThanOrEqual",
-    sanityChecks: [numberOfArgs("lessThanOrEqual", 1), isDateOrNumber("lessThanOrEqual")],
+    sanityChecks: [
+      numberOfArgs("lessThanOrEqual", 1),
+      isDateOrNumber("lessThanOrEqual")
+    ]
   },
   {
     opName: "equals",
-    sanityChecks: [numberOfArgs("equals", 1)],
+    sanityChecks: [numberOfArgs("equals", 1)]
   },
   {
     opName: "greaterThanOrEqual",
-    sanityChecks: [numberOfArgs("greaterThanOrEqual", 1), isDateOrNumber("greaterThanOrEqual")],
+    sanityChecks: [
+      numberOfArgs("greaterThanOrEqual", 1),
+      isDateOrNumber("greaterThanOrEqual")
+    ]
   },
   {
     opName: "notEquals",
-    sanityChecks: [numberOfArgs("notEquals", 1)],
+    sanityChecks: [numberOfArgs("notEquals", 1)]
   },
   {
     opName: "notNull",
-    sanityChecks: [numberOfArgs("notNull", 0)],
+    sanityChecks: [numberOfArgs("notNull", 0)]
   },
   {
     opName: "isNull",
-    sanityChecks: [numberOfArgs("isNull", 0)],
+    sanityChecks: [numberOfArgs("isNull", 0)]
   },
   {
     opName: "between",
-    sanityChecks: [numberOfArgs("between", 2), isDateOrNumber("between")],
+    sanityChecks: [numberOfArgs("between", 2), isDateOrNumber("between")]
   },
   {
     opName: "notInList",
-    sanityChecks: [numberOfArgs("notInList", 1), isArray("notInList")],
+    sanityChecks: [numberOfArgs("notInList", 1), isArray("notInList")]
   },
   {
     opName: "startsWithExactly",
-    sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")],
+    sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")]
   },
   {
     opName: "endsWithExactly",
-    sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")],
+    sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")]
   },
   {
     opName: "containsExactly",
-    sanityChecks: [numberOfArgs("contains", 1), isString("contains")],
+    sanityChecks: [numberOfArgs("contains", 1), isString("contains")]
   },
   {
     opName: "startsWith",
-    sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")],
+    sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")]
   },
   {
     opName: "notStartsWith",
-    sanityChecks: [numberOfArgs("notStartsWith", 1), isString("notStartsWith")],
+    sanityChecks: [numberOfArgs("notStartsWith", 1), isString("notStartsWith")]
   },
   {
     opName: "endsWith",
-    sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")],
+    sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")]
   },
   {
     opName: "notEndsWith",
-    sanityChecks: [numberOfArgs("notEndsWith", 1), isString("notEndsWith")],
+    sanityChecks: [numberOfArgs("notEndsWith", 1), isString("notEndsWith")]
   },
   {
     opName: "contains",
-    sanityChecks: [numberOfArgs("contains", 1), isString("contains")],
+    sanityChecks: [numberOfArgs("contains", 1), isString("contains")]
   },
   {
     opName: "notContains",
-    sanityChecks: [numberOfArgs("notContains", 1), isString("notContains")],
+    sanityChecks: [numberOfArgs("notContains", 1), isString("notContains")]
   },
   {
     opName: "upperCase",
-    sanityChecks: [numberOfArgs("upperCase", 1), isString("upperCase")],
+    sanityChecks: [numberOfArgs("upperCase", 1), isString("upperCase")]
   },
   {
     opName: "lowerCase",
-    sanityChecks: [numberOfArgs("lowerCase", 1), isString("lowerCase")],
+    sanityChecks: [numberOfArgs("lowerCase", 1), isString("lowerCase")]
   },
   {
     opName: "matchesRegex",
-    sanityChecks: [numberOfArgs("matchesRegex", 1), isString("matchesRegex")],
+    sanityChecks: [numberOfArgs("matchesRegex", 1), isString("matchesRegex")]
   },
   {
     opName: "matchesSimilar",
-    sanityChecks: [numberOfArgs("matchesSimilar", 1), isString("matchesSimilar")],
+    sanityChecks: [
+      numberOfArgs("matchesSimilar", 1),
+      isString("matchesSimilar")
+    ]
   },
   {
     opName: "fuzzy",
     sanityChecks: [numberOfArgs("fuzzy", 1), isString("fuzzy")],
-    transform: (arg) => {
+    transform: arg => {
       // Build Regex String
       var matchTerm = "";
       // Split all the search terms
-      var terms = arg.replace(/\W/g, "").replace(" ", "").split("");
+      var terms = arg
+        .replace(/\W/g, "")
+        .replace(" ", "")
+        .split("");
       for (var i = 0; i < terms.length; i++) {
         matchTerm += ".*" + terms[i];
       }
       matchTerm += ".*";
       return {
         newOpName: "matchesRegex",
-        newArgs: [matchTerm],
+        newArgs: [matchTerm]
       };
-    },
-  },
+    }
+  }
 
   // 'subString', //tnr: not yet implemented
   // 'dateOnly', //tnr: not yet implemented
 ];
 
-module.exports = (function () {
+module.exports = (function() {
   // to be implemented
   //
   // filter - done
@@ -217,14 +242,15 @@ module.exports = (function () {
   function QueryBuilder(entity) {
     this.query = {};
 
-    if (entity == null) throw new Error("You must pass the name of the model being filtered!");
+    if (entity == null)
+      throw new Error("You must pass the name of the model being filtered!");
 
     if (typeof entity === "string") {
       this.query = {
         __objectType: "query",
         type: "root",
         entity,
-        filters: [],
+        filters: []
       };
     } else {
       let subQuery = entity;
@@ -234,11 +260,12 @@ module.exports = (function () {
         entity: subQuery.entity,
         foreignKey: subQuery.foreignKey,
         modifier: subQuery.modifier,
+        isArrayRelation: subQuery.isArrayRelation,
         filters: [],
-        countExpression: undefined,
+        countExpression: undefined
       };
       this.parentBuilder = subQuery.parentBuilder;
-      this.toFilter = function (filterBuilder, name) {
+      this.toFilter = function(filterBuilder, name) {
         this.query.foreignKey = name;
         return this.toJSON();
       };
@@ -247,14 +274,14 @@ module.exports = (function () {
 
   QueryBuilder.combineQueries = combineQueries;
 
-  QueryBuilder.prototype.field = function (fieldName) {
+  QueryBuilder.prototype.field = function(fieldName) {
     return {
       __objectType: "field",
-      field: fieldName,
+      field: fieldName
     };
   };
 
-  QueryBuilder.prototype.related = function (relatedEntity, isArrayRelation) {
+  QueryBuilder.prototype.related = function(relatedEntity, isArrayRelation) {
     var tokens = relatedEntity.split(".");
     var entity = tokens[0];
     var key = tokens[1];
@@ -265,7 +292,7 @@ module.exports = (function () {
     return createSubQueryBuilder(this, entity, key, isArrayRelation);
   };
 
-  QueryBuilder.prototype.notRelated = function (relatedEntity, isArrayRelation) {
+  QueryBuilder.prototype.notRelated = function(relatedEntity, isArrayRelation) {
     var tokens = relatedEntity.split(".");
     var entity = tokens[0];
     var key = tokens[1];
@@ -276,7 +303,7 @@ module.exports = (function () {
     return createSubQueryBuilder(this, entity, key, isArrayRelation, "not");
   };
 
-  QueryBuilder.prototype.toJSON = function () {
+  QueryBuilder.prototype.toJSON = function() {
     let qry = JSON.parse(JSON.stringify(this.query));
     if (qry.filters.length > 1) {
       qry.filters = [
@@ -284,14 +311,14 @@ module.exports = (function () {
           type: "group",
           operator: "and",
           chainedWith: "and",
-          filters: qry.filters,
-        },
+          filters: qry.filters
+        }
       ];
     }
     return qry;
   };
 
-  QueryBuilder.prototype.convertToFilter = function (argDef, operator) {
+  QueryBuilder.prototype.convertToFilter = function(argDef, operator) {
     var whereArgs = {};
     var filters = [];
 
@@ -317,7 +344,7 @@ module.exports = (function () {
     if (_.keys(whereArgs).length > 0) {
       filters.unshift({
         type: "where",
-        args: whereArgs,
+        args: whereArgs
       });
     }
 
@@ -327,61 +354,63 @@ module.exports = (function () {
     var filterDef = {
       type: "group",
       operator: operator || "and",
-      filters,
+      filters
     };
     return filterDef;
   };
 
-  QueryBuilder.prototype.where = function () {
+  QueryBuilder.prototype.where = function() {
     var args = [].slice.call(arguments);
     return this.whereAll(args);
   };
 
-  QueryBuilder.prototype.orWhere = function () {
+  QueryBuilder.prototype.orWhere = function() {
     var args = [].slice.call(arguments);
     return this.orWhereAll(args);
   };
 
-  QueryBuilder.prototype.andWhere = function () {
+  QueryBuilder.prototype.andWhere = function() {
     var args = [].slice.call(arguments);
     return this.andWhereAll(args);
   };
 
-  QueryBuilder.prototype.whereAny = function () {
+  QueryBuilder.prototype.whereAny = function() {
     var args = [].slice.call(arguments);
     return whereAny(this, args);
   };
 
-  QueryBuilder.prototype.whereAll = function () {
+  QueryBuilder.prototype.whereAll = function() {
     var args = [].slice.call(arguments);
     return whereAll(this, args);
   };
 
-  QueryBuilder.prototype.andWhereAny = function () {
+  QueryBuilder.prototype.andWhereAny = function() {
     var args = [].slice.call(arguments);
     return whereAny(this, args, "and");
   };
 
-  QueryBuilder.prototype.orWhereAny = function () {
+  QueryBuilder.prototype.orWhereAny = function() {
     var args = [].slice.call(arguments);
     return whereAny(this, args, "or");
   };
 
-  QueryBuilder.prototype.andWhereAll = function () {
+  QueryBuilder.prototype.andWhereAll = function() {
     var args = [].slice.call(arguments);
     return whereAll(this, args, "and");
   };
 
-  QueryBuilder.prototype.orWhereAll = function () {
+  QueryBuilder.prototype.orWhereAll = function() {
     var args = [].slice.call(arguments);
     return whereAll(this, args, "or");
   };
 
-  QueryBuilder.prototype.count = function () {
+  QueryBuilder.prototype.count = function() {
     var args = [].slice.call(arguments);
     if (this.query.type === "subquery") {
       if (this.query.countExpression) {
-        throw new Error("QueryBuilder subquery can only have one count expression");
+        throw new Error(
+          "QueryBuilder subquery can only have one count expression"
+        );
       }
       this.query.countExpression = args[0].toFilter(this, "count");
     } else {
@@ -395,13 +424,19 @@ module.exports = (function () {
 
   return QueryBuilder;
 
-  function createSubQueryBuilder(qb, entity, key, isArrayRelation = true, modifier) {
+  function createSubQueryBuilder(
+    qb,
+    entity,
+    key,
+    isArrayRelation = true,
+    modifier
+  ) {
     return new QueryBuilder({
       parentBuilder: qb,
       entity,
       key,
       modifier,
-      isArrayRelation,
+      isArrayRelation
     });
   }
 
@@ -415,7 +450,7 @@ module.exports = (function () {
           argsToUse = newArgs;
           opNameToUse = newOpName;
         }
-        sanityChecks.forEach((sanityCheck) => {
+        sanityChecks.forEach(sanityCheck => {
           sanityCheck(...args);
         });
         return new FilterExpression(opNameToUse, argsToUse);
@@ -440,16 +475,17 @@ module.exports = (function () {
   }
 
   function where(filterBuilder, operator, whereArgs, chainedWith) {
-    if (!Array.isArray(whereArgs)) return where(filterBuilder, operator, [whereArgs], chainedWith);
+    if (!Array.isArray(whereArgs))
+      return where(filterBuilder, operator, [whereArgs], chainedWith);
 
     var filterDef = {
       type: "group",
       operator,
       chainedWith,
-      filters: [],
+      filters: []
     };
 
-    whereArgs.forEach((arg) => {
+    whereArgs.forEach(arg => {
       //add check for object type TODO
       var filter = filterBuilder.convertToFilter(arg, operator);
       filterDef.filters.push(filter);

package/build/query-builder/combine-queries.js

@@ -1,21 +0,0 @@
-'use strict';
-
-module.exports = function combineQueries(qry1, qry2, joinOperator, opts) {
-    if (qry1.__objectType !== 'query') throw new Error("First query is not a query type.");
-    if (qry2.__objectType !== 'query') throw new Error("Second query is not a query type.");
-    if (qry1.entity != qry2.entity) throw new Error("Queries are for different entities " + qry1.entity + " and " + qry2.entity);
-
-    if (joinOperator !== 'or') joinOperator = 'and';
-
-    var combinedFilters = {
-        type: "group",
-        operator: joinOperator,
-        filters: []
-    };
-
-    combinedFilters.filters = qry1.filters.concat(qry2.filters);
-
-    qry1.filters = [combinedFilters];
-
-    return qry1;
-};

package/build/query-builder/filter-expression/index.js

@@ -1,19 +0,0 @@
-"use strict";
-
-module.exports = function () {
-    function FilterExpression(opName, args) {
-        this.name = opName;
-        this.args = args;
-    }
-
-    FilterExpression.prototype.toFilter = function (filterBuilder, argName) {
-        var filterDef = {
-            type: "expression",
-            operator: this.name,
-            field: argName,
-            args: this.args
-        };
-        return filterDef;
-    };
-    return FilterExpression;
-}();

package/build/query-builder/index.js

@@ -1,453 +0,0 @@
-"use strict";
-
-// valid filters:
-// greaterThan
-// inList
-// lessThan
-// lessThanOrEqual
-// equals
-// greaterThanOrEqual
-// notEquals
-// notNull
-// isNull
-// between
-// notInList
-// startsWithExactly
-// endsWithExactly
-// containsExactly
-// startsWith
-// notStartsWith
-// endsWith
-// notEndsWith
-// contains
-// notContains
-// upperCase
-// lowerCase
-// matchesRegex (note: this takes a string like "thomas.*is.*cool", don't include the outer slashes like /asdf/ and don't pass a regex object )
-// fuzzy
-var FilterExpression = require("./filter-expression");
-var _ = require("lodash");
-
-var combineQueries = require("./combine-queries");
-
-function isDateOrNumber(opName) {
-  var _arguments = arguments;
-
-  return function () {
-    var args = [].slice.call(_arguments);
-    if (args.some(function (arg) {
-      return !(_.isDate(arg) || _.isString(arg) || _.isNumber(arg));
-    })) {
-      throw new Error("QueryBuilderError: You must pass a date or number as args to " + opName + ". You passed: Args " + args.join(","));
-    }
-  };
-}
-function isArray(opName) {
-  return function (arg) {
-    if (!_.isArray(arg)) {
-      throw new Error("QueryBuilderError: You must pass an array for " + opName + " filters. You passed:  " + arg);
-    }
-  };
-}
-function isString(opName) {
-  return function (arg) {
-    if (!_.isString(arg)) {
-      throw new Error("QueryBuilderError: You must pass a string for " + opName + " filters. You passed:  " + arg);
-    }
-  };
-}
-
-function numberOfArgs(opName, argLength) {
-  return function () {
-    if (arguments.length !== argLength) {
-      throw new Error("QueryBuilderError: Args for " + opName + " are of length " + arguments.length + ", but they should be of length " + argLength);
-    }
-  };
-}
-
-var expressionOperators = [{
-  opName: "greaterThan",
-  sanityChecks: [numberOfArgs("greaterThan", 1), isDateOrNumber("greaterThan")]
-}, {
-  opName: "inList",
-  sanityChecks: [numberOfArgs("inList", 1), isArray("inList")]
-}, {
-  opName: "lessThan",
-  sanityChecks: [numberOfArgs("lessThan", 1), isDateOrNumber("lessThan")]
-}, {
-  opName: "lessThanOrEqual",
-  sanityChecks: [numberOfArgs("lessThanOrEqual", 1), isDateOrNumber("lessThanOrEqual")]
-}, {
-  opName: "equals",
-  sanityChecks: [numberOfArgs("equals", 1)]
-}, {
-  opName: "greaterThanOrEqual",
-  sanityChecks: [numberOfArgs("greaterThanOrEqual", 1), isDateOrNumber("greaterThanOrEqual")]
-}, {
-  opName: "notEquals",
-  sanityChecks: [numberOfArgs("notEquals", 1)]
-}, {
-  opName: "notNull",
-  sanityChecks: [numberOfArgs("notNull", 0)]
-}, {
-  opName: "isNull",
-  sanityChecks: [numberOfArgs("isNull", 0)]
-}, {
-  opName: "between",
-  sanityChecks: [numberOfArgs("between", 2), isDateOrNumber("between")]
-}, {
-  opName: "notInList",
-  sanityChecks: [numberOfArgs("notInList", 1), isArray("notInList")]
-}, {
-  opName: "startsWithExactly",
-  sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")]
-}, {
-  opName: "endsWithExactly",
-  sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")]
-}, {
-  opName: "containsExactly",
-  sanityChecks: [numberOfArgs("contains", 1), isString("contains")]
-}, {
-  opName: "startsWith",
-  sanityChecks: [numberOfArgs("startsWith", 1), isString("startsWith")]
-}, {
-  opName: "notStartsWith",
-  sanityChecks: [numberOfArgs("notStartsWith", 1), isString("notStartsWith")]
-}, {
-  opName: "endsWith",
-  sanityChecks: [numberOfArgs("endsWith", 1), isString("endsWith")]
-}, {
-  opName: "notEndsWith",
-  sanityChecks: [numberOfArgs("notEndsWith", 1), isString("notEndsWith")]
-}, {
-  opName: "contains",
-  sanityChecks: [numberOfArgs("contains", 1), isString("contains")]
-}, {
-  opName: "notContains",
-  sanityChecks: [numberOfArgs("notContains", 1), isString("notContains")]
-}, {
-  opName: "upperCase",
-  sanityChecks: [numberOfArgs("upperCase", 1), isString("upperCase")]
-}, {
-  opName: "lowerCase",
-  sanityChecks: [numberOfArgs("lowerCase", 1), isString("lowerCase")]
-}, {
-  opName: "matchesRegex",
-  sanityChecks: [numberOfArgs("matchesRegex", 1), isString("matchesRegex")]
-}, {
-  opName: "matchesSimilar",
-  sanityChecks: [numberOfArgs("matchesSimilar", 1), isString("matchesSimilar")]
-}, {
-  opName: "fuzzy",
-  sanityChecks: [numberOfArgs("fuzzy", 1), isString("fuzzy")],
-  transform: function transform(arg) {
-    // Build Regex String
-    var matchTerm = "";
-    // Split all the search terms
-    var terms = arg.replace(/\W/g, "").replace(" ", "").split("");
-    for (var i = 0; i < terms.length; i++) {
-      matchTerm += ".*" + terms[i];
-    }
-    matchTerm += ".*";
-    return {
-      newOpName: "matchesRegex",
-      newArgs: [matchTerm]
-    };
-  }
-}];
-
-module.exports = function () {
-  // to be implemented
-  //
-  // filter - done
-  // lessThan - done
-  // lessThanOrEqual - done
-  // greaterThan - done
-  // greaterThanOrEqual - done
-  // equals - done
-  // notEquals - done
-  // notNull
-  // isNull
-  // between
-  // inList - done
-  // notInList
-  // related - done
-  // notRelated - done
-  // startsWith LIKE adsd%
-  // endsWith
-  // contains LIKE
-  // notContains NOT LIKE
-  // dateOnly
-  // upperCase
-  // lowerCase
-  // subString
-  // matchesRegex
-  // count - Done
-
-  // log("FilterBuilder in QueryBuilder");
-  // log(FilterBuilder);
-
-  function QueryBuilder(entity) {
-    this.query = {};
-
-    if (entity == null) throw new Error("You must pass the name of the model being filtered!");
-
-    if (typeof entity === "string") {
-      this.query = {
-        __objectType: "query",
-        type: "root",
-        entity: entity,
-        filters: []
-      };
-    } else {
-      var subQuery = entity;
-      this.query = {
-        type: "subquery",
-        key: subQuery.key,
-        entity: subQuery.entity,
-        foreignKey: subQuery.foreignKey,
-        modifier: subQuery.modifier,
-        filters: [],
-        countExpression: undefined
-      };
-      this.parentBuilder = subQuery.parentBuilder;
-      this.toFilter = function (filterBuilder, name) {
-        this.query.foreignKey = name;
-        return this.toJSON();
-      };
-    }
-  }
-
-  QueryBuilder.combineQueries = combineQueries;
-
-  QueryBuilder.prototype.field = function (fieldName) {
-    return {
-      __objectType: "field",
-      field: fieldName
-    };
-  };
-
-  QueryBuilder.prototype.related = function (relatedEntity, isArrayRelation) {
-    var tokens = relatedEntity.split(".");
-    var entity = tokens[0];
-    var key = tokens[1];
-
-    // log("FilterBuilder in related");
-    // log(FilterBuilder);
-
-    return createSubQueryBuilder(this, entity, key, isArrayRelation);
-  };
-
-  QueryBuilder.prototype.notRelated = function (relatedEntity, isArrayRelation) {
-    var tokens = relatedEntity.split(".");
-    var entity = tokens[0];
-    var key = tokens[1];
-
-    // log("FilterBuilder in notRelated");
-    // log(FilterBuilder);
-
-    return createSubQueryBuilder(this, entity, key, isArrayRelation, "not");
-  };
-
-  QueryBuilder.prototype.toJSON = function () {
-    var qry = JSON.parse(JSON.stringify(this.query));
-    if (qry.filters.length > 1) {
-      qry.filters = [{
-        type: "group",
-        operator: "and",
-        chainedWith: "and",
-        filters: qry.filters
-      }];
-    }
-    return qry;
-  };
-
-  QueryBuilder.prototype.convertToFilter = function (argDef, operator) {
-    var _this = this;
-
-    var whereArgs = {};
-    var filters = [];
-
-    _.each(argDef, function (arg, name) {
-      // log(name);
-      // if(arg.constructor){
-      //     log(arg.constructor.name)
-      // }else{
-      //     log("not a prototype")
-      // }
-      if (!isFilterExpresionOrSubQuery(name, arg)) {
-        if (Array.isArray(arg)) {
-          filters.push(_this.inList(arg).toFilter(_this, name));
-        } else {
-          //log("Is Where Filter: " + name);
-          whereArgs[name] = arg;
-        }
-      } else {
-        //log("Is Expression or SubQuery Filter: " + name);
-        filters.push(arg.toFilter(_this, name));
-      }
-    });
-    if (_.keys(whereArgs).length > 0) {
-      filters.unshift({
-        type: "where",
-        args: whereArgs
-      });
-    }
-
-    if (filters.length === 1) {
-      return filters[0];
-    }
-    var filterDef = {
-      type: "group",
-      operator: operator || "and",
-      filters: filters
-    };
-    return filterDef;
-  };
-
-  QueryBuilder.prototype.where = function () {
-    var args = [].slice.call(arguments);
-    return this.whereAll(args);
-  };
-
-  QueryBuilder.prototype.orWhere = function () {
-    var args = [].slice.call(arguments);
-    return this.orWhereAll(args);
-  };
-
-  QueryBuilder.prototype.andWhere = function () {
-    var args = [].slice.call(arguments);
-    return this.andWhereAll(args);
-  };
-
-  QueryBuilder.prototype.whereAny = function () {
-    var args = [].slice.call(arguments);
-    return whereAny(this, args);
-  };
-
-  QueryBuilder.prototype.whereAll = function () {
-    var args = [].slice.call(arguments);
-    return whereAll(this, args);
-  };
-
-  QueryBuilder.prototype.andWhereAny = function () {
-    var args = [].slice.call(arguments);
-    return whereAny(this, args, "and");
-  };
-
-  QueryBuilder.prototype.orWhereAny = function () {
-    var args = [].slice.call(arguments);
-    return whereAny(this, args, "or");
-  };
-
-  QueryBuilder.prototype.andWhereAll = function () {
-    var args = [].slice.call(arguments);
-    return whereAll(this, args, "and");
-  };
-
-  QueryBuilder.prototype.orWhereAll = function () {
-    var args = [].slice.call(arguments);
-    return whereAll(this, args, "or");
-  };
-
-  QueryBuilder.prototype.count = function () {
-    var args = [].slice.call(arguments);
-    if (this.query.type === "subquery") {
-      if (this.query.countExpression) {
-        throw new Error("QueryBuilder subquery can only have one count expression");
-      }
-      this.query.countExpression = args[0].toFilter(this, "count");
-    } else {
-      throw new Error("QueryBuilder is not subquery type on count expression");
-    }
-
-    return this;
-  };
-  QueryBuilder.ExpressionJson = {};
-  attachExpressionFunctions();
-
-  return QueryBuilder;
-
-  function createSubQueryBuilder(qb, entity, key) {
-    var isArrayRelation = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-    var modifier = arguments[4];
-
-    return new QueryBuilder({
-      parentBuilder: qb,
-      entity: entity,
-      key: key,
-      modifier: modifier,
-      isArrayRelation: isArrayRelation
-    });
-  }
-
-  function attachExpressionFunctions() {
-    expressionOperators.forEach(function (_ref) {
-      var opName = _ref.opName,
-          sanityChecks = _ref.sanityChecks,
-          transform = _ref.transform;
-
-      var filter = function filter() {
-        for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-
-        var argsToUse = args;
-        var opNameToUse = opName;
-        if (transform) {
-          var _transform = transform.apply(undefined, args),
-              newOpName = _transform.newOpName,
-              newArgs = _transform.newArgs;
-
-          argsToUse = newArgs;
-          opNameToUse = newOpName;
-        }
-        sanityChecks.forEach(function (sanityCheck) {
-          sanityCheck.apply(undefined, args);
-        });
-        return new FilterExpression(opNameToUse, argsToUse);
-      };
-      QueryBuilder.prototype[opName] = filter;
-      QueryBuilder.ExpressionJson[opName] = filter;
-    });
-  }
-
-  function isFilterExpresionOrSubQuery(name, arg) {
-    if (arg instanceof FilterExpression) return true;
-    if (arg instanceof QueryBuilder) return true;
-    return false;
-  }
-
-  function whereAny(filterBuilder, whereArgs, chainedWith) {
-    return where(filterBuilder, "or", whereArgs, chainedWith);
-  }
-
-  function whereAll(filterBuilder, whereArgs, chainedWith) {
-    return where(filterBuilder, "and", whereArgs, chainedWith);
-  }
-
-  function where(filterBuilder, operator, whereArgs, chainedWith) {
-    if (!Array.isArray(whereArgs)) return where(filterBuilder, operator, [whereArgs], chainedWith);
-
-    var filterDef = {
-      type: "group",
-      operator: operator,
-      chainedWith: chainedWith,
-      filters: []
-    };
-
-    whereArgs.forEach(function (arg) {
-      //add check for object type TODO
-      var filter = filterBuilder.convertToFilter(arg, operator);
-      filterDef.filters.push(filter);
-    });
-
-    // if (filterDef.filters.length === 1) {
-    //   filterBuilder.query.filters.push(filterDef.filters[0]);
-    // } else {
-    //   filterBuilder.query.filters.push(filterDef);
-    // }
-    filterBuilder.query.filters.push(filterDef);
-    return filterBuilder;
-  }
-}();