query-core 0.2.8 → 0.5.0

package/lib/SearchBuilder.js

@@ -21,7 +21,7 @@ exports.mssql = "mssql";
 exports.mysql = "mysql";
 exports.sqlite = "sqlite";
 var SearchBuilder = (function () {
-  function SearchBuilder(query, table, attrs, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+  function SearchBuilder(query, table, attrs, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) {
     this.query = query;
     this.table = table;
     this.attrs = attrs;
@@ -99,8 +99,8 @@ var SearchBuilder = (function () {
 exports.SearchBuilder = SearchBuilder;
 var SqlSearchWriter = (function (_super) {
   __extends(SqlSearchWriter, _super);
-  function SqlSearchWriter(manager, table, attributes, buildQ, provider, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    var _this = _super.call(this, manager.query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
+  function SqlSearchWriter(manager, table, attributes, provider, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+    var _this = _super.call(this, manager.query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
     _this.attributes = attributes;
     _this.toDB = toDB;
     _this.exec = manager.exec;
@@ -154,8 +154,8 @@ var SqlSearchWriter = (function (_super) {
 exports.SqlSearchWriter = SqlSearchWriter;
 var SqlRepository = (function (_super) {
   __extends(SqlRepository, _super);
-  function SqlRepository(manager, table, attributes, buildQ, provider, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    var _this = _super.call(this, manager, table, attributes, buildQ, provider, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
+  function SqlRepository(manager, table, attributes, provider, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+    var _this = _super.call(this, manager, table, attributes, provider, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
     _this.attributes = attributes;
     _this.toDB = toDB;
     _this.metadata = _this.metadata.bind(_this);
@@ -216,7 +216,7 @@ exports.SqlRepository = SqlRepository;
 var Query = (function (_super) {
   __extends(Query, _super);
   function Query(query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    var _this = _super.call(this, query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
+    var _this = _super.call(this, query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
     var m = build_1.metadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;

package/lib/query.js

@@ -99,37 +99,23 @@ function buildQuery(filter, param, sort, buildSort3, attrs, table, fields, sq, s
             if (attr.q) {
               ex.push(key);
             }
-            if (attr.match === "equal") {
+            if (attr.operator === "=") {
               filters.push(field + " = " + param(i++));
               args.push(v);
             }
-            else if (attr.match === "prefix") {
+            else if (attr.operator === "like") {
               filters.push(field + " " + like + " " + param(i++));
-              args.push(v + "%");
+              args.push("%" + v + "%");
             }
             else {
               filters.push(field + " " + like + " " + param(i++));
-              args.push("%" + v + "%");
+              args.push(v + "%");
             }
           }
         }
-        else if (v instanceof Date) {
-          if (attr.match === "max") {
-            filters.push(field + " <= " + param(i++));
-            args.push(v);
-          }
-          else {
-            filters.push(field + " >= " + param(i++));
-            args.push(v);
-          }
-        }
-        else if (typeof v === "number") {
-          if (attr.match === "max") {
-            filters.push(field + " <= " + v);
-          }
-          else {
-            filters.push(field + " >= " + v);
-          }
+        else if (typeof v === "number" || v instanceof Date) {
+          var operator = attr.operator ? attr.operator : ">=";
+          filters.push(field + " " + operator + " " + param(i++));
         }
         else if (attr.type === "ObjectId") {
           filters.push(field + " = " + param(i++));
@@ -236,17 +222,17 @@ function buildQuery(filter, param, sort, buildSort3, attrs, table, fields, sq, s
       var attr = attrs[field];
       if (attr.q && (attr.type === undefined || attr.type === "string") && !ex.includes(field)) {
         var column = attr.column ? attr.column : field;
-        if (attr.match === "equal") {
+        if (attr.operator === "=") {
           qfilters.push(column + " = " + param(i++));
           args.push(q);
         }
-        else if (attr.match === "prefix") {
+        else if (attr.operator === "like") {
           qfilters.push(column + " " + like + " " + param(i++));
-          args.push(q + "%");
+          args.push("%" + q + "%");
         }
         else {
           qfilters.push(column + " " + like + " " + param(i++));
-          args.push("%" + q + "%");
+          args.push(q + "%");
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-core",
-  "version": "0.2.8",
+  "version": "0.5.0",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/SearchBuilder.ts

@@ -34,9 +34,10 @@ export class SearchBuilder<T, S> {
     protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
     protected table: string,
     protected attrs?: Attributes,
+    protected provider?: string,
     buildQ?: (
       s: S,
-      bparam: (i: number) => string,
+      param: (i: number) => string,
       sort?: string,
       buildSort3?: (sort?: string, map?: Attributes | StringMap) => string,
       attrs?: Attributes,
@@ -46,7 +47,6 @@ export class SearchBuilder<T, S> {
       strExcluding?: string,
       likeType?: LikeType
     ) => Statement | undefined,
-    protected provider?: string,
     protected fromDB?: (v: T) => T,
     protected sort?: string,
     q?: string,
@@ -122,6 +122,7 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     manager: Manager,
     table: string,
     protected attributes: Attributes,
+    provider?: string,
     buildQ?: (
       s: S,
       param: (i: number) => string,
@@ -134,7 +135,6 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
       strExcluding?: string,
       likeType?: LikeType
     ) => Statement | undefined,
-    provider?: string,
     protected toDB?: (v: T) => T,
     fromDB?: (v: T) => T,
     sort?: string,
@@ -144,7 +144,7 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(manager.query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(manager.query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
     this.exec = manager.exec
     const x = version(attributes)
     if (x) {
@@ -194,9 +194,10 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     manager: Manager,
     table: string,
     protected attributes: Attributes,
+    provider?: string,
     buildQ?: (
       s: S,
-      bparam: LikeType | ((i: number) => string),
+      param: (i: number) => string,
       sort?: string,
       buildSort3?: (sort?: string, map?: Attributes | StringMap) => string,
       attrs?: Attributes,
@@ -204,8 +205,8 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
       fields?: string[],
       sq?: string,
       strExcluding?: string,
+      likeType?: LikeType
     ) => Statement | undefined,
-    provider?: string,
     protected toDB?: (v: T) => T,
     fromDB?: (v: T) => T,
     sort?: string,
@@ -215,7 +216,7 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(manager, table, attributes, buildQ, provider, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(manager, table, attributes, provider, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total)
     this.metadata = this.metadata.bind(this)
     this.all = this.all.bind(this)
     this.load = this.load.bind(this)
@@ -277,7 +278,7 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
     attributes: Attributes,
     buildQ?: (
       s: S,
-      bparam: LikeType | ((i: number) => string),
+      param: (i: number) => string,
       sort?: string,
       buildSort3?: (sort?: string, map?: Attributes | StringMap) => string,
       attrs?: Attributes,
@@ -285,6 +286,7 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
       fields?: string[],
       sq?: string,
       strExcluding?: string,
+      likeType?: LikeType
     ) => Statement | undefined,
     provider?: string,
     fromDB?: (v: T) => T,
@@ -295,7 +297,7 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
     buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
     const m = metadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map

package/src/metadata.ts

@@ -40,7 +40,7 @@ export type DataType =
   | "datetimes"
   | "times"
 export type FormatType = "currency" | "percentage" | "email" | "url" | "phone" | "fax" | "ipv4" | "ipv6"
-export type MatchType = "equal" | "prefix" | "contain" | "max" | "min" // contain: default for string, min: default for Date, number
+export type Operator = "=" | "like" | "!=" | "<>" | ">" | ">=" | "<" | "<="
 
 export interface Model {
   name?: string
@@ -55,7 +55,7 @@ export interface Attribute {
   name?: string
   column?: string
   type?: DataType
-  match?: MatchType
+  operator?: Operator
   default?: string | number | Date | boolean
   key?: boolean
   q?: boolean

package/src/query.ts

@@ -106,31 +106,20 @@ export function buildQuery<S>(
             if (attr.q) {
               ex.push(key)
             }
-            if (attr.match === "equal") {
+            if (attr.operator === "=") {
               filters.push(`${field} = ${param(i++)}`)
               args.push(v)
-            } else if (attr.match === "prefix") {
+            } else if (attr.operator === "like") {
               filters.push(`${field} ${like} ${param(i++)}`)
-              args.push(v + "%")
+              args.push("%" + v + "%")
             } else {
               filters.push(`${field} ${like} ${param(i++)}`)
-              args.push("%" + v + "%")
+              args.push(v + "%")
             }
           }
-        } else if (v instanceof Date) {
-          if (attr.match === "max") {
-            filters.push(`${field} <= ${param(i++)}`)
-            args.push(v)
-          } else {
-            filters.push(`${field} >= ${param(i++)}`)
-            args.push(v)
-          }
-        } else if (typeof v === "number") {
-          if (attr.match === "max") {
-            filters.push(`${field} <= ${v}`)
-          } else {
-            filters.push(`${field} >= ${v}`)
-          }
+        } else if (typeof v === "number" || v instanceof Date) {
+          const operator = attr.operator ? attr.operator : ">="
+          filters.push(`${field} ${operator} ${param(i++)}`)
         } else if (attr.type === "ObjectId") {
           filters.push(`${field} = ${param(i++)}`)
           args.push(v)
@@ -219,15 +208,15 @@ export function buildQuery<S>(
       const attr = attrs[field]
       if (attr.q && (attr.type === undefined || attr.type === "string") && !ex.includes(field)) {
         const column = attr.column ? attr.column : field
-        if (attr.match === "equal") {
+        if (attr.operator === "=") {
           qfilters.push(`${column} = ${param(i++)}`)
           args.push(q)
-        } else if (attr.match === "prefix") {
+        } else if (attr.operator === "like") {
           qfilters.push(`${column} ${like} ${param(i++)}`)
-          args.push(q + "%")
+          args.push("%" + q + "%")
         } else {
           qfilters.push(`${column} ${like} ${param(i++)}`)
-          args.push("%" + q + "%")
+          args.push(q + "%")
         }
       }
     }