express-ext 0.3.9 → 0.4.1

package/lib/search.js

@@ -1,718 +1,593 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var http_1 = require('./http');
-var resources_1 = require('./resources');
-var et = '';
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var http_1 = require("./http")
+var resources_1 = require("./resources")
+var et = ""
+function queryLimit(req) {
+  return http_1.queryNumber(req, resources_1.resources.limit, resources_1.resources.defaultLimit)
+}
+exports.queryLimit = queryLimit
 function queryPage(req, filter) {
-  var field = req.query[resources_1.resources.page];
-  var v = field ? field.toString() : undefined;
+  var field = req.query[resources_1.resources.page]
+  var v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
-    filter[resources_1.resources.page] = 1;
-    return 1;
+    filter[resources_1.resources.page] = 1
+    return 1
   }
   if (isNaN(v)) {
-    filter[resources_1.resources.page] = 1;
-    return 1;
+    filter[resources_1.resources.page] = 1
+    return 1
   }
-  var n = parseFloat(v);
-  filter[resources_1.resources.page] = n;
-  return n;
+  var n = parseFloat(v)
+  filter[resources_1.resources.page] = n
+  return n
 }
-exports.queryPage = queryPage;
+exports.queryPage = queryPage
 function getOffset(limit, page) {
-  var offset = limit * (page - 1);
-  return offset < 0 ? 0 : offset;
+  var offset = limit * (page - 1)
+  return offset < 0 ? 0 : offset
 }
-exports.getOffset = getOffset;
+exports.getOffset = getOffset
 function getPageTotal(pageSize, total) {
   if (!pageSize || pageSize <= 0) {
-    return 1;
+    return 1
   } else {
     if (!total) {
-      total = 0;
+      total = 0
     }
     if (total % pageSize === 0) {
-      return Math.floor(total / pageSize);
+      return Math.floor(total / pageSize)
     }
-    return Math.floor(total / pageSize + 1);
+    return Math.floor(total / pageSize + 1)
   }
 }
-exports.getPageTotal = getPageTotal;
+exports.getPageTotal = getPageTotal
 function formatText() {
-  var args = [];
+  var args = []
   for (var _i = 0; _i < arguments.length; _i++) {
-    args[_i] = arguments[_i];
+    args[_i] = arguments[_i]
   }
-  var formatted = args[0];
-  if (!formatted || formatted === '') {
-    return '';
+  var formatted = args[0]
+  if (!formatted || formatted === "") {
+    return ""
   }
   if (args.length > 1 && Array.isArray(args[1])) {
-    var params = args[1];
+    var params = args[1]
     for (var i = 0; i < params.length; i++) {
-      var regexp = new RegExp('\\{' + i + '\\}', 'gi');
-      formatted = formatted.replace(regexp, params[i]);
+      var regexp = new RegExp("\\{" + i + "\\}", "gi")
+      formatted = formatted.replace(regexp, params[i])
     }
   } else {
     for (var i = 1; i < args.length; i++) {
-      var regexp = new RegExp('\\{' + (i - 1) + '\\}', 'gi');
-      formatted = formatted.replace(regexp, args[i]);
+      var regexp = new RegExp("\\{" + (i - 1) + "\\}", "gi")
+      formatted = formatted.replace(regexp, args[i])
     }
   }
-  return formatted;
+  return formatted
 }
-exports.formatText = formatText;
+exports.formatText = formatText
 function buildMessage(resource, results, limit, page, total) {
   if (!results || results.length === 0) {
-    return resource.msg_no_data_found;
+    return resource.msg_no_data_found
   } else {
     if (!page) {
-      page = 1;
+      page = 1
     }
-    var fromIndex = (page - 1) * limit + 1;
-    var toIndex = fromIndex + results.length - 1;
-    var pageTotal = getPageTotal(limit, total);
+    var fromIndex = (page - 1) * limit + 1
+    var toIndex = fromIndex + results.length - 1
+    var pageTotal = getPageTotal(limit, total)
     if (pageTotal > 1) {
-      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal);
-      return msg2;
+      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal)
+      return msg2
     } else {
-      var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex);
-      return msg3;
+      var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex)
+      return msg3
     }
   }
 }
-exports.buildMessage = buildMessage;
+exports.buildMessage = buildMessage
 function buildPages(pageSize, total) {
-  var pageTotal = getPageTotal(pageSize, total);
+  var pageTotal = getPageTotal(pageSize, total)
   if (pageTotal <= 1) {
-    return [1];
+    return [1]
   }
-  var arr = [];
+  var arr = []
   for (var i = 1; i <= pageTotal; i++) {
-    arr.push(i);
+    arr.push(i)
   }
-  return arr;
+  return arr
 }
-exports.buildPages = buildPages;
+exports.buildPages = buildPages
 function hasSearch(req) {
-  return req.url.indexOf('?') >= 0;
+  return req.url.indexOf("?") >= 0
 }
-exports.hasSearch = hasSearch;
+exports.hasSearch = hasSearch
 function getSearch(url) {
-  var i = url.indexOf('?');
-  return i < 0 ? et : url.substring(i + 1);
+  var i = url.indexOf("?")
+  return i < 0 ? et : url.substring(i + 1)
 }
-exports.getSearch = getSearch;
+exports.getSearch = getSearch
 function getField(search, fieldName) {
-  var i = search.indexOf(fieldName + '=');
+  var i = search.indexOf(fieldName + "=")
   if (i < 0) {
-    return '';
+    return ""
   }
   if (i > 0) {
-    if (search.substring(i - 1, 1) != '&') {
-      i = search.indexOf('&' + fieldName + '=');
+    if (search.substring(i - 1, 1) != "&") {
+      i = search.indexOf("&" + fieldName + "=")
       if (i < 0) {
-        return search;
+        return search
       }
-      i = i + 1;
+      i = i + 1
     }
   }
-  var j = search.indexOf('&', i + fieldName.length);
-  return j >= 0 ? search.substring(i, j) : search.substring(i);
+  var j = search.indexOf("&", i + fieldName.length)
+  return j >= 0 ? search.substring(i, j) : search.substring(i)
 }
-exports.getField = getField;
+exports.getField = getField
 function removeField(search, fieldName) {
-  var i = search.indexOf(fieldName + '=');
+  var i = search.indexOf(fieldName + "=")
   if (i < 0) {
-    return search;
+    return search
   }
   if (i > 0) {
-    if (search.substring(i - 1, 1) != '&') {
-      i = search.indexOf('&' + fieldName + '=');
+    if (search.substring(i - 1, 1) != "&") {
+      i = search.indexOf("&" + fieldName + "=")
       if (i < 0) {
-        return search;
+        return search
       }
-      i = i + 1;
+      i = i + 1
     }
   }
-  var j = search.indexOf('&', i + fieldName.length);
-  return j >= 0 ? search.substring(0, i) + search.substring(j + 1) : search.substring(0, i - 1);
+  var j = search.indexOf("&", i + fieldName.length)
+  return j >= 0 ? search.substring(0, i) + search.substring(j + 1) : search.substring(0, i - 1)
 }
-exports.removeField = removeField;
+exports.removeField = removeField
 function removePage(search) {
-  search = removeField(search, resources_1.resources.page);
-  search = removeField(search, resources_1.resources.partial);
-  return search;
+  search = removeField(search, resources_1.resources.page)
+  search = removeField(search, resources_1.resources.partial)
+  return search
 }
-exports.removePage = removePage;
+exports.removePage = removePage
 function buildPageSearch(search) {
-  var sr = removePage(search);
-  return sr.length == 0 ? sr : '&' + sr;
+  var sr = removePage(search)
+  return sr.length == 0 ? sr : "&" + sr
 }
-exports.buildPageSearch = buildPageSearch;
+exports.buildPageSearch = buildPageSearch
 function buildPageSearchFromUrl(url) {
-  var search = getSearch(url);
-  return buildPageSearch(search);
+  var search = getSearch(url)
+  return buildPageSearch(search)
 }
-exports.buildPageSearchFromUrl = buildPageSearchFromUrl;
+exports.buildPageSearchFromUrl = buildPageSearchFromUrl
 function removeSort(search) {
-  search = removeField(search, resources_1.resources.sort);
-  search = removeField(search, resources_1.resources.partial);
-  return search;
+  search = removeField(search, resources_1.resources.sort)
+  search = removeField(search, resources_1.resources.partial)
+  return search
 }
-exports.removeSort = removeSort;
+exports.removeSort = removeSort
 function getSortString(field, sort) {
   if (field === sort.field) {
-    return sort.type === '-' ? field : '-' + field;
+    return sort.type === "-" ? field : "-" + field
   }
-  return field;
+  return field
 }
-exports.getSortString = getSortString;
+exports.getSortString = getSortString
 function buildSort(s) {
-  if (!s || s.indexOf(',') >= 0) {
-    return {};
+  if (!s || s.indexOf(",") >= 0) {
+    return {}
   }
-  if (s.startsWith('-')) {
-    return { field: s.substring(1), type: '-' };
+  if (s.startsWith("-")) {
+    return { field: s.substring(1), type: "-" }
   } else {
-    return { field: s.startsWith('+') ? s.substring(1) : s, type: '+' };
+    return { field: s.startsWith("+") ? s.substring(1) : s, type: "+" }
   }
 }
-exports.buildSort = buildSort;
+exports.buildSort = buildSort
 function buildSortFromRequest(req) {
-  var s = http_1.query(req, resources_1.resources.sort);
-  return buildSort(s);
+  var s = http_1.query(req, resources_1.resources.sort)
+  return buildSort(s)
 }
-exports.buildSortFromRequest = buildSortFromRequest;
+exports.buildSortFromRequest = buildSortFromRequest
 function renderSort(field, sort) {
   if (field === sort.field) {
-    return sort.type === '-' ? "<i class='sort-down'></i>" : "<i class='sort-up'></i>";
+    return sort.type === "-" ? "<i class='sort-down'></i>" : "<i class='sort-up'></i>"
   }
-  return et;
+  return et
 }
-exports.renderSort = renderSort;
+exports.renderSort = renderSort
 function buildSortSearch(search, fields, sortStr) {
-  var sort = buildSort(sortStr);
-  search = removeSort(search);
-  var sorts = {};
-  var prefix = search.length > 0 ? '?' + search + '&' : '?';
+  var sort = buildSort(sortStr)
+  search = removeSort(search)
+  var sorts = {}
+  var prefix = search.length > 0 ? "?" + search + "&" : "?"
   for (var i = 0; i < fields.length; i++) {
     sorts[fields[i]] = {
-      url: prefix + resources_1.resources.sort + '=' + getSortString(fields[i], sort),
+      url: prefix + resources_1.resources.sort + "=" + getSortString(fields[i], sort),
       tag: renderSort(fields[i], sort),
-    };
+    }
   }
-  return sorts;
+  return sorts
 }
-exports.buildSortSearch = buildSortSearch;
+exports.buildSortSearch = buildSortSearch
 function clone(obj) {
   if (!obj) {
-    return obj;
+    return obj
   }
   if (obj instanceof Date) {
-    return new Date(obj.getTime());
+    return new Date(obj.getTime())
   }
-  if (typeof obj !== 'object') {
-    return obj;
+  if (typeof obj !== "object") {
+    return obj
   }
   if (Array.isArray(obj)) {
-    var arr = [];
+    var arr = []
     for (var _i = 0, obj_1 = obj; _i < obj_1.length; _i++) {
-      var sub = obj_1[_i];
-      var c = clone(sub);
-      arr.push(c);
+      var sub = obj_1[_i]
+      var c = clone(sub)
+      arr.push(c)
     }
-    return arr;
+    return arr
   }
-  var x = {};
-  var keys = Object.keys(obj);
+  var x = {}
+  var keys = Object.keys(obj)
   for (var _a = 0, keys_1 = keys; _a < keys_1.length; _a++) {
-    var k = keys_1[_a];
-    var v = obj[k];
+    var k = keys_1[_a]
+    var v = obj[k]
     if (v instanceof Date) {
-      x[k] = new Date(v.getTime());
+      x[k] = new Date(v.getTime())
     } else {
       switch (typeof v) {
-        case 'object':
-          x[k] = clone(v);
-          break;
+        case "object":
+          x[k] = clone(v)
+          break
         default:
-          x[k] = v;
-          break;
+          x[k] = v
+          break
       }
     }
   }
-  return x;
+  return x
 }
-exports.clone = clone;
+exports.clone = clone
 function cloneFilter(obj, limit, page) {
-  var f = clone(obj);
+  var f = clone(obj)
   if (!obj.hasOwnProperty(resources_1.resources.page)) {
-    obj[resources_1.resources.page] = page;
+    obj[resources_1.resources.page] = page
   }
   if (!obj.hasOwnProperty(resources_1.resources.limit)) {
-    obj[resources_1.resources.limit] = limit;
+    obj[resources_1.resources.limit] = limit
   }
-  return f;
+  return f
 }
-exports.cloneFilter = cloneFilter;
+exports.cloneFilter = cloneFilter
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
-    res.status(200).json(toCsv(fields, result)).end();
+    res.status(200).json(toCsv(fields, result)).end()
   } else {
-    res.status(200).json(buildResult(result, config)).end();
+    res.status(200).json(buildResult(result, config)).end()
   }
 }
-exports.jsonResult = jsonResult;
+exports.jsonResult = jsonResult
 function buildResult(r, conf) {
   if (!conf) {
-    return r;
+    return r
   }
-  var x = {};
-  var li = conf.list ? conf.list : 'list';
-  x[li] = http_1.minimizeArray(r.list);
-  var to = conf.total ? conf.total : 'total';
-  x[to] = r.total;
+  var x = {}
+  var li = conf.list ? conf.list : "list"
+  x[li] = http_1.minimizeArray(r.list)
+  var to = conf.total ? conf.total : "total"
+  x[to] = r.total
   if (r.nextPageToken && r.nextPageToken.length > 0) {
-    var t = conf.token ? conf.token : 'token';
-    x[t] = r.nextPageToken;
+    var t = conf.token ? conf.token : "token"
+    x[t] = r.nextPageToken
   }
   if (r.last) {
-    var l = conf.last ? conf.last : 'last';
-    x[l] = r.last;
+    var l = conf.last ? conf.last : "last"
+    x[l] = r.last
   }
-  return x;
+  return x
 }
-exports.buildResult = buildResult;
+exports.buildResult = buildResult
 function initializeConfig(conf) {
   if (!conf) {
-    return undefined;
+    return undefined
   }
   var c = {
     excluding: conf.excluding,
-    fields: conf.fields,
     list: conf.list,
     total: conf.total,
     token: conf.token,
     last: conf.last,
     csv: conf.csv,
-    page: conf.page,
-    limit: conf.limit,
-    skip: conf.skip,
-    refId: conf.refId,
-    firstLimit: conf.firstLimit,
-  };
-  if (!c.excluding || c.excluding.length === 0) {
-    c.excluding = 'excluding';
   }
-  if (!c.fields || c.fields.length === 0) {
-    c.fields = 'fields';
+  if (!c.excluding || c.excluding.length === 0) {
+    c.excluding = "excluding"
   }
   if (!c.list || c.list.length === 0) {
-    c.list = 'list';
+    c.list = "list"
   }
   if (!c.total || c.total.length === 0) {
-    c.total = 'total';
+    c.total = "total"
   }
   if (!c.last || c.last.length === 0) {
-    c.last = 'last';
+    c.last = "last"
   }
   if (!c.token || c.token.length === 0) {
-    c.token = 'nextPageToken';
-  }
-  if (!c.page || c.page.length === 0) {
-    c.page = 'page';
-  }
-  if (!c.limit || c.limit.length === 0) {
-    c.limit = 'limit';
+    c.token = "nextPageToken"
   }
-  if (!c.skip || c.skip.length === 0) {
-    c.skip = 'skip';
-  }
-  if (!c.refId || c.refId.length === 0) {
-    c.refId = 'refId';
-  }
-  if (!c.firstLimit || c.firstLimit.length === 0) {
-    c.firstLimit = 'firstLimit';
-  }
-  return c;
+  return c
 }
-exports.initializeConfig = initializeConfig;
+exports.initializeConfig = initializeConfig
 function fromRequest(req, arr) {
-  var s = req.method === 'GET' ? fromUrl(req, arr) : req.body;
-  return s;
+  var s = req.method === "GET" ? fromUrl(req, arr) : req.body
+  return s
 }
-exports.fromRequest = fromRequest;
+exports.fromRequest = fromRequest
 function buildArray(arr, s0, s1, s2) {
-  var r = [];
+  var r = []
   if (arr && arr.length > 0) {
     for (var _i = 0, arr_1 = arr; _i < arr_1.length; _i++) {
-      var a = arr_1[_i];
-      r.push(a);
+      var a = arr_1[_i]
+      r.push(a)
     }
   }
   if (s0 && s0.length > 0) {
-    r.push(s0);
+    r.push(s0)
   }
   if (s1 && s1.length > 0) {
-    r.push(s1);
+    r.push(s1)
   }
   if (s2 && s2.length > 0) {
-    r.push(s2);
+    r.push(s2)
   }
-  return r;
+  return r
 }
-exports.buildArray = buildArray;
+exports.buildArray = buildArray
 function fromUrl(req, arr) {
-  var s = {};
-  var obj = req.query;
-  var keys = Object.keys(obj);
+  var s = {}
+  var obj = req.query
+  var keys = Object.keys(obj)
   for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-    var key = keys_2[_i];
+    var key = keys_2[_i]
     if (inArray(key, arr)) {
-      var x = obj[key].split(',');
-      setValue(s, key, x);
+      var x = obj[key].split(",")
+      setValue(s, key, x)
     } else {
-      setValue(s, key, obj[key]);
+      setValue(s, key, obj[key])
     }
   }
-  return s;
+  return s
 }
-exports.fromUrl = fromUrl;
+exports.fromUrl = fromUrl
 function inArray(s, arr) {
   if (!arr || arr.length === 0) {
-    return false;
+    return false
   }
   for (var _i = 0, arr_2 = arr; _i < arr_2.length; _i++) {
-    var a = arr_2[_i];
+    var a = arr_2[_i]
     if (s === a) {
-      return true;
+      return true
     }
   }
-  return false;
+  return false
 }
-exports.inArray = inArray;
+exports.inArray = inArray
 function setValue(o, key, value) {
-  var obj = o;
-  var replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
-  if (replaceKey.indexOf('.') === 0) {
-    replaceKey = replaceKey.slice(1, replaceKey.length);
+  var obj = o
+  var replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
+  if (replaceKey.indexOf(".") === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length)
   }
-  var keys = replaceKey.split('.');
-  var firstKey = keys.shift();
+  var keys = replaceKey.split(".")
+  var firstKey = keys.shift()
   if (!firstKey) {
-    return;
+    return
   }
-  var isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  var isArrayKey = /\[([0-9]+)\]/.test(firstKey)
   if (keys.length > 0) {
-    var firstKeyValue = obj[firstKey] || {};
-    var returnValue = setValue(firstKeyValue, keys.join('.'), value);
-    return setKey(obj, isArrayKey, firstKey, returnValue);
+    var firstKeyValue = obj[firstKey] || {}
+    var returnValue = setValue(firstKeyValue, keys.join("."), value)
+    return setKey(obj, isArrayKey, firstKey, returnValue)
   }
-  return setKey(obj, isArrayKey, firstKey, value);
+  return setKey(obj, isArrayKey, firstKey, value)
 }
-exports.setValue = setValue;
+exports.setValue = setValue
 var setKey = function (_object, _isArrayKey, _key, _nextValue) {
   if (_isArrayKey) {
     if (_object.length > _key) {
-      _object[_key] = _nextValue;
+      _object[_key] = _nextValue
     } else {
-      _object.push(_nextValue);
+      _object.push(_nextValue)
     }
   } else {
-    _object[_key] = _nextValue;
+    _object[_key] = _nextValue
   }
-  return _object;
-};
+  return _object
+}
 function getParameters(obj, config) {
-  var o = obj;
-  if (!config) {
-    var sfield = 'fields';
-    var fields = void 0;
-    var fs = o[sfield];
-    if (fs && Array.isArray(fs)) {
-      fields = fs;
-      delete o[sfield];
-    }
-    var refId = o['refId'];
-    if (!refId) {
-      refId = o['nextPageToken'];
-    }
-    var r = { fields: fields, nextPageToken: refId };
-    var pageSize = o['limit'];
-    if (!pageSize) {
-      pageSize = o['pageSize'];
-    }
-    if (pageSize && !isNaN(pageSize)) {
-      var ipageSize = Math.floor(parseFloat(pageSize));
-      if (ipageSize > 0) {
-        r.limit = ipageSize;
-        var pageIndex = o['page'];
-        if (!pageIndex) {
-          pageIndex = o['pageIndex'];
-          if (!pageIndex) {
-            pageIndex = o['pageNo'];
-          }
-        }
-        if (pageIndex && !isNaN(pageIndex)) {
-          var ipageIndex = Math.floor(parseFloat(pageIndex));
-          if (ipageIndex < 1) {
-            ipageIndex = 1;
-          }
-          r.page = ipageIndex;
-          r.pageOrNextPageToken = r.page;
-          deletePageInfo(o);
-          return r;
-        }
-        r.page = 1;
-        if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.pageOrNextPageToken = r.nextPageToken;
-        }
-        deletePageInfo(o);
-        return r;
+  var o = obj
+  var fields
+  var fs = o[resources_1.resources.fields]
+  if (fs && Array.isArray(fs)) {
+    fields = fs
+  }
+  var nextPageToken = o[resources_1.resources.nextPageToken]
+  var page = 1
+  var spage = o[resources_1.resources.page]
+  if (spage && typeof spage === "string") {
+    if (!isNaN(spage)) {
+      var ipage = Math.floor(parseFloat(spage))
+      if (ipage > 1) {
+        page = ipage
       }
     }
-    if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.pageOrNextPageToken = r.nextPageToken;
-    }
-    deletePageInfo(o);
-    return r;
-  } else {
-    var sfield = config.fields;
-    if (!sfield || sfield.length === 0) {
-      sfield = 'fields';
-    }
-    var fields = void 0;
-    var fs = o[sfield];
-    if (fs && Array.isArray(fs)) {
-      fields = fs;
-      delete o[sfield];
-    }
-    var strRefId = config.refId;
-    if (!strRefId || strRefId.length === 0) {
-      strRefId = 'refId';
-    }
-    var refId = o[strRefId];
-    var r = { fields: fields, nextPageToken: refId };
-    var strLimit = config.limit;
-    if (!strLimit || strLimit.length === 0) {
-      strLimit = 'limit';
-    }
-    var pageSize = o[strLimit];
-    var arr = [config.page, config.limit, config.skip, config.refId, config.firstLimit];
-    if (pageSize && !isNaN(pageSize)) {
-      var ipageSize = Math.floor(parseFloat(pageSize));
+  }
+  var pageSize = resources_1.resources.defaultLimit
+  var spageSize = o[resources_1.resources.limit]
+  if (spageSize && typeof spageSize === "string") {
+    if (!isNaN(spageSize)) {
+      var ipageSize = Math.floor(parseFloat(spageSize))
       if (ipageSize > 0) {
-        r.limit = ipageSize;
-        var strSkip = config.skip;
-        if (!strSkip || strSkip.length === 0) {
-          strSkip = 'skip';
-        }
-        var skip = o[strSkip];
-        if (skip && !isNaN(skip)) {
-          var iskip = Math.floor(parseFloat(skip));
-          if (iskip >= 0) {
-            r.page = iskip;
-            r.pageOrNextPageToken = r.page;
-            deletePageInfo(o, arr);
-            return r;
-          }
-        }
-        var strPage = config.page;
-        if (!strPage || strPage.length === 0) {
-          strPage = 'page';
-        }
-        var pageIndex = o[strPage];
-        if (pageIndex && !isNaN(pageIndex)) {
-          var ipageIndex = Math.floor(parseFloat(pageIndex));
-          if (ipageIndex < 1) {
-            ipageIndex = 1;
-          }
-          var strFirstLimit = config.firstLimit;
-          if (!strFirstLimit || strFirstLimit.length === 0) {
-            strFirstLimit = 'firstLimit';
-          }
-          var firstPageSize = o[strFirstLimit];
-          if (firstPageSize && !isNaN(firstPageSize)) {
-            var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
-            if (ifirstPageSize > 0) {
-              r.page = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.pageOrNextPageToken = r.page;
-              deletePageInfo(o, arr);
-              return r;
-            }
-          }
-          r.page = ipageSize * (ipageIndex - 1);
-          r.pageOrNextPageToken = r.page;
-          deletePageInfo(o, arr);
-          return r;
-        }
-        r.page = 0;
-        if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.pageOrNextPageToken = r.nextPageToken;
-        }
-        deletePageInfo(o, arr);
-        return r;
+        pageSize = ipageSize
       }
     }
-    if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.pageOrNextPageToken = r.nextPageToken;
-    }
-    deletePageInfo(o, arr);
-    return r;
   }
+  var r = { limit: pageSize, fields: fields, page: page, nextPageToken: nextPageToken, pageOrNextPageToken: page }
+  if (r.nextPageToken && r.nextPageToken.length > 0) {
+    r.pageOrNextPageToken = r.nextPageToken
+  }
+  deletePageInfo(o)
+  return r
 }
-exports.getParameters = getParameters;
+exports.getParameters = getParameters
 function deletePageInfo(obj, arr) {
   if (!arr || arr.length === 0) {
-    delete obj['limit'];
-    delete obj['firstLimit'];
-    delete obj['skip'];
-    delete obj['page'];
-    delete obj['pageNo'];
-    delete obj['pageIndex'];
-    delete obj['pageSize'];
-    delete obj['initPageSize'];
-    delete obj['firstPageSize'];
-    delete obj['refId'];
-    delete obj['nextPageToken'];
+    delete obj[resources_1.resources.fields]
+    delete obj[resources_1.resources.limit]
+    delete obj[resources_1.resources.page]
+    if (resources_1.resources.nextPageToken && resources_1.resources.nextPageToken.length > 0) {
+      delete obj[resources_1.resources.nextPageToken]
+    }
+    if (resources_1.resources.partial && resources_1.resources.partial.length > 0) {
+      delete obj[resources_1.resources.partial]
+    }
   } else {
     for (var _i = 0, arr_3 = arr; _i < arr_3.length; _i++) {
-      var o = arr_3[_i];
+      var o = arr_3[_i]
       if (o && o.length > 0) {
-        delete obj[o];
+        delete obj[o]
       }
     }
   }
 }
-exports.deletePageInfo = deletePageInfo;
-var re = /"/g;
+exports.deletePageInfo = deletePageInfo
+var re = /"/g
 function toCsv(fields, r) {
   if (!r || r.list.length === 0) {
-    return '0';
+    return "0"
   } else {
-    var e = '';
-    var s = 'string';
-    var n = 'number';
-    var b = '""';
-    var rows = [];
-    rows.push('' + (r.total ? r.total : '') + ',' + (r.nextPageToken ? r.nextPageToken : '') + ',' + (r.last ? '1' : ''));
+    var e = ""
+    var s = "string"
+    var n = "number"
+    var b = '""'
+    var rows = []
+    rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : "") + "," + (r.last ? "1" : ""))
     for (var _i = 0, _a = r.list; _i < _a.length; _i++) {
-      var item = _a[_i];
-      var cols = [];
+      var item = _a[_i]
+      var cols = []
       for (var _b = 0, fields_1 = fields; _b < fields_1.length; _b++) {
-        var name = fields_1[_b];
-        var v = item[name];
+        var name = fields_1[_b]
+        var v = item[name]
         if (!v) {
-          cols.push(e);
+          cols.push(e)
         } else {
           if (typeof v === s) {
-            if (s.indexOf(',') >= 0) {
-              cols.push('"' + v.replace(re, b) + '"');
+            if (s.indexOf(",") >= 0) {
+              cols.push('"' + v.replace(re, b) + '"')
             } else {
-              cols.push(v);
+              cols.push(v)
             }
           } else if (v instanceof Date) {
-            cols.push(v.toISOString());
+            cols.push(v.toISOString())
           } else if (typeof v === n) {
-            cols.push(v.toString());
+            cols.push(v.toString())
           } else {
-            cols.push('');
+            cols.push("")
           }
         }
       }
-      rows.push(cols.join(','));
+      rows.push(cols.join(","))
     }
-    return rows.join('\n');
+    return rows.join("\n")
   }
 }
-exports.toCsv = toCsv;
+exports.toCsv = toCsv
 function buildMetadata(attributes, includeDate) {
-  var keys = Object.keys(attributes);
-  var dates = [];
-  var numbers = [];
+  var keys = Object.keys(attributes)
+  var dates = []
+  var numbers = []
   for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
-    var key = keys_3[_i];
-    var attr = attributes[key];
-    if (attr.type === 'number' || attr.type === 'integer') {
-      numbers.push(key);
-    } else if (attr.type === 'datetime' || (includeDate === true && attr.type === 'date')) {
-      dates.push(key);
+    var key = keys_3[_i]
+    var attr = attributes[key]
+    if (attr.type === "number" || attr.type === "integer") {
+      numbers.push(key)
+    } else if (attr.type === "datetime" || (includeDate === true && attr.type === "date")) {
+      dates.push(key)
     }
   }
-  var m = {};
+  var m = {}
   if (dates.length > 0) {
-    m.dates = dates;
+    m.dates = dates
   }
   if (numbers.length > 0) {
-    m.numbers = numbers;
+    m.numbers = numbers
   }
-  return m;
+  return m
 }
-exports.buildMetadata = buildMetadata;
-var _datereg = '/Date(';
-var _re = /-?\d+/;
+exports.buildMetadata = buildMetadata
+var _datereg = "/Date("
+var _re = /-?\d+/
 function toDate(v) {
   if (!v) {
-    return null;
+    return null
   }
   if (v instanceof Date) {
-    return v;
-  } else if (typeof v === 'number') {
-    return new Date(v);
+    return v
+  } else if (typeof v === "number") {
+    return new Date(v)
   }
-  var i = v.indexOf(_datereg);
+  var i = v.indexOf(_datereg)
   if (i >= 0) {
-    var m = _re.exec(v);
+    var m = _re.exec(v)
     if (m !== null) {
-      var d = parseInt(m[0], 10);
-      return new Date(d);
+      var d = parseInt(m[0], 10)
+      return new Date(d)
     } else {
-      return null;
+      return null
     }
   } else {
     if (isNaN(v)) {
-      return new Date(v);
+      return new Date(v)
     } else {
-      var d = parseInt(v, 10);
-      return new Date(d);
+      var d = parseInt(v, 10)
+      return new Date(d)
     }
   }
 }
 function format(obj, dates, nums) {
-  var o = obj;
+  var o = obj
   if (dates && dates.length > 0) {
     for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
-      var s = dates_1[_i];
-      var v = o[s];
+      var s = dates_1[_i]
+      var v = o[s]
       if (v) {
         if (v instanceof Date) {
-          continue;
+          continue
         }
-        if (typeof v === 'string' || typeof v === 'number') {
-          var d = toDate(v);
+        if (typeof v === "string" || typeof v === "number") {
+          var d = toDate(v)
           if (d) {
-            if (!(d instanceof Date) || d.toString() === 'Invalid Date') {
-              delete o[s];
+            if (!(d instanceof Date) || d.toString() === "Invalid Date") {
+              delete o[s]
             } else {
-              o[s] = d;
+              o[s] = d
             }
           }
-        } else if (typeof v === 'object') {
-          var keys = Object.keys(v);
+        } else if (typeof v === "object") {
+          var keys = Object.keys(v)
           for (var _a = 0, keys_4 = keys; _a < keys_4.length; _a++) {
-            var key = keys_4[_a];
-            var v2 = v[key];
+            var key = keys_4[_a]
+            var v2 = v[key]
             if (v2 instanceof Date) {
-              continue;
+              continue
             }
-            if (typeof v2 === 'string' || typeof v2 === 'number') {
-              var d2 = toDate(v2);
+            if (typeof v2 === "string" || typeof v2 === "number") {
+              var d2 = toDate(v2)
               if (d2) {
-                if (!(d2 instanceof Date) || d2.toString() === 'Invalid Date') {
-                  delete v[key];
+                if (!(d2 instanceof Date) || d2.toString() === "Invalid Date") {
+                  delete v[key]
                 } else {
-                  v[key] = d2;
+                  v[key] = d2
                 }
               }
             }
@@ -723,42 +598,42 @@ function format(obj, dates, nums) {
   }
   if (nums && nums.length > 0) {
     for (var _b = 0, nums_1 = nums; _b < nums_1.length; _b++) {
-      var s = nums_1[_b];
-      var v = o[s];
+      var s = nums_1[_b]
+      var v = o[s]
       if (v) {
         if (v instanceof Date) {
-          delete o[s];
-          continue;
+          delete o[s]
+          continue
         }
-        if (typeof v === 'number') {
-          continue;
+        if (typeof v === "number") {
+          continue
         }
-        if (typeof v === 'string') {
+        if (typeof v === "string") {
           if (!isNaN(v)) {
-            delete o[s];
-            continue;
+            delete o[s]
+            continue
           } else {
-            var i = parseFloat(v);
-            o[s] = i;
+            var i = parseFloat(v)
+            o[s] = i
           }
-        } else if (typeof v === 'object') {
-          var keys = Object.keys(v);
+        } else if (typeof v === "object") {
+          var keys = Object.keys(v)
           for (var _c = 0, keys_5 = keys; _c < keys_5.length; _c++) {
-            var key = keys_5[_c];
-            var v2 = v[key];
+            var key = keys_5[_c]
+            var v2 = v[key]
             if (v2 instanceof Date) {
-              delete o[key];
-              continue;
+              delete o[key]
+              continue
             }
-            if (typeof v2 === 'number') {
-              continue;
+            if (typeof v2 === "number") {
+              continue
             }
-            if (typeof v2 === 'string') {
+            if (typeof v2 === "string") {
               if (!isNaN(v2)) {
-                delete v[key];
+                delete v[key]
               } else {
-                var i = parseFloat(v2);
-                v[key] = i;
+                var i = parseFloat(v2)
+                v[key] = i
               }
             }
           }
@@ -766,25 +641,25 @@ function format(obj, dates, nums) {
       }
     }
   }
-  return o;
+  return o
 }
-exports.format = format;
+exports.format = format
 function getMetadataFunc(viewService, dates, numbers, keys) {
-  var m = { dates: dates, numbers: numbers };
+  var m = { dates: dates, numbers: numbers }
   if ((m.dates && m.dates.length > 0) || (m.numbers && m.numbers.length > 0)) {
-    return m;
+    return m
   }
   if (keys) {
     if (!Array.isArray(keys)) {
-      return buildMetadata(keys);
+      return buildMetadata(keys)
     }
   }
-  if (typeof viewService !== 'function' && viewService.metadata) {
-    var metadata = viewService.metadata();
+  if (typeof viewService !== "function" && viewService.metadata) {
+    var metadata = viewService.metadata()
     if (metadata) {
-      return buildMetadata(metadata);
+      return buildMetadata(metadata)
     }
   }
-  return undefined;
+  return undefined
 }
-exports.getMetadataFunc = getMetadataFunc;
+exports.getMetadataFunc = getMetadataFunc