query-core 0.1.19 → 0.1.22

package/lib/SearchBuilder.js

@@ -1,4 +1,17 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+  var extendStatics = function (d, b) {
+    extendStatics = Object.setPrototypeOf ||
+      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+  };
+  return function (d, b) {
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
 var query_1 = require("./query");
@@ -27,20 +40,20 @@ var SearchBuilder = (function () {
     this.excluding = (excluding && excluding.length > 0 ? excluding : 'excluding');
     this.search = this.search.bind(this);
     if (buildParam) {
-      this.buildParam = buildParam;
+      this.param = buildParam;
     }
     else {
       if (provider === search_1.oracle) {
-        this.buildParam = query_1.buildOracleParam;
+        this.param = query_1.buildOracleParam;
       }
       else if (provider === exports.postgres) {
-        this.buildParam = query_1.buildDollarParam;
+        this.param = query_1.buildDollarParam;
       }
       else if (provider === exports.mssql) {
-        this.buildParam = query_1.buildMsSQLParam;
+        this.param = query_1.buildMsSQLParam;
       }
       else {
-        this.buildParam = build_1.param;
+        this.param = build_1.param;
       }
     }
     this.total = (total && total.length > 0 ? total : 'total');
@@ -53,7 +66,7 @@ var SearchBuilder = (function () {
     var st = (this.sort ? this.sort : 'sort');
     var sn = s[st];
     delete s[st];
-    var x = (this.provider === exports.postgres ? 'ilike' : this.buildParam);
+    var x = (this.provider === exports.postgres ? 'ilike' : this.param);
     var q2 = this.buildQuery(s, x, sn, this.buildSort, this.attributes, this.table, fields, this.q, this.excluding);
     if (!q2) {
       throw new Error('Cannot build query');
@@ -77,3 +90,58 @@ var SearchBuilder = (function () {
   return SearchBuilder;
 }());
 exports.SearchBuilder = SearchBuilder;
+var Query = (function (_super) {
+  __extends(Query, _super);
+  function Query(query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) {
+    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;
+    _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);
+    return _this;
+  }
+  Query.prototype.metadata = function () {
+    return this.attributes;
+  };
+  Query.prototype.all = function () {
+    var sql = "select * from " + this.table;
+    return this.query(sql, [], this.map);
+  };
+  Query.prototype.load = function (id, ctx) {
+    var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
+    if (!stmt) {
+      throw new Error('cannot build query by id');
+    }
+    var fn = this.fromDB;
+    if (fn) {
+      return this.query(stmt.query, stmt.params, this.map, ctx).then(function (res) {
+        if (!res || res.length === 0) {
+          return null;
+        }
+        else {
+          var obj = res[0];
+          return fn(obj);
+        }
+      });
+    }
+    else {
+      return this.query(stmt.query, stmt.params, this.map).then(function (res) { return (!res || res.length === 0) ? null : res[0]; });
+    }
+  };
+  Query.prototype.exist = function (id, ctx) {
+    var field = (this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name);
+    var stmt = build_1.exist(id, this.table, this.primaryKeys, this.param, field);
+    if (!stmt) {
+      throw new Error('cannot build query by id');
+    }
+    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(function (res) { return (!res || res.length === 0) ? false : true; });
+  };
+  return Query;
+}(SearchBuilder));
+exports.Query = Query;

package/lib/services.js

@@ -14,16 +14,16 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
-function useGet(table, q, attrs, param, fromDB) {
-  var l = new SqlLoader(table, q, attrs, param, fromDB);
+function useGet(q, table, attrs, param, fromDB) {
+  var l = new SqlLoader(q, table, attrs, param, fromDB);
   return l.load;
 }
 exports.useGet = useGet;
 exports.useLoad = useGet;
 var SqlLoader = (function () {
-  function SqlLoader(table, query, attrs, param, fromDB) {
-    this.table = table;
+  function SqlLoader(query, table, attrs, param, fromDB) {
     this.query = query;
+    this.table = table;
     this.param = param;
     this.fromDB = fromDB;
     if (Array.isArray(attrs)) {
@@ -85,8 +85,8 @@ var SqlLoader = (function () {
 exports.SqlLoader = SqlLoader;
 var SqlSearchLoader = (function (_super) {
   __extends(SqlSearchLoader, _super);
-  function SqlSearchLoader(find, table, query, attrs, param, fromDB) {
-    var _this = _super.call(this, table, query, attrs, param, fromDB) || this;
+  function SqlSearchLoader(find, query, table, attrs, param, fromDB) {
+    var _this = _super.call(this, query, table, attrs, param, fromDB) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     return _this;
@@ -145,8 +145,36 @@ var LogManager = (function () {
     return this.db.param(i);
   };
   LogManager.prototype.exec = function (sql, args, ctx) {
+    var _this = this;
     var t1 = new Date();
-    return this.db.exec(sql, args, ctx);
+    return this.db.exec(sql, args, ctx).then(function (v) {
+      setTimeout(function () {
+        if (_this.log) {
+          var d = diff(t1);
+          var obj = {};
+          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(function (er) {
+      setTimeout(function () {
+        var d = diff(t1);
+        var obj = {};
+        if (_this.sql.length > 0) {
+          obj[_this.sql] = getString(sql, args);
+        }
+        obj[_this.duration] = d;
+        _this.error('error query: ' + buildString(er));
+      }, 0);
+      throw er;
+    });
   };
   LogManager.prototype.execBatch = function (statements, firstSuccess, ctx) {
     var _this = this;
@@ -346,7 +374,7 @@ exports.diff = diff;
 var SqlWriter = (function (_super) {
   __extends(SqlWriter, _super);
   function SqlWriter(manager, table, attrs, toDB, fromDB) {
-    var _this = _super.call(this, table, manager.query, attrs, manager.param, fromDB) || this;
+    var _this = _super.call(this, manager.query, table, attrs, manager.param, fromDB) || this;
     _this.toDB = toDB;
     var x = build_1.version(attrs);
     _this.exec = manager.exec;

package/package.json

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

package/src/SearchBuilder.ts

@@ -1,4 +1,4 @@
-import {metadata, param} from './build';
+import {exist, metadata, param, select} from './build';
 import {Attribute, Attributes, Statement, StringMap} from './metadata';
 import {buildDollarParam, buildMsSQLParam, buildOracleParam, buildQuery, buildSort as bs, LikeType} from './query';
 import {buildFromQuery, oracle, SearchResult} from './search';
@@ -14,9 +14,10 @@ export class SearchBuilder<T, S> {
   q?: string;
   excluding?: string;
   buildSort?: (sort?: string, map?: Attributes|StringMap) => string;
-  buildParam: (i: number) => string;
+  param: (i: number) => string;
   total?: string;
-  constructor(public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, public table: string,
+  constructor(public query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+    public table: string,
     public attributes?: Attributes,
     public provider?: string,
     buildQ?: (s: S, bparam: LikeType|((i: number ) => string), sort?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string, attrs?: Attributes, table?: string, fields?: string[], sq?: string, strExcluding?: string) => Statement|undefined,
@@ -39,16 +40,16 @@ export class SearchBuilder<T, S> {
       this.excluding = (excluding && excluding.length > 0 ? excluding : 'excluding');
       this.search = this.search.bind(this);
       if (buildParam) {
-        this.buildParam = buildParam;
+        this.param = buildParam;
       } else {
         if (provider === oracle) {
-          this.buildParam = buildOracleParam;
+          this.param = buildOracleParam;
         } else if (provider === postgres) {
-          this.buildParam = buildDollarParam;
+          this.param = buildDollarParam;
         } else if (provider === mssql) {
-          this.buildParam = buildMsSQLParam;
+          this.param = buildMsSQLParam;
         } else {
-          this.buildParam = param;
+          this.param = param;
         }
       }
       this.total = (total && total.length > 0 ? total : 'total');
@@ -61,14 +62,14 @@ export class SearchBuilder<T, S> {
     const st = (this.sort ? this.sort : 'sort');
     const sn = (s as any)[st] as string;
     delete (s as any)[st];
-    const x = (this.provider === postgres ? 'ilike' : this.buildParam);
+    const x = (this.provider === postgres ? 'ilike' : this.param);
     const q2 = this.buildQuery(s, x, sn, this.buildSort, this.attributes, this.table, fields, this.q, this.excluding);
     if (!q2) {
       throw new Error('Cannot build query');
     }
     const fn = this.fromDB;
     if (fn) {
-      return buildFromQuery(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total).then(r => {
+      return buildFromQuery<T>(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total).then(r => {
         if (r.list && r.list.length > 0) {
           r.list = r.list.map(o => fn(o));
           return r;
@@ -81,3 +82,68 @@ export class SearchBuilder<T, S> {
     }
   }
 }
+export class Query<T, ID, S> extends SearchBuilder<T, S> {
+  primaryKeys: Attribute[];
+  map?: StringMap;
+  // attributes: Attributes;
+  bools?: Attribute[];
+  constructor(
+      query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+      table: string,
+      attributes: Attributes,
+      provider?: string,
+      buildQ?: (s: S, bparam: LikeType|((i: number ) => string), sort?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string, attrs?: Attributes, table?: string, fields?: string[], sq?: string, strExcluding?: string) => Statement|undefined,
+      fromDB?: (v: T) => T,
+      sort?: string,
+      q?: string,
+      excluding?: string,
+      buildSort?: (sort?: string, map?: Attributes|StringMap) => string,
+      buildParam?: (i: number) => string,
+      total?: string) {
+    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;
+    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);
+  }
+  metadata?(): Attributes|undefined {
+    return this.attributes;
+  }
+  all(): Promise<T[]> {
+    const sql = `select * from ${this.table}`;
+    return this.query(sql, [], this.map);
+  }
+  load(id: ID, ctx?: any): Promise<T|null> {
+    const stmt = select<ID>(id, this.table, this.primaryKeys, this.param);
+    if (!stmt) {
+      throw new Error('cannot build query by id');
+    }
+    const fn = this.fromDB;
+    if (fn) {
+      return this.query<T>(stmt.query, stmt.params, this.map, ctx).then(res => {
+        if (!res || res.length === 0) {
+          return null;
+        } else {
+          const obj = res[0];
+          return fn(obj);
+        }
+      });
+    } else {
+      return this.query<T>(stmt.query, stmt.params, this.map).then(res => (!res || res.length === 0) ? null : res[0]);
+    }
+  }
+  exist(id: ID, ctx?: any): Promise<boolean> {
+    const field = (this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name);
+    const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field);
+    if (!stmt) {
+      throw new Error('cannot build query by id');
+    }
+    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(res => (!res || res.length === 0) ? false : true);
+  }
+}

package/src/search.ts

@@ -4,9 +4,9 @@ export interface SearchResult<T> {
   list: T[];
   total?: number;
 }
-export function buildFromQuery<T>(query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, sql: string, params?: any[], limit?: number, offset?: number, mp?: StringMap, bools?: Attribute[], provider?: string, totalCol?: string): Promise<SearchResult<T>> {
+export function buildFromQuery<T>(query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<K[]>, sql: string, params?: any[], limit?: number, offset?: number, mp?: StringMap, bools?: Attribute[], provider?: string, totalCol?: string): Promise<SearchResult<T>> {
   if (!limit || limit <= 0) {
-    return query(sql, params, mp, bools).then(list => {
+    return query<T>(sql, params, mp, bools).then(list => {
       const total = (list ? list.length : undefined);
       return {list, total};
     });
@@ -20,8 +20,8 @@ export function buildFromQuery<T>(query: (sql: string, args?: any[], m?: StringM
     } else {
       const sql2 = buildPagingQuery(sql, limit, offset);
       const countQuery = buildCountQuery(sql);
-      const resultPromise = query(sql2, params, mp, bools);
-      const countPromise = query(countQuery, params).then(r => {
+      const resultPromise = query<T>(sql2, params, mp, bools);
+      const countPromise = query<T>(countQuery, params).then(r => {
         if (!r || r.length === 0) {
           return 0;
         } else {
@@ -37,11 +37,11 @@ export function buildFromQuery<T>(query: (sql: string, args?: any[], m?: StringM
     }
   }
 }
-export function queryAndCount<T>(query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, sql: string, params: any[]|undefined, total: string, mp?: StringMap, bools?: Attribute[]): Promise<SearchResult<T>> {
+export function queryAndCount<T>(query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<K[]>, sql: string, params: any[]|undefined, total: string, mp?: StringMap, bools?: Attribute[]): Promise<SearchResult<T>> {
   if (!total || total.length === 0) {
     total = 'total';
   }
-  return query(sql, params, mp, bools).then(list => {
+  return query<T>(sql, params, mp, bools).then(list => {
     if (!list || list.length === 0) {
       return {list: [], total: 0};
     }

package/src/services.ts

@@ -9,12 +9,13 @@ 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>(table: string,
+export function useGet<T, ID>(
   q: <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): Load<T, ID> {
-  const l = new SqlLoader<T, ID>(table, q, attrs, param, fromDB);
+  const l = new SqlLoader<T, ID>(q, table, attrs, param, fromDB);
   return l.load;
 }
 export const useLoad = useGet;
@@ -23,8 +24,9 @@ export class SqlLoader<T, ID> {
   map?: StringMap;
   attributes: Attributes;
   bools?: Attribute[];
-  constructor(public table: string,
+  constructor(
     public query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+    public table: string,
     attrs: Attributes|string[],
     public param: (i: number) => string,
     public fromDB?: (v: T) => T) {
@@ -84,12 +86,12 @@ export class SqlLoader<T, ID> {
 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>>,
-      table: string,
       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(table, query, attrs, param, fromDB);
+    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>> {
@@ -181,7 +183,34 @@ export class LogManager implements ExtManager {
   }
   exec(sql: string, args?: any[], ctx?: any): Promise<number> {
     const t1 = new Date();
-    return this.db.exec(sql, args, ctx);
+    return this.db.exec(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;
+    });
   }
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
     const t1 = new Date();
@@ -385,7 +414,7 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
     attrs: Attributes,
     public toDB?: (v: T) => T,
     fromDB?: (v: T) => T) {
-    super(table, manager.query, attrs, manager.param, fromDB);
+    super(manager.query, table, attrs, manager.param, fromDB);
     const x = version(attrs);
     this.exec = manager.exec;
     this.execBatch = manager.execBatch;
@@ -427,8 +456,8 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
       return Promise.resolve(0);
     }
   }
-  patch(obj: T, ctx?: any): Promise<number> {
-    return this.update(obj, ctx);
+  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);