express-ext 0.2.3 → 0.2.4

package/lib/search.js

@@ -1,11 +1,89 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_1 = require("./http");
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var http_1 = require('./http');
+function getOffset(limit, page) {
+  var offset = limit * (page - 1);
+  return offset < 0 ? 0 : offset;
+}
+exports.getOffset = getOffset;
+function getPageTotal(pageSize, total) {
+  if (!pageSize || pageSize <= 0) {
+    return 1;
+  } else {
+    if (!total) {
+      total = 0;
+    }
+    if (total % pageSize === 0) {
+      return Math.floor(total / pageSize);
+    }
+    return Math.floor(total / pageSize + 1);
+  }
+}
+exports.getPageTotal = getPageTotal;
+function buildPages(pageSize, total) {
+  var pageTotal = getPageTotal(pageSize, total);
+  if (pageTotal <= 1) {
+    return [1];
+  }
+  var arr = [];
+  for (var i = 1; i <= pageTotal; i++) {
+    arr.push(i);
+  }
+  return arr;
+}
+exports.buildPages = buildPages;
+function getPageQuery(query, page) {
+  var s = page && page.length > 0 ? page : 'page';
+  var i = query.indexOf(s + '=');
+  if (i < 0) {
+    return '';
+  }
+  var j = query.indexOf('&', i + s.length);
+  return j < 0 ? query.substring(i) : query.substring(i, j);
+}
+exports.getPageQuery = getPageQuery;
+var PartialTrue = 'partial=true';
+function removePageQuery(query, page, partialIsTrue) {
+  if (query.length == 0) {
+    return query;
+  }
+  var partialTrue = partialIsTrue && partialIsTrue.length > 0 ? partialIsTrue : PartialTrue;
+  var p1 = '&' + partialTrue;
+  var q1 = query.indexOf(p1);
+  if (q1 >= 0) {
+    query = query.substring(0, q1) + query.substring(q1 + partialTrue.length + 2);
+  } else {
+    var p2 = partialTrue + '&';
+    var q2 = query.indexOf(p2);
+    if (q2 >= 0) {
+      query = query.substring(0, q1) + query.substring(q1 + partialTrue.length + 2);
+    }
+  }
+  var pageQuery = getPageQuery(query, page);
+  if (pageQuery.length == 0) {
+    return query;
+  } else {
+    var x = pageQuery + '&';
+    if (query.indexOf(x) >= 0) {
+      return query.replace(x, '');
+    }
+    var x2 = '&' + pageQuery;
+    if (query.indexOf(x2) >= 0) {
+      return query.replace(x2, '');
+    }
+    return query.replace(pageQuery, '');
+  }
+}
+exports.removePageQuery = removePageQuery;
+function buildPageQuery(query) {
+  var qr = removePageQuery(query);
+  return qr.length == 0 ? qr : '&' + qr;
+}
+exports.buildPageQuery = buildPageQuery;
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
     res.status(200).json(toCsv(fields, result)).end();
-  }
-  else {
+  } else {
     res.status(200).json(buildResult(result, config)).end();
   }
 }
@@ -15,16 +93,16 @@ function buildResult(r, conf) {
     return r;
   }
   var x = {};
-  var li = (conf.list ? conf.list : 'list');
+  var li = conf.list ? conf.list : 'list';
   x[li] = http_1.minimizeArray(r.list);
-  var to = (conf.total ? conf.total : 'total');
+  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');
+    var t = conf.token ? conf.token : 'token';
     x[t] = r.nextPageToken;
   }
   if (r.last) {
-    var l = (conf.last ? conf.last : 'last');
+    var l = conf.last ? conf.last : 'last';
     x[l] = r.last;
   }
   return x;
@@ -46,7 +124,7 @@ function initializeConfig(conf) {
     limit: conf.limit,
     skip: conf.skip,
     refId: conf.refId,
-    firstLimit: conf.firstLimit
+    firstLimit: conf.firstLimit,
   };
   if (!c.excluding || c.excluding.length === 0) {
     c.excluding = 'excluding';
@@ -85,7 +163,7 @@ function initializeConfig(conf) {
 }
 exports.initializeConfig = initializeConfig;
 function fromRequest(req, arr) {
-  var s = (req.method === 'GET' ? fromUrl(req, arr) : req.body);
+  var s = req.method === 'GET' ? fromUrl(req, arr) : req.body;
   return s;
 }
 exports.fromRequest = fromRequest;
@@ -118,8 +196,7 @@ function fromUrl(req, arr) {
     if (inArray(key, arr)) {
       var x = obj[key].split(',');
       setValue(s, key, x);
-    }
-    else {
+    } else {
       setValue(s, key, obj[key]);
     }
   }
@@ -163,12 +240,10 @@ var setKey = function (_object, _isArrayKey, _key, _nextValue) {
   if (_isArrayKey) {
     if (_object.length > _key) {
       _object[_key] = _nextValue;
-    }
-    else {
+    } else {
       _object.push(_nextValue);
     }
-  }
-  else {
+  } else {
     _object[_key] = _nextValue;
   }
   return _object;
@@ -187,7 +262,7 @@ function getParameters(obj, config) {
     if (!refId) {
       refId = o['nextPageToken'];
     }
-    var r = { fields: fields, refId: refId };
+    var r = { fields: fields, nextPageToken: refId };
     var pageSize = o['limit'];
     if (!pageSize) {
       pageSize = o['pageSize'];
@@ -200,8 +275,8 @@ function getParameters(obj, config) {
         if (skip && !isNaN(skip)) {
           var iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.skip = iskip;
-            r.skipOrRefId = r.skip;
+            r.offset = iskip;
+            r.offsetOrNextPageToken = r.offset;
             deletePageInfo(o);
             return r;
           }
@@ -228,32 +303,31 @@ function getParameters(obj, config) {
           if (firstPageSize && !isNaN(firstPageSize)) {
             var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.skipOrRefId = r.skip;
+              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
+              r.offsetOrNextPageToken = r.offset;
               deletePageInfo(o);
               return r;
             }
           }
-          r.skip = ipageSize * (ipageIndex - 1);
-          r.skipOrRefId = r.skip;
+          r.offset = ipageSize * (ipageIndex - 1);
+          r.offsetOrNextPageToken = r.offset;
           deletePageInfo(o);
           return r;
         }
-        r.skip = 0;
-        if (r.refId && r.refId.length > 0) {
-          r.skipOrRefId = r.refId;
+        r.offset = 0;
+        if (r.nextPageToken && r.nextPageToken.length > 0) {
+          r.offsetOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o);
         return r;
       }
     }
-    if (r.refId && r.refId.length > 0) {
-      r.skipOrRefId = r.refId;
+    if (r.nextPageToken && r.nextPageToken.length > 0) {
+      r.offsetOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o);
     return r;
-  }
-  else {
+  } else {
     var sfield = config.fields;
     if (!sfield || sfield.length === 0) {
       sfield = 'fields';
@@ -269,7 +343,7 @@ function getParameters(obj, config) {
       strRefId = 'refId';
     }
     var refId = o[strRefId];
-    var r = { fields: fields, refId: refId };
+    var r = { fields: fields, nextPageToken: refId };
     var strLimit = config.limit;
     if (!strLimit || strLimit.length === 0) {
       strLimit = 'limit';
@@ -288,8 +362,8 @@ function getParameters(obj, config) {
         if (skip && !isNaN(skip)) {
           var iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.skip = iskip;
-            r.skipOrRefId = r.skip;
+            r.offset = iskip;
+            r.offsetOrNextPageToken = r.offset;
             deletePageInfo(o, arr);
             return r;
           }
@@ -312,27 +386,27 @@ function getParameters(obj, config) {
           if (firstPageSize && !isNaN(firstPageSize)) {
             var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.skipOrRefId = r.skip;
+              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
+              r.offsetOrNextPageToken = r.offset;
               deletePageInfo(o, arr);
               return r;
             }
           }
-          r.skip = ipageSize * (ipageIndex - 1);
-          r.skipOrRefId = r.skip;
+          r.offset = ipageSize * (ipageIndex - 1);
+          r.offsetOrNextPageToken = r.offset;
           deletePageInfo(o, arr);
           return r;
         }
-        r.skip = 0;
-        if (r.refId && r.refId.length > 0) {
-          r.skipOrRefId = r.refId;
+        r.offset = 0;
+        if (r.nextPageToken && r.nextPageToken.length > 0) {
+          r.offsetOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o, arr);
         return r;
       }
     }
-    if (r.refId && r.refId.length > 0) {
-      r.skipOrRefId = r.refId;
+    if (r.nextPageToken && r.nextPageToken.length > 0) {
+      r.offsetOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o, arr);
     return r;
@@ -352,8 +426,7 @@ function deletePageInfo(obj, arr) {
     delete obj['firstPageSize'];
     delete obj['refId'];
     delete obj['nextPageToken'];
-  }
-  else {
+  } else {
     for (var _i = 0, arr_3 = arr; _i < arr_3.length; _i++) {
       var o = arr_3[_i];
       if (o && o.length > 0) {
@@ -367,8 +440,7 @@ var re = /"/g;
 function toCsv(fields, r) {
   if (!r || r.list.length === 0) {
     return '0';
-  }
-  else {
+  } else {
     var e = '';
     var s = 'string';
     var n = 'number';
@@ -383,23 +455,18 @@ function toCsv(fields, r) {
         var v = item[name];
         if (!v) {
           cols.push(e);
-        }
-        else {
+        } else {
           if (typeof v === s) {
             if (s.indexOf(',') >= 0) {
               cols.push('"' + v.replace(re, b) + '"');
-            }
-            else {
+            } else {
               cols.push(v);
             }
-          }
-          else if (v instanceof Date) {
+          } else if (v instanceof Date) {
             cols.push(v.toISOString());
-          }
-          else if (typeof v === n) {
+          } else if (typeof v === n) {
             cols.push(v.toString());
-          }
-          else {
+          } else {
             cols.push('');
           }
         }
@@ -419,8 +486,7 @@ function buildMetadata(attributes, includeDate) {
     var attr = attributes[key];
     if (attr.type === 'number' || attr.type === 'integer') {
       numbers.push(key);
-    }
-    else if (attr.type === 'datetime' || (includeDate === true && attr.type === 'date')) {
+    } else if (attr.type === 'datetime' || (includeDate === true && attr.type === 'date')) {
       dates.push(key);
     }
   }
@@ -442,8 +508,7 @@ function toDate(v) {
   }
   if (v instanceof Date) {
     return v;
-  }
-  else if (typeof v === 'number') {
+  } else if (typeof v === 'number') {
     return new Date(v);
   }
   var i = v.indexOf(_datereg);
@@ -452,16 +517,13 @@ function toDate(v) {
     if (m !== null) {
       var d = parseInt(m[0], 10);
       return new Date(d);
-    }
-    else {
+    } else {
       return null;
     }
-  }
-  else {
+  } else {
     if (isNaN(v)) {
       return new Date(v);
-    }
-    else {
+    } else {
       var d = parseInt(v, 10);
       return new Date(d);
     }
@@ -482,13 +544,11 @@ function format(obj, dates, nums) {
           if (d) {
             if (!(d instanceof Date) || d.toString() === 'Invalid Date') {
               delete o[s];
-            }
-            else {
+            } else {
               o[s] = d;
             }
           }
-        }
-        else if (typeof v === 'object') {
+        } else if (typeof v === 'object') {
           var keys = Object.keys(v);
           for (var _a = 0, keys_3 = keys; _a < keys_3.length; _a++) {
             var key = keys_3[_a];
@@ -501,8 +561,7 @@ function format(obj, dates, nums) {
               if (d2) {
                 if (!(d2 instanceof Date) || d2.toString() === 'Invalid Date') {
                   delete v[key];
-                }
-                else {
+                } else {
                   v[key] = d2;
                 }
               }
@@ -528,13 +587,11 @@ function format(obj, dates, nums) {
           if (!isNaN(v)) {
             delete o[s];
             continue;
-          }
-          else {
+          } else {
             var i = parseFloat(v);
             o[s] = i;
           }
-        }
-        else if (typeof v === 'object') {
+        } else if (typeof v === 'object') {
           var keys = Object.keys(v);
           for (var _c = 0, keys_4 = keys; _c < keys_4.length; _c++) {
             var key = keys_4[_c];
@@ -549,8 +606,7 @@ function format(obj, dates, nums) {
             if (typeof v2 === 'string') {
               if (!isNaN(v2)) {
                 delete v[key];
-              }
-              else {
+              } else {
                 var i = parseFloat(v2);
                 v[key] = i;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/GenericSearchController.ts

@@ -1,9 +1,9 @@
-import {Request, Response} from 'express';
-import {Build, GenericController, GenericService} from './GenericController';
-import {handleError, Log} from './http';
-import {ErrorMessage} from './metadata';
-import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
-import {getMetadataFunc} from './search_func';
+import { Request, Response } from 'express';
+import { Build, GenericController, GenericService } from './GenericController';
+import { handleError, Log } from './http';
+import { ErrorMessage } from './metadata';
+import { buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { getMetadataFunc } from './search_func';
 
 export class GenericSearchController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
@@ -13,7 +13,16 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
   fields?: string;
   excluding?: string;
   array?: string[];
-  constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ErrorMessage[]>, config?: SearchConfig, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(
+    log: Log,
+    public find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+    service: GenericService<T, ID, number | ErrorMessage[]>,
+    config?: SearchConfig,
+    build?: Build<T>,
+    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    dates?: string[],
+    numbers?: string[],
+  ) {
     super(log, service, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
@@ -35,8 +44,8 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
-    this.find(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(result => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch(err => handleError(err, res, this.log));
+    this.find(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
+      .catch((err) => handleError(err, res, this.log));
   }
 }

package/src/LoadSearchController.ts

@@ -1,24 +1,33 @@
-import {Request, Response} from 'express';
-import {handleError, Log} from './http';
-import {LoadController, ViewService} from './LoadController';
-import {Attribute, Attributes} from './metadata';
-import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
-import {getMetadataFunc} from './search_func';
+import { Request, Response } from 'express';
+import { handleError, Log } from './http';
+import { LoadController, ViewService } from './LoadController';
+import { Attribute, Attributes } from './metadata';
+import { buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { getMetadataFunc } from './search_func';
 
 export interface Search {
   search(req: Request, res: Response): void;
   load(req: Request, res: Response): void;
 }
 export interface Query<T, ID, S> extends ViewService<T, ID> {
-  search: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>;
-  metadata?(): Attributes|undefined;
-  load(id: ID, ctx?: any): Promise<T|null>;
+  search: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
+  metadata?(): Attributes | undefined;
+  load(id: ID, ctx?: any): Promise<T | null>;
 }
 export interface SearchManager {
   search(req: Request, res: Response): void;
   load(req: Request, res: Response): void;
 }
-export function useSearchController<T, ID, S extends Filter>(log: Log, find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), array?: string[], dates?: string[], numbers?: string[], keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean): Search {
+export function useSearchController<T, ID, S extends Filter>(
+  log: Log,
+  find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+  viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
+  array?: string[],
+  dates?: string[],
+  numbers?: string[],
+  keys?: Attributes | Attribute[] | string[],
+  config?: SearchConfig | boolean,
+): Search {
   const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
   c.array = array;
   return c;
@@ -34,7 +43,15 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
   fields?: string;
   excluding?: string;
   array?: string[];
-  constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean, dates?: string[], numbers?: string[]) {
+  constructor(
+    log: Log,
+    public find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+    viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
+    keys?: Attributes | Attribute[] | string[],
+    config?: SearchConfig | boolean,
+    dates?: string[],
+    numbers?: string[],
+  ) {
     super(log, viewService, keys);
     this.search = this.search.bind(this);
     if (config) {
@@ -62,9 +79,9 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
-    this.find(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(result => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch(err => handleError(err, res, this.log));
+    this.find(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
+      .catch((err) => handleError(err, res, this.log));
   }
 }
 export class QueryController<T, ID, S extends Filter> extends LoadController<T, ID> {
@@ -75,7 +92,7 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
   fields?: string;
   excluding?: string;
   array?: string[];
-  constructor(log: Log, protected query: Query<T, ID, S>, config?: SearchConfig|boolean, dates?: string[], numbers?: string[], array?: string[]) {
+  constructor(log: Log, protected query: Query<T, ID, S>, config?: SearchConfig | boolean, dates?: string[], numbers?: string[], array?: string[]) {
     super(log, query);
     this.search = this.search.bind(this);
     this.array = array;
@@ -104,9 +121,10 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
-    this.query.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(result => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch(err => handleError(err, res, this.log));
+    this.query
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
+      .catch((err) => handleError(err, res, this.log));
   }
 }
-export {QueryController as QueryHandler};
+export { QueryController as QueryHandler };

package/src/LowCodeController.ts

@@ -1,12 +1,12 @@
-import {Request, Response} from 'express';
-import {Build, GenericController, GenericService} from './GenericController';
-import {handleError, Log} from './http';
-import {ErrorMessage} from './metadata';
-import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
-import {getMetadataFunc} from './search_func';
+import { Request, Response } from 'express';
+import { Build, GenericController, GenericService } from './GenericController';
+import { handleError, Log } from './http';
+import { ErrorMessage } from './metadata';
+import { buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { getMetadataFunc } from './search_func';
 
 export interface Service<T, ID, R, S extends Filter> extends GenericService<T, ID, R> {
-  search: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>;
+  search: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
 }
 export class LowcodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
@@ -16,7 +16,15 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
   fields?: string;
   excluding?: string;
   array?: string[];
-  constructor(log: Log, public lowCodeService: Service<T, ID, number|ErrorMessage[], S>, config?: SearchConfig, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(
+    log: Log,
+    public lowCodeService: Service<T, ID, number | ErrorMessage[], S>,
+    config?: SearchConfig,
+    build?: Build<T>,
+    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    dates?: string[],
+    numbers?: string[],
+  ) {
     super(log, lowCodeService, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
@@ -38,12 +46,13 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
-    this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(result => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch(err => handleError(err, res, this.log));
+    this.lowCodeService
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
+      .catch((err) => handleError(err, res, this.log));
   }
 }
-export {LowcodeController as LowcodeHandler};
+export { LowcodeController as LowcodeHandler };
 export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
@@ -52,7 +61,15 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
   fields?: string;
   excluding?: string;
   array?: string[];
-  constructor(log: Log, public lowCodeService: Service<T, ID, number|T|ErrorMessage[], S>, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, config?: SearchConfig, dates?: string[], numbers?: string[]) {
+  constructor(
+    log: Log,
+    public lowCodeService: Service<T, ID, number | T | ErrorMessage[], S>,
+    build?: Build<T>,
+    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    config?: SearchConfig,
+    dates?: string[],
+    numbers?: string[],
+  ) {
     super(log, lowCodeService, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
@@ -74,8 +91,9 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
-    this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(result => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch(err => handleError(err, res, this.log));
+    this.lowCodeService
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
+      .catch((err) => handleError(err, res, this.log));
   }
 }