query-core 0.6.5 → 0.6.7

package/src/services.ts

@@ -1,8 +1,7 @@
-import { attributes, buildToDelete, buildToInsert, buildToUpdate, exist, buildMetadata, select, version } from "./build"
-import { Attribute, Attributes, Statement, StringMap } from "./metadata"
+import { attributes, buildToDelete, buildToInsert, buildToUpdate, exist, buildMetadata, select } from "./build"
+import { Attribute, Attributes, Executor, MinDB, Statement, StringMap, Transaction } from "./metadata"
 import { LikeType } from "./query"
 import { SearchBuilder } from "./SearchBuilder"
-// import { SearchResult } from "./search"
 
 export interface Filter {
   fields?: string[]
@@ -12,7 +11,7 @@ export interface Filter {
 export type Load<T, ID> = (id: ID, ctx?: any) => Promise<T | null>
 export type Get<T, ID> = Load<T, ID>
 export function useGet<T, ID>(
-  db: DB,
+  db: Executor,
   table: string,
   attrs: Attributes | string[],
   fromDB?: (v: T) => T,
@@ -27,7 +26,7 @@ export class SqlLoader<T, ID> {
   attributes: Attributes
   bools?: Attribute[]
   constructor(
-    protected db: DB,
+    protected db: Executor,
     protected table: string,
     attrs: Attributes | string[],
     protected fromDB?: (v: T) => T,
@@ -121,356 +120,6 @@ export class QueryRepository<T, ID> {
   }
 }
 
-export interface Executor {
-  driver: string
-  param(i: number): string
-  execute(sql: string, args?: any[], ctx?: any): Promise<number>
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
-}
-export interface Transaction extends Executor {
-  commit(): Promise<void>
-  rollback(): Promise<void>
-}
-export interface DB extends Executor {
-  beginTransaction(): Promise<Transaction>
-}
-// export type Manager = DB
-export interface FullDB {
-  driver: string
-  param(i: number): string
-  execute(sql: string, args?: any[], ctx?: any): Promise<number>
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
-  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null>
-  executeScalar<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
-}
-export interface Logger {
-  level: number
-  debug(msg: string, m?: SimpleMap, ctx?: any): void
-  info(msg: string, m?: SimpleMap, ctx?: any): void
-  error(msg: string, m?: SimpleMap, ctx?: any): void
-  isDebugEnabled(): boolean
-  isInfoEnabled(): boolean
-}
-export function log(db: FullDB, isLog: boolean | undefined | null, logger: Logger, q?: string, result?: string, r?: string, duration?: string): FullDB {
-  if (!isLog) {
-    return db
-  }
-  if (q !== undefined && q != null && q.length > 0) {
-    if (!logger.isDebugEnabled()) {
-      return db
-    }
-    return new LogManager(db, logger.error, logger.debug, q, result, r, duration)
-  }
-  if (!logger.isInfoEnabled()) {
-    return db
-  }
-  return new LogManager(db, logger.error, logger.info, q, result, r, duration)
-}
-export function useLog(
-  db: FullDB,
-  isLog: boolean | undefined | null,
-  err: ((msg: string, m?: SimpleMap) => void) | undefined,
-  lg?: (msg: string, m?: SimpleMap) => void,
-  q?: string,
-  result?: string,
-  r?: string,
-  duration?: string,
-): FullDB {
-  if (!isLog) {
-    return db
-  }
-  if (err) {
-    return new LogManager(db, err, lg, q, result, r, duration)
-  }
-  return db
-}
-// tslint:disable-next-line:max-classes-per-file
-export class LogManager implements FullDB {
-  constructor(
-    public db: FullDB,
-    err: (msg: string, m?: SimpleMap) => void,
-    lg?: (msg: string, m?: SimpleMap) => void,
-    q?: string,
-    result?: string,
-    r?: string,
-    duration?: string,
-  ) {
-    this.driver = db.driver
-    this.duration = duration && duration.length > 0 ? duration : "duration"
-    this.sql = q === undefined ? "" : q
-    this.return = r !== undefined && r != null ? r : "count"
-    this.result = result !== undefined && result != null ? result : ""
-    // this.err = (er ? er : 'error');
-    this.log = lg
-    this.error = err
-    this.param = this.param.bind(this)
-    this.execute = this.execute.bind(this)
-    this.executeBatch = this.executeBatch.bind(this)
-    this.query = this.query.bind(this)
-    this.queryOne = this.queryOne.bind(this)
-    this.executeScalar = this.executeScalar.bind(this)
-    this.count = this.count.bind(this)
-  }
-  log?: (msg: string, m?: SimpleMap, ctx?: any) => void
-  error: (msg: string, m?: SimpleMap, ctx?: any) => void
-  driver: string
-  duration: string
-  sql: string
-  return: string
-  result: string
-  // err: string;
-  param(i: number): string {
-    return this.db.param(i)
-  }
-  execute(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const t1 = new Date()
-    return this.db
-      .execute(sql, args, ctx)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = getString(sql, args)
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v
-            }
-            obj[this.duration] = d
-            this.log("query", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = getString(sql, args)
-          }
-          obj[this.duration] = d
-          this.error("error query: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
-    const t1 = new Date()
-    return this.db
-      .executeBatch(statements, firstSuccess, ctx)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = JSON.stringify(statements)
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v
-            }
-            obj[this.duration] = d
-            this.log("exec batch", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = JSON.stringify(statements)
-          }
-          obj[this.duration] = d
-          this.error("error exec batch: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]> {
-    const t1 = new Date()
-    return this.db
-      .query<T>(sql, args, m, bools, ctx)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = getString(sql, args)
-            }
-            if (this.result.length > 0) {
-              if (v && v.length > 0) {
-                obj[this.result] = JSON.stringify(v)
-              }
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v ? v.length : 0
-            }
-            obj[this.duration] = d
-            this.log("query", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = getString(sql, args)
-          }
-          obj[this.duration] = d
-          this.error("error query: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null> {
-    const t1 = new Date()
-    return this.db
-      .queryOne<T>(sql, args, m, bools, ctx)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = getString(sql, args)
-            }
-            if (this.result.length > 0) {
-              obj[this.result] = v ? JSON.stringify(v) : "null"
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v ? 1 : 0
-            }
-            obj[this.duration] = d
-            this.log("query one", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = getString(sql, args)
-          }
-          obj[this.duration] = d
-          this.error("error query one: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T> {
-    const t1 = new Date()
-    return this.db
-      .executeScalar<T>(sql, args, ctx)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = getString(sql, args)
-            }
-            if (this.result.length > 0) {
-              obj[this.result] = v ? buildString(v) : "null"
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v ? 1 : 0
-            }
-            obj[this.duration] = d
-            this.log("exec scalar", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = getString(sql, args)
-          }
-          obj[this.duration] = d
-          this.error("error exec scalar: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-  count(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const t1 = new Date()
-    return this.db
-      .count(sql, args)
-      .then((v) => {
-        setTimeout(() => {
-          if (this.log) {
-            const d = diff(t1)
-            const obj: SimpleMap = {}
-            if (this.sql.length > 0) {
-              obj[this.sql] = getString(sql, args)
-            }
-            if (this.return.length > 0) {
-              obj[this.return] = v
-            }
-            obj[this.duration] = d
-            this.log("count", obj)
-          }
-        }, 0)
-        return v
-      })
-      .catch((er) => {
-        setTimeout(() => {
-          const d = diff(t1)
-          const obj: SimpleMap = {}
-          if (this.sql.length > 0) {
-            obj[this.sql] = getString(sql, args)
-          }
-          obj[this.duration] = d
-          this.error("error count: " + buildString(er))
-        }, 0)
-        throw er
-      })
-  }
-}
-function buildString(v: any): string {
-  if (typeof v === "string") {
-    return v
-  } else {
-    return JSON.stringify(v)
-  }
-}
-function getString(sql: string, args?: any[]): string {
-  if (args && args.length > 0) {
-    return sql + " " + JSON.stringify(args)
-  } else {
-    return sql
-  }
-}
-export function diff(d1: Date): number {
-  const d2 = new Date()
-  return d2.getTime() - d1.getTime()
-}
-/*
-const NS_PER_SEC = 1e9;
-const NS_TO_MS = 1e6;
-const getDurationInMilliseconds = (start: [number, number] | undefined) => {
-  const diff = process.hrtime(start);
-  return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
-};
-*/
 // tslint:disable-next-line:max-classes-per-file
 export class SqlWriter<T> {
   protected primaryKeys: Attribute[]
@@ -597,7 +246,6 @@ export const GenericRepository = CRUDRepository
 export const SqlGenericRepository = CRUDRepository
 
 export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
-  protected version?: string
   constructor(
     protected db: Executor,
     table: string,
@@ -623,19 +271,25 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     total?: string,
   ) {
     super(db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total)
-    const x = version(attributes)
+    const x = buildMetadata(attributes)
     if (x) {
-      this.version = x.name
+      this.version = x.version
     }
     this.create = this.create.bind(this)
     this.update = this.update.bind(this)
     this.patch = this.patch.bind(this)
   }
   create(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
+    if (this.createdAt) {
+      obj2[this.createdAt] = new Date()
+    }
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date()
+    }
     const stmt = buildToInsert(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
       const db = tx ? tx: this.db
@@ -651,10 +305,13 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     }
   }
   update(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date()
+    }
     const stmt = buildToUpdate(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
       const db = tx ? tx: this.db
@@ -691,7 +348,6 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     q?: string,
     excluding?: string,
     buildSort?: (sort?: string, map?: Attributes | StringMap) => string,
-    buildParam?: (i: number) => string,
     total?: string,
   ) {
     super(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, total)
@@ -750,11 +406,6 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
 }
 export const Repository = SqlRepository
 
-interface MinDB {
-  driver?: string
-  param(i: number): string
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
-}
 // tslint:disable-next-line:max-classes-per-file
 export class Query<T, ID, S> extends SearchBuilder<T, S> {
   constructor(