query-core 0.2.3 → 0.2.5

package/lib/batch.js

@@ -26,7 +26,7 @@ var SqlInserter = (function () {
     var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
       if (this.oneIfSuccess) {
-        return this.exec(stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+        return this.exec(stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
       }
       else {
         return this.exec(stmt.query, stmt.params);
@@ -64,7 +64,7 @@ var SqlUpdater = (function () {
     var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
       if (this.oneIfSuccess) {
-        return this.exec(stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+        return this.exec(stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
       }
       else {
         return this.exec(stmt.query, stmt.params);
@@ -214,7 +214,7 @@ var StreamInserter = (function () {
         return this.exec(stmt.query, stmt.params).then(function (r) {
           _this.list = [];
           return total_1;
-        }); F
+        });
       }
       else {
         return Promise.resolve(0);

package/lib/build.js

@@ -22,8 +22,8 @@ function select(obj, table, ks, buildParam, i) {
     i = 1;
   }
   if (ks.length === 1) {
-    var field = (ks[0].column ? ks[0].column : ks[0].name);
-    if (typeof obj === 'number') {
+    var field = ks[0].column ? ks[0].column : ks[0].name;
+    if (typeof obj === "number") {
       var query = "select * from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
     }
@@ -38,12 +38,12 @@ function select(obj, table, ks, buildParam, i) {
     for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
       var k = ks_1[_i];
       if (k.name) {
-        var field = (k.column ? k.column : k.name);
+        var field = k.column ? k.column : k.name;
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
     }
-    var query = "select * from " + table + " where " + cols.join(' and ');
+    var query = "select * from " + table + " where " + cols.join(" and ");
     return { query: query, params: args };
   }
   else {
@@ -56,11 +56,11 @@ function exist(obj, table, ks, buildParam, col, i) {
     i = 1;
   }
   if (!col || col.length === 0) {
-    col = '*';
+    col = "*";
   }
   if (ks.length === 1) {
-    var field = (ks[0].column ? ks[0].column : ks[0].name);
-    if (typeof obj === 'number') {
+    var field = ks[0].column ? ks[0].column : ks[0].name;
+    if (typeof obj === "number") {
       var query = "select " + col + " from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
     }
@@ -75,12 +75,12 @@ function exist(obj, table, ks, buildParam, col, i) {
     for (var _i = 0, ks_2 = ks; _i < ks_2.length; _i++) {
       var k = ks_2[_i];
       if (k.name) {
-        var field = (k.column ? k.column : k.name);
+        var field = k.column ? k.column : k.name;
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
     }
-    var query = "select * from " + table + " where " + cols.join(' and ');
+    var query = "select * from " + table + " where " + cols.join(" and ");
     return { query: query, params: args };
   }
   else {
@@ -93,8 +93,8 @@ function buildToDelete(obj, table, ks, buildParam, i) {
     i = 1;
   }
   if (ks.length === 1) {
-    var field = (ks[0].column ? ks[0].column : ks[0].name);
-    if (typeof obj === 'number') {
+    var field = ks[0].column ? ks[0].column : ks[0].name;
+    if (typeof obj === "number") {
       var query = "delete from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
     }
@@ -109,12 +109,12 @@ function buildToDelete(obj, table, ks, buildParam, i) {
     for (var _i = 0, ks_3 = ks; _i < ks_3.length; _i++) {
       var k = ks_3[_i];
       if (k.name) {
-        var field = (k.column ? k.column : k.name);
+        var field = k.column ? k.column : k.name;
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
     }
-    var query = "delete from " + table + " where " + cols.join(' and ');
+    var query = "delete from " + table + " where " + cols.join(" and ");
     return { query: query, params: args };
   }
   else {
@@ -151,20 +151,20 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
         v = attr.default;
       }
       if (v !== undefined && v != null) {
-        var field = (attr.column ? attr.column : k);
+        var field = attr.column ? attr.column : k;
         cols.push(field);
         if (k === ver) {
           isVersion = true;
           values.push("" + 1);
         }
         else {
-          if (v === '') {
+          if (v === "") {
             values.push("''");
           }
-          else if (typeof v === 'number') {
+          else if (typeof v === "number") {
             values.push(toString(v));
           }
-          else if (typeof v === 'boolean') {
+          else if (typeof v === "boolean") {
             if (attr.true === undefined) {
               if (v === true) {
                 values.push("true");
@@ -177,17 +177,17 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
               var p = buildParam(i++);
               values.push(p);
               if (v === true) {
-                var v2 = (attr.true ? attr.true : '1');
+                var v2 = attr.true ? attr.true : "1";
                 args.push(v2);
               }
               else {
-                var v2 = (attr.false ? attr.false : '0');
+                var v2 = attr.false ? attr.false : "0";
                 args.push(v2);
               }
             }
           }
           else {
-            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+            if (resource.ignoreDatetime && typeof v === "string" && attr.type === "datetime") {
               values.push("'" + v + "'");
             }
             else {
@@ -202,7 +202,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
   }
   if (!isVersion && ver && ver.length > 0) {
     var attr = attrs[ver];
-    var field = (attr.column ? attr.column : ver);
+    var field = attr.column ? attr.column : ver;
     cols.push(field);
     values.push("" + 1);
   }
@@ -210,7 +210,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
     return undefined;
   }
   else {
-    var query = "insert into " + table + "(" + cols.join(',') + ")values(" + values.join(',') + ")";
+    var query = "insert into " + table + "(" + cols.join(",") + ")values(" + values.join(",") + ")";
     return { query: query, params: args };
   }
 }
@@ -226,7 +226,7 @@ function insertBatch(exec, objs, table, attrs, buildParam, ver, i) {
 }
 exports.insertBatch = insertBatch;
 function buildOracleParam(i) {
-  return ':' + i;
+  return ":" + i;
 }
 function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
   if (!i) {
@@ -234,14 +234,14 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
   }
   var ks = Object.keys(attrs);
   var args = [];
-  if (buildParam && typeof buildParam === 'function') {
+  if (buildParam && typeof buildParam === "function") {
     var cols = [];
     var rows = [];
     for (var _i = 0, ks_5 = ks; _i < ks_5.length; _i++) {
       var k = ks_5[_i];
       var attr = attrs[k];
       if (attr && !attr.ignored && !attr.noinsert) {
-        var field = (attr.column ? attr.column : k);
+        var field = attr.column ? attr.column : k;
         cols.push(field);
       }
     }
@@ -257,18 +257,18 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
             v = attr.default;
           }
           if (attr.version) {
-            values.push('1');
+            values.push("1");
           }
           else if (v === undefined || v == null) {
-            values.push('null');
+            values.push("null");
           }
-          else if (v === '') {
+          else if (v === "") {
             values.push("''");
           }
-          else if (typeof v === 'number') {
+          else if (typeof v === "number") {
             values.push(toString(v));
           }
-          else if (typeof v === 'boolean') {
+          else if (typeof v === "boolean") {
             if (attr.true === undefined) {
               if (v === true) {
                 values.push("true");
@@ -281,17 +281,17 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
               var p = buildParam(i++);
               values.push(p);
               if (v === true) {
-                var v2 = (attr.true ? attr.true : '1');
+                var v2 = attr.true ? attr.true : "1";
                 args.push(v2);
               }
               else {
-                var v2 = (attr.false ? attr.false : '0');
+                var v2 = attr.false ? attr.false : "0";
                 args.push(v2);
               }
             }
           }
           else {
-            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+            if (resource.ignoreDatetime && typeof v === "string" && attr.type === "datetime") {
               values.push("'" + v + "'");
             }
             else {
@@ -302,9 +302,9 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
           }
         }
       }
-      rows.push("(" + values.join(',') + ")");
+      rows.push("(" + values.join(",") + ")");
     }
-    var query = "insert into " + table + "(" + cols.join(',') + ")values " + rows.join(',');
+    var query = "insert into " + table + "(" + cols.join(",") + ")values " + rows.join(",");
     return { query: query, params: args };
   }
   else {
@@ -327,20 +327,20 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
             v = attr.default;
           }
           if (v !== undefined && v != null) {
-            var field = (attr.column ? attr.column : k);
+            var field = attr.column ? attr.column : k;
             cols.push(field);
             if (k === ver) {
               isVersion = true;
               values.push("" + 1);
             }
             else {
-              if (v === '') {
+              if (v === "") {
                 values.push("''");
               }
-              else if (typeof v === 'number') {
+              else if (typeof v === "number") {
                 values.push(toString(v));
               }
-              else if (typeof v === 'boolean') {
+              else if (typeof v === "boolean") {
                 if (attr.true === undefined) {
                   if (v === true) {
                     values.push("true");
@@ -353,11 +353,11 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
                   var p = buildOracleParam(i++);
                   values.push(p);
                   if (v === true) {
-                    var v2 = (attr.true ? attr.true : '1');
+                    var v2 = attr.true ? attr.true : "1";
                     args.push(v2);
                   }
                   else {
-                    var v2 = (attr.false ? attr.false : '0');
+                    var v2 = attr.false ? attr.false : "0";
                     args.push(v2);
                   }
                 }
@@ -373,7 +373,7 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
       }
       if (!isVersion && ver && ver.length > 0) {
         var attr = attrs[ver];
-        var field = (attr.column ? attr.column : ver);
+        var field = attr.column ? attr.column : ver;
         cols.push(field);
         values.push("" + 1);
       }
@@ -383,14 +383,14 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
         }
       }
       else {
-        var s = "into " + table + "(" + cols.join(',') + ")values(" + values.join(',') + ")";
+        var s = "into " + table + "(" + cols.join(",") + ")values(" + values.join(",") + ")";
         rows.push(s);
       }
     }
     if (rows.length === 0) {
       return undefined;
     }
-    var query = "insert all " + rows.join(' ') + " select * from dual";
+    var query = "insert all " + rows.join(" ") + " select * from dual";
     return { query: query, params: args };
   }
 }
@@ -426,18 +426,18 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
           pks.push(attr);
         }
         else if (!attr.noupdate) {
-          var field = (attr.column ? attr.column : k);
+          var field = attr.column ? attr.column : k;
           var x = void 0;
           if (v == null) {
-            x = 'null';
+            x = "null";
           }
-          else if (v === '') {
+          else if (v === "") {
             x = "''";
           }
-          else if (typeof v === 'number') {
+          else if (typeof v === "number") {
             x = toString(v);
           }
-          else if (typeof v === 'boolean') {
+          else if (typeof v === "boolean") {
             if (attr.true === undefined) {
               if (v === true) {
                 x = "true";
@@ -449,17 +449,17 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
             else {
               x = buildParam(i++);
               if (v === true) {
-                var v2 = (attr.true ? attr.true : '1');
+                var v2 = attr.true ? attr.true : "1";
                 args.push(v2);
               }
               else {
-                var v2 = (attr.false ? attr.false : '0');
+                var v2 = attr.false ? attr.false : "0";
                 args.push(v2);
               }
             }
           }
           else {
-            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+            if (resource.ignoreDatetime && typeof v === "string" && attr.type === "datetime") {
               x = "'" + v + "'";
             }
             else {
@@ -474,33 +474,33 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
   }
   for (var _a = 0, pks_1 = pks; _a < pks_1.length; _a++) {
     var pk = pks_1[_a];
-    var na = (pk.name ? pk.name : '');
+    var na = pk.name ? pk.name : "";
     var v = o[na];
     if (!v) {
       return undefined;
     }
     else {
       var attr = attrs[na];
-      var field = (attr.column ? attr.column : pk.name);
+      var field = attr.column ? attr.column : pk.name;
       var x = void 0;
       if (v == null) {
-        x = 'null';
+        x = "null";
       }
-      else if (v === '') {
+      else if (v === "") {
         x = "''";
       }
-      else if (typeof v === 'number') {
+      else if (typeof v === "number") {
         x = toString(v);
       }
       else {
         x = buildParam(i++);
-        if (typeof v === 'boolean') {
+        if (typeof v === "boolean") {
           if (v === true) {
-            var v2 = (attr.true ? '' + attr.true : '1');
+            var v2 = attr.true ? "" + attr.true : "1";
             args.push(v2);
           }
           else {
-            var v2 = (attr.false ? '' + attr.false : '0');
+            var v2 = attr.false ? "" + attr.false : "0";
             args.push(v2);
           }
         }
@@ -513,10 +513,10 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
   }
   if (ver && ver.length > 0) {
     var v = o[ver];
-    if (typeof v === 'number' && !isNaN(v)) {
+    if (typeof v === "number" && !isNaN(v)) {
       var attr = attrs[ver];
       if (attr) {
-        var field = (attr.column ? attr.column : ver);
+        var field = attr.column ? attr.column : ver;
         colSet.push(field + "=" + (1 + v));
         colQuery.push(field + "=" + v);
       }
@@ -526,7 +526,7 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
     return undefined;
   }
   else {
-    var query = "update " + table + " set " + colSet.join(',') + " where " + colQuery.join(' and ');
+    var query = "update " + table + " set " + colSet.join(",") + " where " + colQuery.join(" and ");
     return { query: query, params: args };
   }
 }
@@ -562,18 +562,18 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
         var attr = attrs[k];
         attr.name = k;
         if (attr && !attr.ignored && !attr.key && !attr.version && !attr.noupdate) {
-          var field = (attr.column ? attr.column : k);
+          var field = attr.column ? attr.column : k;
           var x = void 0;
           if (v == null) {
-            x = 'null';
+            x = "null";
           }
-          else if (v === '') {
+          else if (v === "") {
             x = "''";
           }
-          else if (typeof v === 'number') {
+          else if (typeof v === "number") {
             x = toString(v);
           }
-          else if (typeof v === 'boolean') {
+          else if (typeof v === "boolean") {
             if (attr.true === undefined) {
               if (v === true) {
                 x = "true";
@@ -585,11 +585,11 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
             else {
               x = buildParam(i++);
               if (v === true) {
-                var v2 = (attr.true ? attr.true : '1');
+                var v2 = attr.true ? attr.true : "1";
                 args.push(v2);
               }
               else {
-                var v2 = (attr.false ? attr.false : '0');
+                var v2 = attr.false ? attr.false : "0";
                 args.push(v2);
               }
             }
@@ -605,33 +605,33 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
     var valid = true;
     for (var _b = 0, _c = meta.keys; _b < _c.length; _b++) {
       var pk = _c[_b];
-      var na = (pk.name ? pk.name : '');
+      var na = pk.name ? pk.name : "";
       var v = o[na];
       if (!v) {
         valid = false;
       }
       else {
         var attr = attrs[na];
-        var field = (attr.column ? attr.column : pk.name);
+        var field = attr.column ? attr.column : pk.name;
         var x = void 0;
         if (v == null) {
-          x = 'null';
+          x = "null";
         }
-        else if (v === '') {
+        else if (v === "") {
           x = "''";
         }
-        else if (typeof v === 'number') {
+        else if (typeof v === "number") {
           x = toString(v);
         }
         else {
           x = buildParam(i++);
-          if (typeof v === 'boolean') {
+          if (typeof v === "boolean") {
             if (v === true) {
-              var v2 = (attr.true ? '' + attr.true : '1');
+              var v2 = attr.true ? "" + attr.true : "1";
               args.push(v2);
             }
             else {
-              var v2 = (attr.false ? '' + attr.false : '0');
+              var v2 = attr.false ? "" + attr.false : "0";
               args.push(v2);
             }
           }
@@ -651,16 +651,16 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
       var ver = meta.version;
       if (ver && ver.length > 0) {
         var v = o[ver];
-        if (typeof v === 'number' && !isNaN(v)) {
+        if (typeof v === "number" && !isNaN(v)) {
           var attr = attrs[ver];
           if (attr) {
-            var field = (attr.column ? attr.column : ver);
+            var field = attr.column ? attr.column : ver;
             colSet.push(field + "=" + (1 + v));
             colQuery.push(field + "=" + v);
           }
         }
       }
-      var query = "update " + table + " set " + colSet.join(',') + " where " + colQuery.join(' and ');
+      var query = "update " + table + " set " + colSet.join(",") + " where " + colQuery.join(" and ");
       var stm = { query: query, params: args };
       sts.push(stm);
     }
@@ -715,7 +715,7 @@ function buildMap(attrs) {
     var k = ks_13[_i];
     var attr = attrs[k];
     attr.name = k;
-    var field = (attr.column ? attr.column : k);
+    var field = attr.column ? attr.column : k;
     var s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -742,13 +742,13 @@ function metadata(attrs) {
     if (!attr.ignored) {
       fields.push(k);
     }
-    if (attr.type === 'boolean') {
+    if (attr.type === "boolean") {
       bools.push(attr);
     }
     if (attr.version) {
       m.version = k;
     }
-    var field = (attr.column ? attr.column : k);
+    var field = attr.column ? attr.column : k;
     var s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -775,11 +775,11 @@ function attributes(attrs, isKey) {
 }
 exports.attributes = attributes;
 function param(i) {
-  return '?';
+  return "?";
 }
 exports.param = param;
 function setValue(obj, path, value) {
-  var paths = path.split('.');
+  var paths = path.split(".");
   var o = obj;
   for (var i = 0; i < paths.length - 1; i++) {
     var p = paths[i];
@@ -794,11 +794,11 @@ function setValue(obj, path, value) {
   o[paths[paths.length - 1]] = value;
 }
 exports.setValue = setValue;
-var n = 'NaN';
+var n = "NaN";
 function toString(v) {
-  var x = '' + v;
+  var x = "" + v;
   if (x === n) {
-    x = 'null';
+    x = "null";
   }
   return x;
 }

package/lib/client.js

@@ -56,52 +56,52 @@ var ProxyClient = (function () {
     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); });
+      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);
+      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);
+    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);
+    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, '');
+    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, '');
+    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, '');
+    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' : '');
+    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); });
+      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);
+      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);
+    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);
+    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);

package/lib/health.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
   });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
+  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
   function verb(n) { return function (v) { return step([n, v]); }; }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
@@ -40,8 +40,8 @@ var Checker = (function () {
   function Checker(select, query, service, timeout) {
     this.select = select;
     this.query = query;
-    this.timeout = (timeout ? timeout : 4200);
-    this.service = (service ? service : 'sql');
+    this.timeout = timeout ? timeout : 4200;
+    this.service = service ? service : "sql";
     this.check = this.check.bind(this);
     this.name = this.name.bind(this);
     this.build = this.build.bind(this);
@@ -70,7 +70,7 @@ var Checker = (function () {
       if (!data) {
         data = {};
       }
-      data['error'] = err;
+      data["error"] = err;
     }
     return data;
   };
@@ -84,20 +84,20 @@ function promiseTimeOut(timeoutInMilliseconds, promise) {
       setTimeout(function () {
         reject("Timed out in: " + timeoutInMilliseconds + " milliseconds!");
       }, timeoutInMilliseconds);
-    })
+    }),
   ]);
 }
 exports.driverMap = {
-  'oracle': 'SELECT SYSDATE FROM DUAL',
-  'postgres': 'select now()',
-  'mssql': 'select getdate()',
-  'mysql': 'select current_time',
-  'sqlite': 'select date()'
+  oracle: "SELECT SYSDATE FROM DUAL",
+  postgres: "select now()",
+  mssql: "select getdate()",
+  mysql: "select current_time",
+  sqlite: "select date()",
 };
 function createChecker(query, sql, service, timeout) {
-  if (typeof query === 'function') {
+  if (typeof query === "function") {
     if (!sql) {
-      sql = 'select getdate()';
+      sql = "select getdate()";
     }
     return new Checker(query, sql, service, timeout);
   }
@@ -105,7 +105,7 @@ function createChecker(query, sql, service, timeout) {
     var db = query;
     var s = exports.driverMap[db.driver];
     if (!s) {
-      s = 'select getdate()';
+      s = "select getdate()";
     }
     if (!service) {
       service = db.driver;

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+  for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var health_1 = require("./health");
@@ -10,95 +10,82 @@ var services_1 = require("./services");
 exports.SqlViewRepository = services_1.SqlLoader;
 exports.SqlLoadService = services_1.SqlLoader;
 exports.SqlViewService = services_1.SqlLoader;
-exports.ViewSearchRepository = services_1.SqlSearchLoader;
-exports.ViewSearchService = services_1.SqlSearchLoader;
-exports.SqlViewSearchRepository = services_1.SqlSearchLoader;
-exports.SqlViewSearchService = services_1.SqlSearchLoader;
-exports.SqlSearchRepository = services_1.SqlSearchLoader;
-exports.SqlSearchService = 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.Service = services_1.SqlSearchWriter;
-exports.SqlGenericRepository = services_1.SqlWriter;
 exports.Repository = services_1.SqlWriter;
+exports.SqlGenericRepository = services_1.SqlWriter;
 exports.SqlGenericService = services_1.SqlWriter;
-__export(require("./health"));
-__export(require("./build"));
-__export(require("./services"));
 __export(require("./batch"));
+__export(require("./build"));
+__export(require("./client"));
+__export(require("./health"));
 __export(require("./query"));
 __export(require("./search"));
 __export(require("./SearchBuilder"));
-__export(require("./client"));
+__export(require("./services"));
 var Loader = (function () {
-    function Loader(query, sql, m, bools) {
-        this.query = query;
-        this.sql = sql;
-        this.bools = bools;
-        this.map = m;
-        this.load = this.load.bind(this);
-    }
-    Loader.prototype.load = function () {
-        return this.query(this.sql, [], this.map, this.bools);
-    };
-    return Loader;
+  function Loader(query, sql, m, bools) {
+    this.query = query;
+    this.sql = sql;
+    this.bools = bools;
+    this.map = m;
+    this.load = this.load.bind(this);
+  }
+  Loader.prototype.load = function () {
+    return this.query(this.sql, [], this.map, this.bools);
+  };
+  return Loader;
 }());
 exports.Loader = Loader;
 function toArray(arr) {
-    if (!arr || arr.length === 0) {
-        return [];
+  if (!arr || arr.length === 0) {
+    return [];
+  }
+  var p = [];
+  var l = arr.length;
+  for (var i = 0; i < l; i++) {
+    if (arr[i] === undefined || arr[i] == null) {
+      p.push(null);
     }
-    var p = [];
-    var l = arr.length;
-    for (var i = 0; i < l; i++) {
-        if (arr[i] === undefined || arr[i] == null) {
-            p.push(null);
+    else {
+      if (typeof arr[i] === "object") {
+        if (arr[i] instanceof Date) {
+          p.push(arr[i]);
         }
         else {
-            if (typeof arr[i] === 'object') {
-                if (arr[i] instanceof Date) {
-                    p.push(arr[i]);
-                }
-                else {
-                    if (build_1.resource.string) {
-                        var s = JSON.stringify(arr[i]);
-                        p.push(s);
-                    }
-                    else {
-                        p.push(arr[i]);
-                    }
-                }
-            }
-            else {
-                p.push(arr[i]);
-            }
+          if (build_1.resource.string) {
+            var s = JSON.stringify(arr[i]);
+            p.push(s);
+          }
+          else {
+            p.push(arr[i]);
+          }
         }
+      }
+      else {
+        p.push(arr[i]);
+      }
     }
-    return p;
+  }
+  return p;
 }
 exports.toArray = toArray;
 function map(obj, m) {
-    if (!m) {
-        return obj;
-    }
-    var mkeys = Object.keys(m);
-    if (mkeys.length === 0) {
-        return obj;
-    }
-    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];
+  if (!m) {
+    return obj;
+  }
+  var mkeys = Object.keys(m);
+  if (mkeys.length === 0) {
+    return obj;
+  }
+  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;
     }
-    return obj2;
+    obj2[k0] = obj[key];
+  }
+  return obj2;
 }
 exports.map = map;

package/lib/map.js

@@ -58,13 +58,13 @@ function handleBool(objs, bools) {
       var field = bools_1[_a];
       if (field.name) {
         var v = o[field.name];
-        if (typeof v !== 'boolean' && v != null && v !== undefined) {
+        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);
+            o[field.name] = "true" == v || "1" == v || "t" == v || "y" == v || "on" == v;
           }
           else {
-            o[field.name] = (v == b ? true : false);
+            o[field.name] = v == b ? true : false;
           }
         }
       }

package/lib/search.js

@@ -14,16 +14,16 @@ exports.getOffset = getOffset;
 function buildFromQuery(query, sql, params, limit, page, mp, bools, provider, totalCol) {
   if (!limit || limit <= 0) {
     return query(sql, params, mp, bools).then(function (list) {
-      var total = (list ? list.length : undefined);
+      var total = list ? list.length : undefined;
       return { list: list, total: total };
     });
   }
   else {
-    var ipage = (!page || page <= 0 ? 1 : page);
+    var ipage = !page || page <= 0 ? 1 : page;
     var offset = getOffset(limit, ipage);
     if (provider === exports.oracle) {
       if (!totalCol || totalCol.length === 0) {
-        totalCol = 'total';
+        totalCol = "total";
       }
       var sql2 = buildPagingQueryForOracle(sql, limit, offset, totalCol);
       return queryAndCount(query, sql2, params, totalCol, mp, bools);
@@ -44,7 +44,7 @@ function buildFromQuery(query, sql, params, limit, page, mp, bools, provider, to
       });
       return Promise.all([resultPromise, countPromise]).then(function (r) {
         var list = r[0], total = r[1];
-        if (typeof total === 'string' && !isNaN(total)) {
+        if (typeof total === "string" && !isNaN(total)) {
           var t = parseInt(total, 10);
           return { list: list, total: t };
         }
@@ -58,7 +58,7 @@ function buildFromQuery(query, sql, params, limit, page, mp, bools, provider, to
 exports.buildFromQuery = buildFromQuery;
 function queryAndCount(query, sql, params, total, mp, bools) {
   if (!total || total.length === 0) {
-    total = 'total';
+    total = "total";
   }
   return query(sql, params, mp, bools).then(function (list) {
     if (!list || list.length === 0) {
@@ -73,11 +73,11 @@ function queryAndCount(query, sql, params, total, mp, bools) {
   });
 }
 exports.queryAndCount = queryAndCount;
-exports.oracle = 'oracle';
-var s = 'select';
-var S = 'SELECT';
-var d = ' distinct ';
-var D = ' DISTINCT ';
+exports.oracle = "oracle";
+var s = "select";
+var S = "SELECT";
+var d = " distinct ";
+var D = " DISTINCT ";
 function buildPagingQuery(sql, limit, offset, provider) {
   if (limit === undefined || limit == null) {
     limit = 0;
@@ -95,7 +95,7 @@ function buildPagingQuery(sql, limit, offset, provider) {
 exports.buildPagingQuery = buildPagingQuery;
 function buildPagingQueryForOracle(sql, limit, offset, total) {
   if (!total || total.length === 0) {
-    total = 'total';
+    total = "total";
   }
   if (!offset) {
     offset = 0;
@@ -122,26 +122,26 @@ function buildPagingQueryForOracle(sql, limit, offset, total) {
 exports.buildPagingQueryForOracle = buildPagingQueryForOracle;
 function buildCountQuery(sql) {
   var sql2 = sql.trim();
-  var i = sql2.indexOf('select ');
+  var i = sql2.indexOf("select ");
   if (i < 0) {
     return sql;
   }
-  var j = sql2.indexOf(' from ', i + 6);
+  var j = sql2.indexOf(" from ", i + 6);
   if (j < 0) {
     return sql;
   }
-  var k = sql2.indexOf(' order by ', j);
-  var h = sql2.indexOf(' distinct ');
+  var k = sql2.indexOf(" order by ", j);
+  var h = sql2.indexOf(" distinct ");
   if (h > 0) {
-    var sql3 = 'select count(*) from (' + sql2.substring(i) + ') as main';
+    var sql3 = "select count(*) from (" + sql2.substring(i) + ") as main";
     return sql3;
   }
   if (k > 0) {
-    var sql3 = 'select count(*) ' + sql2.substring(j, k);
+    var sql3 = "select count(*) " + sql2.substring(j, k);
     return sql3;
   }
   else {
-    var sql3 = 'select count(*) ' + sql2.substring(j);
+    var sql3 = "select count(*) " + sql2.substring(j);
     return sql3;
   }
 }

package/lib/services.js

@@ -195,7 +195,6 @@ var GenericRepository = (function (_super) {
     _this.toDB = toDB;
     var x = build_1.version(attrs);
     _this.exec = manager.exec;
-    _this.execBatch = manager.execBatch;
     if (x) {
       _this.version = x.name;
     }
@@ -247,20 +246,6 @@ var GenericRepository = (function (_super) {
   return GenericRepository;
 }(SqlLoadRepository));
 exports.GenericRepository = GenericRepository;
-var SqlSearchLoader = (function (_super) {
-  __extends(SqlSearchLoader, _super);
-  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;
-  }
-  SqlSearchLoader.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
-  };
-  return SqlSearchLoader;
-}(SqlLoader));
-exports.SqlSearchLoader = SqlSearchLoader;
 function log(db, isLog, logger, q, result, r, duration) {
   if (!isLog) {
     return db;
@@ -560,7 +545,6 @@ var SqlWriter = (function (_super) {
     _this.toDB = toDB;
     var x = build_1.version(attrs);
     _this.exec = manager.exec;
-    _this.execBatch = manager.execBatch;
     if (x) {
       _this.version = x.name;
     }
@@ -618,17 +602,3 @@ var SqlWriter = (function (_super) {
   return SqlWriter;
 }(SqlLoader));
 exports.SqlWriter = SqlWriter;
-var SqlSearchWriter = (function (_super) {
-  __extends(SqlSearchWriter, _super);
-  function SqlSearchWriter(find, manager, table, attrs, toDB, fromDB) {
-    var _this = _super.call(this, manager, table, attrs, toDB, fromDB) || this;
-    _this.find = find;
-    _this.search = _this.search.bind(_this);
-    return _this;
-  }
-  SqlSearchWriter.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
-  };
-  return SqlSearchWriter;
-}(SqlWriter));
-exports.SqlSearchWriter = SqlSearchWriter;

package/package.json

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

package/src/index.ts

@@ -3,31 +3,12 @@ export { Checker as SqlChecker }
 
 import { resource } from "./build"
 import { Attribute, StringMap } from "./metadata"
-import { SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter } from "./services"
+import { SqlLoader, SqlWriter } from "./services"
 // export {SqlLoader as SqlLoadRepository};
 export { SqlWriter as Repository, SqlWriter as SqlGenericRepository, SqlLoader as SqlViewRepository }
 
 export { SqlWriter as SqlGenericService, SqlLoader as SqlLoadService, SqlLoader as SqlViewService }
 
-export {
-  SqlSearchLoader as SearchRepository,
-  SqlSearchLoader as SearchService,
-  SqlSearchLoader as SqlSearchRepository,
-  SqlSearchLoader as SqlSearchService,
-  SqlSearchLoader as SqlViewSearchRepository,
-  SqlSearchLoader as SqlViewSearchService,
-  SqlSearchLoader as ViewSearchRepository,
-  SqlSearchLoader as ViewSearchService,
-}
-
-export {
-  SqlSearchWriter as GenericSearchRepository,
-  SqlSearchWriter as GenericSearchService,
-  SqlSearchWriter as Service,
-  SqlSearchWriter as SqlRepository,
-  SqlSearchWriter as SqlService,
-}
-
 export * from "./batch"
 export * from "./build"
 export * from "./client"

package/src/services.ts

@@ -289,7 +289,7 @@ export interface Manager {
   driver: string
   param(i: number): string
   exec(sql: string, args?: any[], ctx?: any): Promise<number>
-  // execBatch(statements: Statement[], firstSuccess?: boolean, 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