query-core 0.3.0 → 0.5.1

package/lib/SearchBuilder.js

@@ -99,11 +99,11 @@ var SearchBuilder = (function () {
 exports.SearchBuilder = SearchBuilder;
 var SqlSearchWriter = (function (_super) {
   __extends(SqlSearchWriter, _super);
-  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;
+  function SqlSearchWriter(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+    var _this = _super.call(this, db.query, table, attributes, db.driver, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
     _this.attributes = attributes;
     _this.toDB = toDB;
-    _this.exec = manager.exec;
+    _this.exec = db.exec;
     var x = build_1.version(attributes);
     if (x) {
       _this.version = x.name;
@@ -154,8 +154,8 @@ var SqlSearchWriter = (function (_super) {
 exports.SqlSearchWriter = SqlSearchWriter;
 var SqlRepository = (function (_super) {
   __extends(SqlRepository, _super);
-  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;
+  function SqlRepository(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+    var _this = _super.call(this, db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
     _this.attributes = attributes;
     _this.toDB = toDB;
     _this.metadata = _this.metadata.bind(_this);

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/lib/services.js

@@ -461,10 +461,10 @@ var SqlWriter = (function () {
 exports.SqlWriter = SqlWriter;
 var CRUDRepository = (function (_super) {
   __extends(CRUDRepository, _super);
-  function CRUDRepository(manager, table, attributes, toDB, fromDB) {
-    var _this = _super.call(this, manager.exec, manager.param, table, attributes, toDB) || this;
+  function CRUDRepository(db, table, attributes, toDB, fromDB) {
+    var _this = _super.call(this, db.exec, db.param, table, attributes, toDB) || this;
     _this.fromDB = fromDB;
-    _this.query = manager.query;
+    _this.query = db.query;
     var m = build_1.metadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;

package/package.json

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

package/src/SearchBuilder.ts

@@ -1,4 +1,4 @@
-import { Manager } from "./services"
+import { DB, Manager } from "./services"
 import { buildToDelete, buildToInsert, buildToUpdate, exist, metadata, param, select, version } from "./build"
 import { Attribute, Attributes, Statement, StringMap } from "./metadata"
 import { buildSort as bs, buildDollarParam, buildMsSQLParam, buildOracleParam, buildQuery, LikeType } from "./query"
@@ -119,10 +119,9 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
   protected version?: string
   protected exec: (sql: string, args?: any[], ctx?: any) => Promise<number>
   constructor(
-    manager: Manager,
+    db: DB,
     table: string,
     protected attributes: Attributes,
-    provider?: string,
     buildQ?: (
       s: S,
       param: (i: number) => string,
@@ -144,8 +143,8 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(manager.query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
-    this.exec = manager.exec
+    super(db.query, table, attributes, db.driver, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    this.exec = db.exec
     const x = version(attributes)
     if (x) {
       this.version = x.name
@@ -191,10 +190,9 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
 // tslint:disable-next-line:max-classes-per-file
 export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
   constructor(
-    manager: Manager,
+    db: DB,
     table: string,
     protected attributes: Attributes,
-    provider?: string,
     buildQ?: (
       s: S,
       param: (i: number) => string,
@@ -216,7 +214,7 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(manager, table, attributes, provider, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(db, table, attributes, 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)

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 + "%")
         }
       }
     }

package/src/services.ts

@@ -112,190 +112,16 @@ export class QueryRepository<T, ID> {
     return this.db.query<T>(sql, ids, this.map, this.bools)
   }
 }
-/*
-// tslint:disable-next-line:max-classes-per-file
-export class SqlLoadRepository<T, K1, K2> {
-  map?: StringMap
-  attributes: Attributes
-  bools?: Attribute[]
-  id1Col: string
-  id2Col: string
-  constructor(
-    public query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
-    public table: string,
-    attrs: Attributes,
-    public param: (i: number) => string,
-    public id1Field: string,
-    public id2Field: string,
-    public fromDB?: (v: T) => T,
-    id1Col?: string,
-    id2Col?: string,
-  ) {
-    const m = metadata(attrs)
-    this.attributes = attrs
-    this.map = m.map
-    this.bools = m.bools
 
-    if (this.metadata) {
-      this.metadata = this.metadata.bind(this)
-    }
-    this.all = this.all.bind(this)
-    this.load = this.load.bind(this)
-    this.exist = this.exist.bind(this)
-    if (id1Col && id1Col.length > 0) {
-      this.id1Col = id1Col
-    } else {
-      const c = attrs[this.id1Field]
-      if (c) {
-        this.id1Col = c.column && c.column.length > 0 ? c.column : this.id1Field
-      } else {
-        this.id1Col = this.id1Field
-      }
-    }
-    if (id2Col && id2Col.length > 0) {
-      this.id2Col = id2Col
-    } else {
-      const c = attrs[this.id2Field]
-      if (c) {
-        this.id2Col = c.column && c.column.length > 0 ? c.column : this.id2Field
-      } else {
-        this.id2Col = this.id2Field
-      }
-    }
-  }
-  metadata?(): Attributes | undefined {
-    return this.attributes
-  }
-  all(): Promise<T[]> {
-    const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map)
-  }
-  load(id1: K1, id2: K2, ctx?: any): Promise<T | null> {
-    return this.query<T>(
-      `select * from ${this.table} where ${this.id1Col} = ${this.param(1)} and ${this.id2Col} = ${this.param(2)}`,
-      [id1, id2],
-      this.map,
-      undefined,
-      ctx,
-    ).then((objs) => {
-      if (!objs || objs.length === 0) {
-        return null
-      } else {
-        const fn = this.fromDB
-        if (fn) {
-          return fn(objs[0])
-        } else {
-          return objs[0]
-        }
-      }
-    })
-  }
-  exist(id1: K1, id2: K2, ctx?: any): Promise<boolean> {
-    return this.query<T>(
-      `select ${this.id1Col} from ${this.table} where ${this.id1Col} = ${this.param(1)} and ${this.id2Col} = ${this.param(2)}`,
-      [id1, id2],
-      undefined,
-      undefined,
-      ctx,
-    ).then((objs) => {
-      return objs && objs.length > 0 ? true : false
-    })
-  }
-}
-// tslint:disable-next-line:max-classes-per-file
-export class GenericRepository<T, K1, K2> extends SqlLoadRepository<T, K1, K2> {
-  version?: string
-  exec: (sql: string, args?: any[], ctx?: any) => Promise<number>
-  // execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
-  constructor(
-    manager: Manager,
-    table: string,
-    attrs: Attributes,
-    id1Field: string,
-    id2Field: string,
-    public toDB?: (v: T) => T,
-    fromDB?: (v: T) => T,
-    id1Col?: string,
-    id2Col?: string,
-  ) {
-    super(manager.query, table, attrs, manager.param, id1Field, id2Field, fromDB, id1Col, id2Col)
-    const x = version(attrs)
-    this.exec = manager.exec
-    // this.execBatch = manager.execBatch
-    if (x) {
-      this.version = x.name
-    }
-    this.create = this.create.bind(this)
-    this.update = this.update.bind(this)
-    this.patch = this.patch.bind(this)
-    this.delete = this.delete.bind(this)
-  }
-  create(obj: T, ctx?: any): Promise<number> {
-    let obj2 = obj
-    if (this.toDB) {
-      obj2 = this.toDB(obj)
-    }
-    const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt) {
-      return this.exec(stmt.query, stmt.params, ctx).catch((err) => {
-        if (err && err.error === "duplicate") {
-          return 0
-        } else {
-          throw err
-        }
-      })
-    } else {
-      return Promise.resolve(0)
-    }
-  }
-  update(obj: T, ctx?: any): Promise<number> {
-    let obj2 = obj
-    if (this.toDB) {
-      obj2 = this.toDB(obj)
-    }
-    const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt) {
-      return this.exec(stmt.query, stmt.params, ctx)
-    } else {
-      return Promise.resolve(0)
-    }
-  }
-  patch(obj: Partial<T>, ctx?: any): Promise<number> {
-    return this.update(obj as any, ctx)
-  }
-  delete(id1: K1, id2: K2, ctx?: any): Promise<number> {
-    return this.exec(`delete from ${this.table} where ${this.id1Col} = ${this.param(1)} and ${this.id2Col} = ${this.param(2)}`, [id1, id2], ctx)
-  }
-}
-*/
-/*
-// tslint:disable-next-line:max-classes-per-file
-export class SqlSearchLoader<T, ID, S extends Filter> extends SqlLoader<T, ID> {
-  constructor(
-    protected find: (s: S, limit: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
-    query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
-    table: string,
-    attrs: Attributes | string[],
-    param: (i: number) => string,
-    fromDB?: (v: T) => T,
-  ) {
-    super(query, table, attrs, param, fromDB)
-    this.search = this.search.bind(this)
-  }
-  search(s: S, limit: number, offset?: number | string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.find(s, limit, offset, fields)
-  }
-}
-*/
-export interface Manager {
+export interface DB {
   driver: string
   param(i: number): string
   exec(sql: string, args?: any[], ctx?: any): Promise<number>
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
 }
-export type DB = Manager
-export interface ExtManager {
+export type Manager = DB
+export interface FullDB {
   driver: string
   param(i: number): string
   exec(sql: string, args?: any[], ctx?: any): Promise<number>
@@ -305,6 +131,7 @@ export interface ExtManager {
   execScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T>
   count(sql: string, args?: any[], ctx?: any): Promise<number>
 }
+export type ExtManager = FullDB
 export interface SimpleMap {
   [key: string]: string | number | boolean | Date
 }
@@ -632,18 +459,14 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
 // tslint:disable-next-line:max-classes-per-file
 export class SqlWriter<T> {
   protected version?: string
-  // execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
   constructor(protected exec: (sql: string, args?: any[], ctx?: any) => Promise<number>, protected param: (i: number) => string, protected table: string, protected attributes: Attributes, public toDB?: (v: T) => T) {
-    // super(manager.query, table, attrs, manager.param, fromDB)
     const x = version(attributes)
-    // this.execBatch = manager.execBatch
     if (x) {
       this.version = x.name
     }
     this.create = this.create.bind(this)
     this.update = this.update.bind(this)
     this.patch = this.patch.bind(this)
-    // this.delete = this.delete.bind(this)
   }
   create(obj: T, ctx?: any): Promise<number> {
     let obj2 = obj
@@ -678,26 +501,15 @@ export class SqlWriter<T> {
   patch(obj: Partial<T>, ctx?: any): Promise<number> {
     return this.update(obj as any, ctx)
   }
-  /*
-  delete(id: ID, ctx?: any): Promise<number> {
-    const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param)
-    if (stmt) {
-      return this.exec(stmt.query, stmt.params, ctx)
-    } else {
-      return Promise.resolve(0)
-    }
-  }
-    */
 }
 export class CRUDRepository<T, ID> extends SqlWriter<T> {
   protected primaryKeys: Attribute[]
   protected map?: StringMap
-  // attributes: Attributes;
   protected bools?: Attribute[]
   protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>
-  constructor(manager: Manager, table: string, attributes: Attributes, toDB?: (v: T) => T, protected fromDB?: (v: T) => T) {
-    super(manager.exec, manager.param, table, attributes, toDB)
-    this.query = manager.query
+  constructor(db: DB, table: string, attributes: Attributes, toDB?: (v: T) => T, protected fromDB?: (v: T) => T) {
+    super(db.exec, db.param, table, attributes, toDB)
+    this.query = db.query
     const m = metadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map
@@ -751,22 +563,3 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
     }
   }
 }
-/*
-// tslint:disable-next-line:max-classes-per-file
-export class SqlSearchWriter<T, ID, S extends Filter> extends SqlWriter<T, ID> {
-  constructor(
-    protected find: (s: S, limit: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
-    manager: Manager,
-    table: string,
-    attrs: Attributes,
-    toDB?: (v: T) => T,
-    fromDB?: (v: T) => T,
-  ) {
-    super(manager, table, attrs, toDB, fromDB)
-    this.search = this.search.bind(this)
-  }
-  search(s: S, limit: number, offset?: number | string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.find(s, limit, offset, fields)
-  }
-}
-*/