express-ext 0.2.7 → 0.3.0

package/src/GenericController.ts

@@ -1,17 +1,17 @@
-import {Request, Response} from 'express';
-import {checkId, create, isTypeError, update} from './edit';
-import {handleError, Log} from './http';
-import {LoadController} from './LoadController';
-import {Attribute, Attributes, ErrorMessage} from './metadata';
-import {resources} from './resources';
-import {buildAndCheckId, buildId} from './view';
+import { Request, Response } from 'express';
+import { checkId, create, isTypeError, update } from './edit';
+import { handleError, Log } from './http';
+import { LoadController } from './LoadController';
+import { Attribute, Attributes, ErrorMessage } from './metadata';
+import { resources, StringMap } from './resources';
+import { buildAndCheckId, buildId } from './view';
 
 export type Build<T> = (res: Response, obj: T, isCreate?: boolean, isPatch?: boolean) => void;
-export type Validate<T> = (obj: T, patch?: boolean) => Promise<ErrorMessage[]>;
-export type Save<T> = (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>;
+export type Validate<T> = (obj: T, resource?: StringMap, patch?: boolean) => Promise<ErrorMessage[]>;
+export type Save<T> = (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>;
 export interface GenericService<T, ID, R> {
-  metadata?(): Attributes|undefined;
-  load(id: ID, ctx?: any): Promise<T|null>;
+  metadata?(): Attributes | undefined;
+  load(id: ID, ctx?: any): Promise<T | null>;
   create(obj: T, ctx?: any): Promise<R>;
   update(obj: T, ctx?: any): Promise<R>;
   patch?(obj: Partial<T>, ctx?: any): Promise<R>;
@@ -20,7 +20,13 @@ export interface GenericService<T, ID, R> {
 export class GenericController<T, ID> extends LoadController<T, ID> {
   metadata?: Attributes;
   returnNumber?: boolean;
-  constructor(log: Log, public service: GenericService<T, ID, number|T|ErrorMessage[]>, public build?: Build<T>, public validate?: Validate<T>, returnNumber?: boolean) {
+  constructor(
+    log: Log,
+    public service: GenericService<T, ID, number | T | ErrorMessage[]>,
+    public build?: Build<T>,
+    public validate?: Validate<T>,
+    returnNumber?: boolean,
+  ) {
     super(log, service);
     this.returnNumber = returnNumber;
     if (service.metadata) {
@@ -44,13 +50,13 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
   update(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update);
     if (id) {
-      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, this.build);
+      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, undefined, this.build);
     }
   }
   patch(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch);
     if (id && this.service.patch) {
-      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, this.build);
+      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build);
     }
   }
   delete(req: Request, res: Response): void {
@@ -59,46 +65,71 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
       if (!this.service.delete) {
         res.status(405).end('Method Not Allowed');
       } else {
-        this.service.delete(id).then(count => {
-          res.status(getDeleteStatus(count)).json(count).end();
-        }).catch(err => handleError(err, res, this.log));
+        this.service
+          .delete(id)
+          .then((count) => {
+            res.status(getDeleteStatus(count)).json(count).end();
+          })
+          .catch((err) => handleError(err, res, this.log));
       }
     }
   }
 }
-export function validateAndCreate<T>(req: Request, res: Response, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>, returnNumber?: boolean): void {
+export function validateAndCreate<T>(
+  req: Request,
+  res: Response,
+  save: Save<T>,
+  log: Log,
+  validate?: Validate<T>,
+  build?: Build<T>,
+  returnNumber?: boolean,
+): void {
   const obj = req.body;
   if (!obj || obj === '') {
     res.status(400).end('The request body cannot be empty.');
   } else {
     if (validate) {
-      validate(obj).then(errors => {
-        if (errors && errors.length > 0) {
-          res.status(getStatusCode(errors)).json(errors).end();
-        } else {
-          if (build) {
-            build(res, obj, true);
+      validate(obj)
+        .then((errors) => {
+          if (errors && errors.length > 0) {
+            res.status(getStatusCode(errors)).json(errors).end();
+          } else {
+            if (build) {
+              build(res, obj, true);
+            }
+            create(res, obj, save, log, returnNumber);
           }
-          create(res, obj, save, log, returnNumber);
-        }
-      }).catch(err => handleError(err, res, log));
+        })
+        .catch((err) => handleError(err, res, log));
     } else {
       create(res, obj, save, log, returnNumber);
     }
   }
 }
-export function validateAndUpdate<T>(res: Response, obj: T, isPatch: boolean, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>, returnNumber?: boolean):  void {
+export function validateAndUpdate<T>(
+  res: Response,
+  obj: T,
+  isPatch: boolean,
+  save: Save<T>,
+  log: Log,
+  validate?: Validate<T>,
+  resource?: StringMap,
+  build?: Build<T>,
+  returnNumber?: boolean,
+): void {
   if (validate) {
-    validate(obj, isPatch).then(errors => {
-      if (errors && errors.length > 0) {
-        res.status(getStatusCode(errors)).json(errors).end();
-      } else {
-        if (build) {
-          build(res, obj, false, isPatch);
+    validate(obj, resource, isPatch)
+      .then((errors) => {
+        if (errors && errors.length > 0) {
+          res.status(getStatusCode(errors)).json(errors).end();
+        } else {
+          if (build) {
+            build(res, obj, false, isPatch);
+          }
+          update(res, obj, save, log, returnNumber);
         }
-        update(res, obj, save, log, returnNumber);
-      }
-    }).catch(err => handleError(err, res, log));
+      })
+      .catch((err) => handleError(err, res, log));
   } else {
     update(res, obj, save, log, returnNumber);
   }
@@ -135,7 +166,7 @@ export function getDeleteStatus(count: number): number {
   }
 }
 export function getStatusCode(errs: ErrorMessage[]): number {
-  return (isTypeError(errs) ? 400 : 422);
+  return isTypeError(errs) ? 400 : 422;
 }
 export interface ModelConfig {
   id?: string;
@@ -147,13 +178,33 @@ export interface ModelConfig {
   createdAt?: string;
   version?: string;
 }
-export function useBuild<T>(c: ModelConfig, generate?: (() => string)): Build<T> {
-  const b = new Builder<T>(generate, c.id ? c.id : '', c.payload ? c.payload : '', c.user ? c.user : '', c.updatedBy ? c.updatedBy : '', c.updatedAt ? c.updatedAt : '', c.createdBy ? c.createdBy : '', c.createdAt ? c.createdAt : '', c.version ? c.version : '');
+export function useBuild<T>(c: ModelConfig, generate?: () => string): Build<T> {
+  const b = new Builder<T>(
+    generate,
+    c.id ? c.id : '',
+    c.payload ? c.payload : '',
+    c.user ? c.user : '',
+    c.updatedBy ? c.updatedBy : '',
+    c.updatedAt ? c.updatedAt : '',
+    c.createdBy ? c.createdBy : '',
+    c.createdAt ? c.createdAt : '',
+    c.version ? c.version : '',
+  );
   return b.build;
 }
 // tslint:disable-next-line:max-classes-per-file
 export class Builder<T> {
-  constructor(public generate: (() => string)|undefined, public id: string, public payload: string, public user: string, public updatedBy: string, public updatedAt: string, public createdBy: string, public createdAt: string, public version: string) {
+  constructor(
+    public generate: (() => string) | undefined,
+    public id: string,
+    public payload: string,
+    public user: string,
+    public updatedBy: string,
+    public updatedAt: string,
+    public createdBy: string,
+    public createdAt: string,
+    public version: string,
+  ) {
     this.build = this.build.bind(this);
   }
   build(res: Response, obj: T, isCreate?: boolean, isPatch?: boolean): void {

package/src/GenericSearchController.ts

@@ -2,8 +2,8 @@ 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 { StringMap } from './resources';
+import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
 
 export class GenericSearchController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
@@ -19,7 +19,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
     service: GenericService<T, ID, number | ErrorMessage[]>,
     config?: SearchConfig,
     build?: Build<T>,
-    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    validate?: (obj: T, resource?: StringMap, patch?: boolean) => Promise<ErrorMessage[]>,
     dates?: string[],
     numbers?: string[],
   ) {
@@ -44,7 +44,7 @@ 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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }

package/src/LoadSearchController.ts

@@ -2,8 +2,7 @@ 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 { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
 
 export interface Search {
   search(req: Request, res: Response): void;
@@ -79,7 +78,7 @@ 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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }
@@ -122,7 +121,7 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.query
-      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }

package/src/LowCodeController.ts

@@ -2,8 +2,8 @@ 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 { StringMap } from './resources';
+import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
 
 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>>;
@@ -21,7 +21,7 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     public lowCodeService: Service<T, ID, number | ErrorMessage[], S>,
     config?: SearchConfig,
     build?: Build<T>,
-    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    validate?: (obj: T, resource?: StringMap, patch?: boolean) => Promise<ErrorMessage[]>,
     dates?: string[],
     numbers?: string[],
   ) {
@@ -47,7 +47,7 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.lowCodeService
-      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }
@@ -65,7 +65,7 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     log: Log,
     public lowCodeService: Service<T, ID, number | T | ErrorMessage[], S>,
     build?: Build<T>,
-    validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>,
+    validate?: (obj: T, resource?: StringMap, patch?: boolean) => Promise<ErrorMessage[]>,
     config?: SearchConfig,
     dates?: string[],
     numbers?: string[],
@@ -92,7 +92,7 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.lowCodeService
-      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }

package/src/SearchController.ts

@@ -36,7 +36,7 @@ export class SearchController<T, S extends Filter> {
     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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
       .catch((err) => handleError(err, res, this.log));
   }

package/src/edit.ts

@@ -1,6 +1,6 @@
-import {Response} from 'express';
-import {handleError} from './http';
-import {Attribute, ErrorMessage} from './metadata';
+import { Response } from 'express';
+import { handleError } from './http';
+import { Attribute, ErrorMessage } from './metadata';
 /*
 export interface StatusConfig {
   duplicate_key: number|string;
@@ -32,7 +32,7 @@ export function initializeStatus(s?: StatusConfig): StatusConfig {
 }
 */
 export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
-  const n: string = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
+  const n: string = keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id';
   const o: any = obj;
   const i: any = id;
   if (!keys || keys.length === 1) {
@@ -62,37 +62,59 @@ export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
   }
   return true;
 }
-export function create<T>(res: Response, obj: T, insert: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
-  insert(obj).then(result => {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(201).json(returnNumber ? result : obj).end();
+export function create<T>(
+  res: Response,
+  obj: T,
+  insert: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
+  log: (msg: string, ctx?: any) => void,
+  returnNumber?: boolean,
+): void {
+  insert(obj)
+    .then((result) => {
+      if (typeof result === 'number') {
+        if (result >= 1) {
+          res
+            .status(201)
+            .json(returnNumber ? result : obj)
+            .end();
+        } else {
+          res.status(409).json(result).end();
+        }
+      } else if (Array.isArray(result)) {
+        res.status(422).json(result).end();
       } else {
-        res.status(409).json(result).end();
+        res.status(201).json(result).end();
       }
-    } else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    } else {
-      res.status(201).json(result).end();
-    }
-  }).catch(err => handleError(err, res, log));
+    })
+    .catch((err) => handleError(err, res, log));
 }
-export function update<T>(res: Response, obj: T, save: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
-  save(obj).then(result => {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(200).json(returnNumber ? result : obj).end();
-      } else if (result === 0) {
-        res.status(404).json(result).end();
+export function update<T>(
+  res: Response,
+  obj: T,
+  save: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
+  log: (msg: string, ctx?: any) => void,
+  returnNumber?: boolean,
+): void {
+  save(obj)
+    .then((result) => {
+      if (typeof result === 'number') {
+        if (result >= 1) {
+          res
+            .status(200)
+            .json(returnNumber ? result : obj)
+            .end();
+        } else if (result === 0) {
+          res.status(404).json(result).end();
+        } else {
+          res.status(409).json(result).end();
+        }
+      } else if (Array.isArray(result)) {
+        res.status(422).json(result).end();
       } else {
-        res.status(409).json(result).end();
+        res.status(200).json(result).end();
       }
-    } else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    } else {
-      res.status(200).json(result).end();
-    }
-  }).catch(err => handleError(err, res, log));
+    })
+    .catch((err) => handleError(err, res, log));
 }
 export function isTypeError(errs: ErrorMessage[]): boolean {
   if (!errs) {
@@ -100,7 +122,19 @@ export function isTypeError(errs: ErrorMessage[]): boolean {
   }
   for (const err of errs) {
     const c = err.code;
-    if (c === 'string' || c === 'number' || c === 'date' || c === 'boolean') {
+    if (
+      c === 'type' ||
+      c === 'string' ||
+      c === 'number' ||
+      c === 'date' ||
+      c === 'boolean' ||
+      c === 'strings' ||
+      c === 'numbers' ||
+      c === 'integers' ||
+      c === 'dates' ||
+      c === 'datetimes' ||
+      c === 'booleans'
+    ) {
       return true;
     }
   }

package/src/index.ts

@@ -36,7 +36,6 @@ export * from './LowCodeController';
 export * from './metadata';
 export * from './resources';
 export * from './search';
-export * from './search_func';
 export * from './SearchController';
 export * from './view';
 
@@ -291,3 +290,8 @@ export class UserReactionController {
 }
 export const ReactController = UserReactionController;
 export const ReactionController = UserReactionController;
+export function addDays(d: Date, n: number): Date {
+  const newDate = new Date(d);
+  newDate.setDate(newDate.getDate() + n);
+  return newDate;
+}

package/src/resources.ts

@@ -9,7 +9,8 @@ export interface StringMap {
 }
 // tslint:disable-next-line:class-name
 export class resources {
-  static pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
+  static limits = [12, 24, 60, 100, 120, 180, 300, 600];
+  static component = 'page';
   static page = 'page';
   static limit = 'limit';
   static defaultLimit = 12;
@@ -19,9 +20,13 @@ export class resources {
   static check: (obj: any, attributes: Attributes, allowUndefined?: boolean, patch?: boolean) => ErrorMessage[];
   static encoding?: BufferEncoding = 'utf-8';
 }
+export function getView(req: Request, view: string): string {
+  const partial = req.query[resources.partial];
+  return partial == 'true' ? resources.component + '/' + view : view;
+}
 
 export interface Validator<T> {
-  validate(obj: T, patch?: boolean, resource?: StringMap): Promise<ErrorMessage[]>;
+  validate(obj: T, resource?: StringMap, patch?: boolean): Promise<ErrorMessage[]>;
 }
 
 // tslint:disable-next-line:max-classes-per-file

package/src/search.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from 'express';
 import { minimizeArray, query } from './http';
+import { ViewService } from './LoadController';
 import { Attribute, Attributes } from './metadata';
 import { resources } from './resources';
 
@@ -404,10 +405,10 @@ const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: an
 };
 export interface Limit {
   limit?: number;
-  offset?: number;
+  page?: number;
   nextPageToken?: string;
   fields?: string[];
-  offsetOrNextPageToken?: string | number;
+  pageOrNextPageToken?: string | number;
 }
 export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
   const o: any = obj;
@@ -432,16 +433,18 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
       const ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
+        /*
         const skip = o['skip'];
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
+            r.page = iskip;
+            r.pageOrNextPageToken = r.page;
             deletePageInfo(o);
             return r;
           }
         }
+        */
         let pageIndex = o['page'];
         if (!pageIndex) {
           pageIndex = o['pageIndex'];
@@ -454,6 +457,7 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
+          /*
           let firstPageSize = o['firstLimit'];
           if (!firstPageSize) {
             firstPageSize = o['firstPageSize'];
@@ -464,27 +468,28 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
+              r.page = ipageIndex;
+              r.pageOrNextPageToken = r.page;
               deletePageInfo(o);
               return r;
             }
           }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+            */
+          r.page = ipageIndex;
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o);
           return r;
         }
-        r.offset = 0;
+        r.page = 1;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o);
     return r;
@@ -524,8 +529,8 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
+            r.page = iskip;
+            r.pageOrNextPageToken = r.page;
             deletePageInfo(o, arr);
             return r;
           }
@@ -548,27 +553,27 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
+              r.page = ipageSize * (ipageIndex - 2) + ifirstPageSize;
+              r.pageOrNextPageToken = r.page;
               deletePageInfo(o, arr);
               return r;
             }
           }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+          r.page = ipageSize * (ipageIndex - 1);
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o, arr);
           return r;
         }
-        r.offset = 0;
+        r.page = 0;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o, arr);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o, arr);
     return r;
@@ -791,3 +796,26 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
   }
   return o;
 }
+export function getMetadataFunc<T, ID>(
+  viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
+  dates?: string[],
+  numbers?: string[],
+  keys?: Attributes | Attribute[] | string[],
+): Metadata | undefined {
+  const m: Metadata = { dates, numbers };
+  if ((m.dates && m.dates.length > 0) || (m.numbers && m.numbers.length > 0)) {
+    return m;
+  }
+  if (keys) {
+    if (!Array.isArray(keys)) {
+      return buildMetadata(keys);
+    }
+  }
+  if (typeof viewService !== 'function' && viewService.metadata) {
+    const metadata = viewService.metadata();
+    if (metadata) {
+      return buildMetadata(metadata);
+    }
+  }
+  return undefined;
+}

package/lib/search_func.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var search_1 = require("./search");
-function getMetadataFunc(viewService, dates, numbers, keys) {
-  var m = { dates: dates, numbers: numbers };
-  if (m.dates && m.dates.length > 0 || m.numbers && m.numbers.length > 0) {
-    return m;
-  }
-  if (keys) {
-    if (!Array.isArray(keys)) {
-      return search_1.buildMetadata(keys);
-    }
-  }
-  if (typeof viewService !== 'function' && viewService.metadata) {
-    var metadata = viewService.metadata();
-    if (metadata) {
-      return search_1.buildMetadata(metadata);
-    }
-  }
-  return undefined;
-}
-exports.getMetadataFunc = getMetadataFunc;