query-core 0.1.31 → 0.2.1

package/lib/query.js

@@ -3,28 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
 function buildSort(sort, map) {
   if (!sort || sort.length === 0) {
-    return '';
+    return "";
   }
   var sort2 = [];
   if (sort && sort.length > 0) {
-    var sorts = sort.split(',');
+    var sorts = sort.split(",");
     for (var _i = 0, sorts_1 = sorts; _i < sorts_1.length; _i++) {
       var st = sorts_1[_i];
       if (st.length > 0) {
         var field = st;
         var tp = st.charAt(0);
-        if (tp === '-' || tp === '+') {
-          field = st.substr(1);
+        if (tp === "-" || tp === "+") {
+          field = st.substring(1);
         }
-        var sortType = (tp === '-' ? ' desc' : '');
+        var sortType = tp === "-" ? " desc" : "";
         sort2.push(getField(field.trim(), map) + sortType);
       }
     }
   }
   if (sort2.length === 0) {
-    return '';
+    return "";
   }
-  return sort2.join(',');
+  return sort2.join(",");
 }
 exports.buildSort = buildSort;
 function getField(name, map) {
@@ -35,7 +35,7 @@ function getField(name, map) {
   if (!x) {
     return name;
   }
-  if (typeof x === 'string') {
+  if (typeof x === "string") {
     return x;
   }
   if (x.column) {
@@ -45,15 +45,15 @@ function getField(name, map) {
 }
 exports.getField = getField;
 function buildMsSQLParam(i) {
-  return '@' + i;
+  return "@" + i;
 }
 exports.buildMsSQLParam = buildMsSQLParam;
 function buildOracleParam(i) {
-  return ':' + i;
+  return ":" + i;
 }
 exports.buildOracleParam = buildOracleParam;
 function buildDollarParam(i) {
-  return '$' + i;
+  return "$" + i;
 }
 exports.buildDollarParam = buildDollarParam;
 function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq, strExcluding) {
@@ -61,10 +61,10 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
     return undefined;
   }
   var s = filter;
-  var like = 'like';
+  var like = "like";
   var param;
-  if (typeof bparam === 'string') {
-    if (bparam === 'ilike') {
+  if (typeof bparam === "string") {
+    if (bparam === "ilike") {
       like = bparam;
     }
     param = buildDollarParam;
@@ -73,7 +73,7 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
     param = bparam;
   }
   if (!like) {
-    like = 'like';
+    like = "like";
   }
   var filters = [];
   var q;
@@ -82,15 +82,15 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
   if (sq && sq.length > 0) {
     q = s[sq];
     delete s[sq];
-    if (q === '') {
+    if (q === "") {
       q = undefined;
     }
   }
   if (strExcluding && strExcluding.length > 0) {
     excluding = s[strExcluding];
     delete s[strExcluding];
-    if (typeof excluding === 'string') {
-      excluding = excluding.split(',');
+    if (typeof excluding === "string") {
+      excluding = excluding.split(",");
     }
     if (excluding && excluding.length === 0) {
       excluding = undefined;
@@ -106,28 +106,28 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
     if (v !== undefined && v != null) {
       var attr = attrs[key];
       if (attr) {
-        field = (attr.column ? attr.column : key);
-        if (typeof v === 'string') {
+        field = attr.column ? attr.column : key;
+        if (typeof v === "string") {
           if (v.length !== 0) {
             if (attr.q) {
               ex.push(key);
             }
-            if (attr.match === 'equal') {
+            if (attr.match === "equal") {
               filters.push(field + " = " + param(i++));
               args.push(v);
             }
-            else if (attr.match === 'prefix') {
+            else if (attr.match === "prefix") {
               filters.push(field + " " + like + " " + param(i++));
-              args.push(v + '%');
+              args.push(v + "%");
             }
             else {
               filters.push(field + " " + like + " " + param(i++));
-              args.push('%' + v + '%');
+              args.push("%" + v + "%");
             }
           }
         }
         else if (v instanceof Date) {
-          if (attr.match === 'max') {
+          if (attr.match === "max") {
             filters.push(field + " <= " + param(i++));
             args.push(v);
           }
@@ -136,19 +136,19 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
             args.push(v);
           }
         }
-        else if (typeof v === 'number') {
-          if (attr.match === 'max') {
+        else if (typeof v === "number") {
+          if (attr.match === "max") {
             filters.push(field + " <= " + v);
           }
           else {
             filters.push(field + " >= " + v);
           }
         }
-        else if (attr.type === 'ObjectId') {
+        else if (attr.type === "ObjectId") {
           filters.push(field + " = " + param(i++));
           args.push(v);
         }
-        else if (typeof v === 'object') {
+        else if (typeof v === "object") {
           if (Array.isArray(v)) {
             if (v.length > 0) {
               var ps = build_1.params(v.length, param, i - 1);
@@ -157,65 +157,65 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
                 var sv = v_1[_a];
                 args.push(sv);
               }
-              filters.push(field + " in (" + ps.join(',') + ")");
+              filters.push(field + " in (" + ps.join(",") + ")");
             }
           }
-          else if (attr.type === 'date' || attr.type === 'datetime') {
+          else if (attr.type === "date" || attr.type === "datetime") {
             if (isDateRange(v)) {
-              if (v['max']) {
+              if (v["max"]) {
                 filters.push(field + " <= " + param(i++));
-                args.push(v['max']);
+                args.push(v["max"]);
               }
-              else if (v['top']) {
+              else if (v["top"]) {
                 filters.push(field + " < " + param(i++));
-                args.push(v['top']);
+                args.push(v["top"]);
               }
-              else if (v['endDate']) {
+              else if (v["endDate"]) {
                 filters.push(field + " <= " + param(i++));
-                args.push(v['endDate']);
+                args.push(v["endDate"]);
               }
-              else if (v['upper']) {
+              else if (v["upper"]) {
                 filters.push(field + " < " + param(i++));
-                args.push(v['upper']);
+                args.push(v["upper"]);
               }
-              else if (v['endTime']) {
+              else if (v["endTime"]) {
                 filters.push(field + " < " + param(i++));
-                args.push(v['endTime']);
+                args.push(v["endTime"]);
               }
-              if (v['min']) {
+              if (v["min"]) {
                 filters.push(field + " >= " + param(i++));
-                args.push(v['min']);
+                args.push(v["min"]);
               }
-              else if (v['startTime']) {
+              else if (v["startTime"]) {
                 filters.push(field + " >= " + param(i++));
-                args.push(v['startTime']);
+                args.push(v["startTime"]);
               }
-              else if (v['startDate']) {
+              else if (v["startDate"]) {
                 filters.push(field + " >= " + param(i++));
-                args.push(v['startDate']);
+                args.push(v["startDate"]);
               }
-              else if (v['lower']) {
+              else if (v["lower"]) {
                 filters.push(field + " > " + param(i++));
-                args.push(v['lower']);
+                args.push(v["lower"]);
               }
             }
           }
-          else if (attr.type === 'number' || attr.type === 'integer') {
+          else if (attr.type === "number" || attr.type === "integer") {
             if (isNumberRange(v)) {
-              if (v['max']) {
-                filters.push(field + " <= " + v['max']);
+              if (v["max"]) {
+                filters.push(field + " <= " + v["max"]);
               }
-              else if (v['top']) {
-                filters.push(field + " < " + v['top']);
+              else if (v["top"]) {
+                filters.push(field + " < " + v["top"]);
               }
-              else if (v['upper']) {
-                filters.push(field + " < " + v['upper']);
+              else if (v["upper"]) {
+                filters.push(field + " < " + v["upper"]);
               }
-              if (v['min']) {
-                filters.push(field + " >= " + v['min']);
+              if (v["min"]) {
+                filters.push(field + " >= " + v["min"]);
               }
-              else if (v['lower']) {
-                filters.push(field + " > " + v['lower']);
+              else if (v["lower"]) {
+                filters.push(field + " > " + v["lower"]);
               }
             }
           }
@@ -224,14 +224,13 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
     }
   }
   var idField = getId(attrs);
-  var c = [];
   if (idField && excluding && excluding.length > 0) {
     var l = excluding.length;
     var ps = [];
     for (var _b = 0, excluding_1 = excluding; _b < excluding_1.length; _b++) {
       var k = excluding_1[_b];
       if (k != null && k !== undefined) {
-        if (typeof k === 'number') {
+        if (typeof k === "number") {
           ps.push(k.toString());
         }
         else {
@@ -240,7 +239,7 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
         }
       }
     }
-    filters.push(idField + " not in (" + ps.join(',') + ")");
+    filters.push(idField + " not in (" + ps.join(",") + ")");
   }
   if (q && attrs) {
     var qkeys = Object.keys(attrs);
@@ -248,35 +247,35 @@ function buildQuery(filter, bparam, sort, buildSort3, attrs, table, fields, sq,
     for (var _c = 0, qkeys_1 = qkeys; _c < qkeys_1.length; _c++) {
       var field = qkeys_1[_c];
       var attr = attrs[field];
-      if (attr.q && (attr.type === undefined || attr.type === 'string') && !ex.includes(field)) {
-        if (attr.match === 'equal') {
-          qfilters.push(field + " = " + param(i++));
+      if (attr.q && (attr.type === undefined || attr.type === "string") && !ex.includes(field)) {
+        var column = attr.column ? attr.column : field;
+        if (attr.match === "equal") {
+          qfilters.push(column + " = " + param(i++));
           args.push(q);
         }
-        else if (attr.match === 'prefix') {
-          qfilters.push(field + " " + like + " " + param(i++));
-          args.push(q + '%');
+        else if (attr.match === "prefix") {
+          qfilters.push(column + " " + like + " " + param(i++));
+          args.push(q + "%");
         }
         else {
-          qfilters.push(field + " " + like + " " + param(i++));
-          args.push('%' + q + '%');
+          qfilters.push(column + " " + like + " " + param(i++));
+          args.push("%" + q + "%");
         }
-        c.push(buildQ(field, q, attr.match));
       }
     }
     if (qfilters.length > 0) {
-      filters.push("(" + qfilters.join(' or ') + ")");
+      filters.push("(" + qfilters.join(" or ") + ")");
     }
   }
   var buildS = buildSort3 ? buildSort3 : buildSort;
   var sSort = buildS(sort, attrs);
-  var sOrderBy = (sSort.length > 0 ? " order by " + sSort : '');
+  var sOrderBy = sSort.length > 0 ? " order by " + sSort : "";
   if (filters.length === 0) {
     var sql = "select " + buildFieldsByAttributes(attrs, fields) + " from " + table + sOrderBy;
     return { query: sql, params: args };
   }
   else {
-    var sql = "select " + buildFieldsByAttributes(attrs, fields) + " from " + table + " where " + filters.join(' and ') + sOrderBy;
+    var sql = "select " + buildFieldsByAttributes(attrs, fields) + " from " + table + " where " + filters.join(" and ") + sOrderBy;
     return { query: sql, params: args };
   }
 }
@@ -287,7 +286,7 @@ function getId(attrs) {
     var key = qkeys_2[_i];
     var attr = attrs[key];
     if (attr.key) {
-      var field = (attr.column ? attr.column : key);
+      var field = attr.column ? attr.column : key;
       return field;
     }
   }
@@ -296,22 +295,22 @@ function getId(attrs) {
 exports.getId = getId;
 function buildFieldsByAttributes(attrs, fields) {
   if (!fields || fields.length === 0) {
-    return '*';
+    return "*";
   }
   var cols = [];
   for (var _i = 0, fields_1 = fields; _i < fields_1.length; _i++) {
     var f = fields_1[_i];
     var attr = attrs[f];
     if (attr) {
-      var field = (attr.column ? attr.column : f);
+      var field = attr.column ? attr.column : f;
       cols.push(field);
     }
   }
   if (cols.length === 0) {
-    return '*';
+    return "*";
   }
   else {
-    return cols.join(',');
+    return cols.join(",");
   }
 }
 exports.buildFieldsByAttributes = buildFieldsByAttributes;
@@ -321,10 +320,10 @@ function isEmpty(s) {
 exports.isEmpty = isEmpty;
 function buildQ(field, q, match) {
   var o = {};
-  if (match === 'equal') {
+  if (match === "equal") {
     o[field] = q;
   }
-  else if (match === 'prefix') {
+  else if (match === "prefix") {
     o[field] = new RegExp("^" + q);
   }
   else {
@@ -334,10 +333,10 @@ function buildQ(field, q, match) {
 }
 exports.buildQ = buildQ;
 function buildMatch(v, match) {
-  if (match === 'equal') {
+  if (match === "equal") {
     return v;
   }
-  else if (match === 'prefix') {
+  else if (match === "prefix") {
     return new RegExp("^" + v);
   }
   else {
@@ -362,7 +361,7 @@ function isNumberRange(obj) {
   for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
     var key = keys_3[_i];
     var v = obj[key];
-    if (typeof v !== 'number') {
+    if (typeof v !== "number") {
       return false;
     }
   }

package/lib/search.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider, totalCol) {
+function getOffset(limit, page, ifirstPageSize) {
+  if (ifirstPageSize && ifirstPageSize > 0) {
+    var offset = limit * (page - 2) + ifirstPageSize;
+    return offset < 0 ? 0 : offset;
+  }
+  else {
+    var offset = limit * (page - 1);
+    return offset < 0 ? 0 : offset;
+  }
+}
+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);
@@ -8,6 +19,8 @@ function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider,
     });
   }
   else {
+    var ipage = (!page || page <= 0 ? 1 : page);
+    var offset = getOffset(limit, ipage);
     if (provider === exports.oracle) {
       if (!totalCol || totalCol.length === 0) {
         totalCol = 'total';
@@ -100,7 +113,7 @@ function buildPagingQueryForOracle(sql, limit, offset, total) {
     i = sql.indexOf(S);
   }
   if (i >= 0) {
-    return sql.substr(0, l) + " count(*) over() as " + total + ", " + sql.substr(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
+    return sql.substring(0, l) + " count(*) over() as " + total + ", " + sql.substring(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
   }
   else {
     return sql + " offset " + offset + " rows fetch next " + limit + " rows only";

package/package.json

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