express-ext 0.2.6 → 0.3.0

package/lib/search.js

@@ -144,6 +144,57 @@ function buildSortSearch(search, fields, sort) {
   return sorts;
 }
 exports.buildSortSearch = buildSortSearch;
+function clone(obj) {
+  if (!obj) {
+    return obj;
+  }
+  if (obj instanceof Date) {
+    return new Date(obj.getTime());
+  }
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    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);
+    }
+    return arr;
+  }
+  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];
+    if (v instanceof Date) {
+      x[k] = new Date(v.getTime());
+    } else {
+      switch (typeof v) {
+        case 'object':
+          x[k] = clone(v);
+          break;
+        default:
+          x[k] = v;
+          break;
+      }
+    }
+  }
+  return x;
+}
+exports.clone = clone;
+function cloneFilter(obj, page, limit) {
+  var f = clone(obj);
+  if (!obj.hasOwnProperty(resources_1.resources.page)) {
+    obj[resources_1.resources.page] = page;
+  }
+  if (!obj.hasOwnProperty(resources_1.resources.limit)) {
+    obj[resources_1.resources.limit] = limit;
+  }
+  return f;
+}
+exports.cloneFilter = cloneFilter;
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
     res.status(200).json(toCsv(fields, result)).end();
@@ -255,8 +306,8 @@ function fromUrl(req, arr) {
   var s = {};
   var obj = req.query;
   var keys = Object.keys(obj);
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i];
+  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+    var key = keys_2[_i];
     if (inArray(key, arr)) {
       var x = obj[key].split(',');
       setValue(s, key, x);
@@ -335,16 +386,6 @@ function getParameters(obj, config) {
       var ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
-        var skip = o['skip'];
-        if (skip && !isNaN(skip)) {
-          var iskip = Math.floor(parseFloat(skip));
-          if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
-            deletePageInfo(o);
-            return r;
-          }
-        }
         var pageIndex = o['page'];
         if (!pageIndex) {
           pageIndex = o['pageIndex'];
@@ -357,37 +398,21 @@ function getParameters(obj, config) {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
-          var firstPageSize = o['firstLimit'];
-          if (!firstPageSize) {
-            firstPageSize = o['firstPageSize'];
-          }
-          if (!firstPageSize) {
-            firstPageSize = o['initPageSize'];
-          }
-          if (firstPageSize && !isNaN(firstPageSize)) {
-            var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
-            if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
-              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;
@@ -426,8 +451,8 @@ function getParameters(obj, config) {
         if (skip && !isNaN(skip)) {
           var 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;
           }
@@ -450,27 +475,27 @@ function getParameters(obj, config) {
           if (firstPageSize && !isNaN(firstPageSize)) {
             var 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;
@@ -545,8 +570,8 @@ function buildMetadata(attributes, includeDate) {
   var keys = Object.keys(attributes);
   var dates = [];
   var numbers = [];
-  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-    var key = keys_2[_i];
+  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);
@@ -614,8 +639,8 @@ function format(obj, dates, nums) {
           }
         } 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];
+          for (var _a = 0, keys_4 = keys; _a < keys_4.length; _a++) {
+            var key = keys_4[_a];
             var v2 = v[key];
             if (v2 instanceof Date) {
               continue;
@@ -657,8 +682,8 @@ function format(obj, dates, nums) {
           }
         } 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];
+          for (var _c = 0, keys_5 = keys; _c < keys_5.length; _c++) {
+            var key = keys_5[_c];
             var v2 = v[key];
             if (v2 instanceof Date) {
               delete o[key];
@@ -683,3 +708,22 @@ function format(obj, dates, nums) {
   return o;
 }
 exports.format = format;
+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 buildMetadata(keys);
+    }
+  }
+  if (typeof viewService !== 'function' && viewService.metadata) {
+    var metadata = viewService.metadata();
+    if (metadata) {
+      return buildMetadata(metadata);
+    }
+  }
+  return undefined;
+}
+exports.getMetadataFunc = getMetadataFunc;

package/package.json

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

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));
   }