query-core 0.1.8 → 0.1.9

package/lib/client.js

@@ -0,0 +1,180 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var build_1 = require("./build");
+var map_1 = require("./map");
+function buildStatements(s) {
+  var d = [];
+  if (!s || s.length === 0) {
+    return d;
+  }
+  for (var _i = 0, s_1 = s; _i < s_1.length; _i++) {
+    var t = s_1[_i];
+    var dates = toDates(t.params);
+    var j = { query: t.query, params: t.params, dates: dates };
+    d.push(j);
+  }
+  return d;
+}
+exports.buildStatements = buildStatements;
+function toDates(args) {
+  var d = [];
+  if (!args || args.length === 0) {
+    return d;
+  }
+  var l = args.length;
+  for (var i = 0; i < l; i++) {
+    if (args[i] && args[i] instanceof Date) {
+      d.push(i);
+    }
+  }
+  return d;
+}
+exports.toDates = toDates;
+var ProxyClient = (function () {
+  function ProxyClient(httpRequest, url) {
+    this.httpRequest = httpRequest;
+    this.url = url;
+    this.query = this.query.bind(this);
+    this.exec = this.exec.bind(this);
+    this.execBatch = this.execBatch.bind(this);
+    this.insert = this.insert.bind(this);
+    this.update = this.update.bind(this);
+    this.insertBatch = this.insertBatch.bind(this);
+    this.updateBatch = this.updateBatch.bind(this);
+    this.insertWithTx = this.insertWithTx.bind(this);
+    this.updateWithTx = this.updateWithTx.bind(this);
+    this.insertBatchWithTx = this.insertBatchWithTx.bind(this);
+    this.updateBatchWithTx = this.updateBatchWithTx.bind(this);
+    this.beginTransaction = this.beginTransaction.bind(this);
+    this.commitTransaction = this.commitTransaction.bind(this);
+    this.rollbackTransaction = this.rollbackTransaction.bind(this);
+    this.queryWithTx = this.queryWithTx.bind(this);
+    this.execWithTx = this.execWithTx.bind(this);
+    this.execBatchWithTx = this.execBatchWithTx.bind(this);
+  }
+  ProxyClient.prototype.query = function (sql, args, m, bools) {
+    var dates = toDates(args);
+    var j = { query: sql, params: args, dates: dates };
+    if (m || bools) {
+      return this.httpRequest.post(this.url + '/query', j).then(function (r) { return map_1.handleResults(r, m, bools); });
+    }
+    else {
+      return this.httpRequest.post(this.url + '/query', j);
+    }
+  };
+  ProxyClient.prototype.exec = function (sql, args) {
+    var dates = toDates(args);
+    var j = { query: sql, params: args, dates: dates };
+    return this.httpRequest.post(this.url + '/exec', j);
+  };
+  ProxyClient.prototype.execBatch = function (stmts) {
+    var d = buildStatements(stmts);
+    return this.httpRequest.post(this.url + '/exec-batch', d);
+  };
+  ProxyClient.prototype.beginTransaction = function (timeout) {
+    var st = (timeout && timeout > 0 ? '?timeout=' + timeout : '');
+    return this.httpRequest.post(this.url + '/begin' + st, '');
+  };
+  ProxyClient.prototype.commitTransaction = function (tx) {
+    return this.httpRequest.post(this.url + '/end?tx=' + tx, '');
+  };
+  ProxyClient.prototype.rollbackTransaction = function (tx) {
+    return this.httpRequest.post(this.url + '/end?roleback=true&tx=' + tx, '');
+  };
+  ProxyClient.prototype.queryWithTx = function (tx, commit, sql, args, m, bools) {
+    var dates = toDates(args);
+    var j = { query: sql, params: args, dates: dates };
+    var sc = (commit ? '&commit=true' : '');
+    if (m || bools) {
+      return this.httpRequest.post(this.url + '/query?tx=' + tx + sc, j).then(function (r) { return map_1.handleResults(r, m, bools); });
+    }
+    else {
+      return this.httpRequest.post(this.url + '/query?tx=' + tx + sc, j);
+    }
+  };
+  ProxyClient.prototype.execWithTx = function (tx, commit, sql, args) {
+    var dates = toDates(args);
+    var j = { query: sql, params: args, dates: dates };
+    var sc = (commit ? '&commit=true' : '');
+    return this.httpRequest.post(this.url + '/exec?tx=' + tx + sc, j);
+  };
+  ProxyClient.prototype.execBatchWithTx = function (tx, commit, stmts) {
+    var d = buildStatements(stmts);
+    var sc = (commit ? '&commit=true' : '');
+    return this.httpRequest.post(this.url + '/exec-batch?tx=' + tx + sc, d);
+  };
+  ProxyClient.prototype.insert = function (table, attrs, obj, buildParam, ver) {
+    var s = build_1.buildToInsert(obj, table, attrs, buildParam, ver);
+    if (s) {
+      return this.exec(s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.update = function (table, attrs, obj, buildParam, ver) {
+    var s = build_1.buildToUpdate(obj, table, attrs, buildParam, ver);
+    if (s) {
+      return this.exec(s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.insertBatch = function (table, attrs, objs, buildParam, driver) {
+    var s = build_1.buildToInsertBatch(objs, table, attrs, buildParam);
+    if (s) {
+      return this.exec(s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.updateBatch = function (table, attrs, objs, buildParam, notSkipInvalid) {
+    var s = build_1.buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid);
+    if (s && s.length > 0) {
+      return this.execBatch(s);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.insertWithTx = function (tx, commit, table, attrs, obj, buildParam, ver) {
+    var s = build_1.buildToInsert(obj, table, attrs, buildParam, ver);
+    if (s) {
+      return this.execWithTx(tx, commit, s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.updateWithTx = function (tx, commit, table, attrs, obj, buildParam, ver) {
+    var s = build_1.buildToUpdate(obj, table, attrs, buildParam, ver);
+    if (s) {
+      return this.execWithTx(tx, commit, s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.insertBatchWithTx = function (tx, commit, table, attrs, objs, buildParam, driver) {
+    var s = build_1.buildToInsertBatch(objs, table, attrs, buildParam);
+    if (s) {
+      return this.execWithTx(tx, commit, s.query, s.params);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  ProxyClient.prototype.updateBatchWithTx = function (tx, commit, table, attrs, objs, buildParam, notSkipInvalid) {
+    var s = build_1.buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid);
+    if (s && s.length > 0) {
+      return this.execBatchWithTx(tx, commit, s);
+    }
+    else {
+      return Promise.resolve(-1);
+    }
+  };
+  return ProxyClient;
+}());
+exports.ProxyClient = ProxyClient;

package/lib/index.js

@@ -6,14 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var services_1 = require("./services");
 exports.createGenericSearchRepository = services_1.createSqlSearchWriter;
 exports.createGenericSearchService = services_1.createSqlSearchWriter;
+exports.createRepository = services_1.createSqlSearchWriter;
+exports.createService = services_1.createSqlSearchWriter;
 exports.createGenericRepository = services_1.createSqlWriter;
 exports.createGenericService = services_1.createSqlWriter;
 exports.SqlLoadRepository = services_1.SqlLoader;
 exports.SqlLoadService = services_1.SqlLoader;
 exports.ViewSearchRepository = services_1.SqlSearchLoader;
 exports.ViewSearchService = services_1.SqlSearchLoader;
+exports.SearchRepository = services_1.SqlSearchLoader;
+exports.SearchService = services_1.SqlSearchLoader;
 exports.GenericSearchRepository = services_1.SqlSearchWriter;
 exports.GenericSearchService = services_1.SqlSearchWriter;
+exports.SqlRepository = services_1.SqlSearchWriter;
+exports.SqlService = services_1.SqlSearchWriter;
+exports.Repository = services_1.SqlSearchWriter;
+exports.Service = services_1.SqlSearchWriter;
 exports.SqlGenericRepository = services_1.SqlWriter;
 exports.SqlGenericService = services_1.SqlWriter;
 __export(require("./build"));
@@ -22,6 +30,7 @@ __export(require("./batch"));
 __export(require("./query"));
 __export(require("./search"));
 __export(require("./SearchBuilder"));
+__export(require("./client"));
 var resource = (function () {
   function resource() {
   }
@@ -75,49 +84,6 @@ function toArray(arr) {
   return p;
 }
 exports.toArray = toArray;
-function handleResults(r, m, bools) {
-  if (m) {
-    var res = mapArray(r, m);
-    if (bools && bools.length > 0) {
-      return handleBool(res, bools);
-    }
-    else {
-      return res;
-    }
-  }
-  else {
-    if (bools && bools.length > 0) {
-      return handleBool(r, bools);
-    }
-    else {
-      return r;
-    }
-  }
-}
-exports.handleResults = handleResults;
-function handleBool(objs, bools) {
-  if (!bools || bools.length === 0 || !objs) {
-    return objs;
-  }
-  for (var _i = 0, objs_1 = objs; _i < objs_1.length; _i++) {
-    var obj = objs_1[_i];
-    for (var _a = 0, bools_1 = bools; _a < bools_1.length; _a++) {
-      var field = bools_1[_a];
-      var value = obj[field.name];
-      if (value != null && value !== undefined) {
-        var b = field.true;
-        if (b == null || b === undefined) {
-          obj[field.name] = ('1' == value || 'T' == value || 'Y' == value);
-        }
-        else {
-          obj[field.name] = (value == b ? true : false);
-        }
-      }
-    }
-  }
-  return objs;
-}
-exports.handleBool = handleBool;
 function map(obj, m) {
   if (!m) {
     return obj;
@@ -139,30 +105,3 @@ function map(obj, m) {
   return obj2;
 }
 exports.map = map;
-function mapArray(results, m) {
-  if (!m) {
-    return results;
-  }
-  var mkeys = Object.keys(m);
-  if (mkeys.length === 0) {
-    return results;
-  }
-  var objs = [];
-  var length = results.length;
-  for (var i = 0; i < length; i++) {
-    var obj = results[i];
-    var obj2 = {};
-    var keys = Object.keys(obj);
-    for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-      var key = keys_2[_i];
-      var k0 = m[key];
-      if (!k0) {
-        k0 = key;
-      }
-      obj2[k0] = obj[key];
-    }
-    objs.push(obj2);
-  }
-  return objs;
-}
-exports.mapArray = mapArray;

package/lib/map.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function mapArray(results, m) {
+  if (!m) {
+    return results;
+  }
+  var mkeys = Object.keys(m);
+  if (mkeys.length === 0) {
+    return results;
+  }
+  var objs = [];
+  var length = results.length;
+  for (var i = 0; i < length; i++) {
+    var obj = results[i];
+    var obj2 = {};
+    var keys = Object.keys(obj);
+    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+      var key = keys_1[_i];
+      var k0 = m[key];
+      if (!k0) {
+        k0 = key;
+      }
+      obj2[k0] = obj[key];
+    }
+    objs.push(obj2);
+  }
+  return objs;
+}
+exports.mapArray = mapArray;
+function handleResults(r, m, bools) {
+  if (m) {
+    var res = mapArray(r, m);
+    if (bools && bools.length > 0) {
+      return handleBool(res, bools);
+    }
+    else {
+      return res;
+    }
+  }
+  else {
+    if (bools && bools.length > 0) {
+      return handleBool(r, bools);
+    }
+    else {
+      return r;
+    }
+  }
+}
+exports.handleResults = handleResults;
+function handleBool(objs, bools) {
+  if (!bools || bools.length === 0 || !objs) {
+    return objs;
+  }
+  for (var _i = 0, objs_1 = objs; _i < objs_1.length; _i++) {
+    var obj = objs_1[_i];
+    var o = obj;
+    for (var _a = 0, bools_1 = bools; _a < bools_1.length; _a++) {
+      var field = bools_1[_a];
+      if (field.name) {
+        var v = o[field.name];
+        if (typeof v !== 'boolean' && v != null && v !== undefined) {
+          var b = field.true;
+          if (b == null || b === undefined) {
+            o[field.name] = ('true' == v || '1' == v || 't' == v || 'y' == v || 'on' == v);
+          }
+          else {
+            o[field.name] = (v == b ? true : false);
+          }
+        }
+      }
+    }
+  }
+  return objs;
+}
+exports.handleBool = handleBool;

package/lib/query.js

@@ -56,7 +56,11 @@ function buildDollarParam(i) {
   return '$' + i;
 }
 exports.buildDollarParam = buildDollarParam;
-function buildQuery(s, bparam, table, attrs, sort, fields, sq, strExcluding, buildSort3) {
+function buildQuery(filter, bparam, table, attrs, sort, fields, sq, strExcluding, buildSort3) {
+  if (!table || !attrs) {
+    return undefined;
+  }
+  var s = filter;
   var like = 'like';
   var param;
   if (typeof bparam === 'string') {
@@ -250,7 +254,7 @@ function buildQuery(s, bparam, table, attrs, sort, fields, sq, strExcluding, bui
           qfilters.push(field + " " + like + " " + param(i++));
           args.push('%' + q + '%');
         }
-        c.push(buildQ(field, attr.match, q));
+        c.push(buildQ(field, q, attr.match));
       }
     }
     if (qfilters.length > 0) {
@@ -308,7 +312,7 @@ function isEmpty(s) {
   return !(s && s.length > 0);
 }
 exports.isEmpty = isEmpty;
-function buildQ(field, match, q) {
+function buildQ(field, q, match) {
   var o = {};
   if (match === 'equal') {
     o[field] = q;

package/lib/search.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider, totalCol) {
-  if (limit <= 0) {
+  if (!limit || limit <= 0) {
     return query(sql, params, mp, bools).then(function (list) {
       var total = (list ? list.length : undefined);
       return { list: list, total: total };
@@ -78,6 +78,9 @@ function buildPagingQueryForOracle(sql, limit, offset, total) {
   if (!total || total.length === 0) {
     total = 'total';
   }
+  if (!offset) {
+    offset = 0;
+  }
   var l = d.length;
   var i = sql.indexOf(d);
   if (i < 0) {

package/lib/services.js

@@ -22,6 +22,7 @@ var SqlLoader = (function () {
     this.fromDB = fromDB;
     if (Array.isArray(attrs)) {
       this.primaryKeys = build_1.attributes(attrs);
+      this.attributes = {};
     }
     else {
       var m = build_1.metadata(attrs);
@@ -30,7 +31,9 @@ var SqlLoader = (function () {
       this.map = m.map;
       this.bools = m.bools;
     }
-    this.metadata = this.metadata.bind(this);
+    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);
@@ -43,16 +46,19 @@ var SqlLoader = (function () {
     return this.query(sql, [], this.map);
   };
   SqlLoader.prototype.load = function (id, ctx) {
-    var _this = this;
     var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
-    if (this.fromDB) {
+    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 _this.fromDB(obj);
+          return fn(obj);
         }
       });
     }
@@ -63,6 +69,9 @@ var SqlLoader = (function () {
   SqlLoader.prototype.exist = function (id, ctx) {
     var field = (this.primaryKeys[0].field ? this.primaryKeys[0].field : 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 SqlLoader;

package/package.json

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

package/src/SearchBuilder.ts

@@ -3,28 +3,28 @@ import {Attribute, Attributes, Statement, StringMap} from './metadata';
 import {buildDollarParam, buildMsSQLParam, buildOracleParam, buildQuery, buildSort as bs, LikeType} from './query';
 import {buildFromQuery, oracle, SearchResult} from './search';
 
-export const postgre = 'postgre';
+export const postgres = 'postgres';
 export const mssql = 'mssql';
 export const mysql = 'mysql';
 export const sqlite = 'sqlite';
 export class SearchBuilder<T, S> {
   map?: StringMap;
   bools?: Attribute[];
-  buildQuery: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort: string, map?: Attributes|StringMap) => string) => Statement;
+  buildQuery: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string) => Statement|undefined;
   q?: string;
   excluding?: string;
-  buildSort?: (sort: string, map?: Attributes|StringMap) => string;
-  buildParam?: (i: number) => string;
+  buildSort?: (sort?: string, map?: Attributes|StringMap) => string;
+  buildParam: (i: number) => string;
   total?: string;
   constructor(public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, public table: string,
     public attributes?: Attributes,
     public provider?: string,
-    buildQ?: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort: string, map?: Attributes|StringMap) => string) => Statement,
+    buildQ?: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string) => Statement|undefined,
     public fromDB?: (v: T) => T,
     public sort?: string,
     q?: string,
     excluding?: string,
-    buildSort?: (sort: string, map?: Attributes|StringMap) => string,
+    buildSort?: (sort?: string, map?: Attributes|StringMap) => string,
     buildParam?: (i: number) => string,
     total?: string) {
       if (attributes) {
@@ -43,7 +43,7 @@ export class SearchBuilder<T, S> {
       } else {
         if (provider === oracle) {
           this.buildParam = buildOracleParam;
-        } else if (provider === postgre) {
+        } else if (provider === postgres) {
           this.buildParam = buildDollarParam;
         } else if (provider === mssql) {
           this.buildParam = buildMsSQLParam;
@@ -53,16 +53,25 @@ export class SearchBuilder<T, S> {
       }
       this.total = (total && total.length > 0 ? total : 'total');
     }
-  search(s: S, limit?: number, skip?: number, fields?: string[]): Promise<SearchResult<T>> {
+  search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+    let skip = 0;
+    if (typeof offset === 'number' && offset > 0) {
+      skip = offset;
+    }
     const st = (this.sort ? this.sort : 'sort');
-    const sn = s[st] as string;
-    delete s[st];
-    const x = (this.provider === postgre ? 'ilike' : this.buildParam);
-    const q2 = buildQuery(s, x, this.table, this.attributes, sn, fields, this.q, this.excluding, this.buildSort);
-    if (this.fromDB) {
+    const sn = (s as any)[st] as string;
+    delete (s as any)[st];
+    const x = (this.provider === postgres ? 'ilike' : this.buildParam);
+    const q2 = this.buildQuery(s, x, this.table, this.attributes, sn, fields, this.q, this.excluding, this.buildSort);
+    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 => {
         if (r.list && r.list.length > 0) {
-          r.list = r.list.map(o => this.fromDB(o));
+          r.list = r.list.map(o => fn(o));
+          return r;
         } else {
           return r;
         }

package/src/batch.ts

@@ -53,7 +53,7 @@ export class SqlUpdater<T> {
 }
 export class SqlBatchInserter<T> {
   version?: string;
-  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, public map?: (v: T) => T) {
+  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: ((i: number) => string)|boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -72,7 +72,7 @@ export class SqlBatchInserter<T> {
         list.push(obj2);
       }
     }
-    const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param);
+    const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
     if (stmt) {
       return this.exec(stmt.query, stmt.params);
     } else {