express-ext 0.1.5 → 0.1.10

package/lib/search.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.format = exports.buildMetadata = exports.toCsv = exports.deletePageInfo = exports.getParameters = exports.setValue = exports.fromUrl = exports.fromRequest = exports.initializeConfig = exports.buildResult = exports.jsonResult = void 0;
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
     res.status(200).json(toCsv(fields, result)).end();
@@ -15,13 +14,17 @@ function buildResult(r, conf) {
     return r;
   }
   var x = {};
-  x[conf.list] = r.list;
-  x[conf.total] = r.total;
+  var li = (conf.list ? conf.list : 'list');
+  x[li] = r.list;
+  var to = (conf.total ? conf.total : 'total');
+  x[to] = r.total;
   if (r.nextPageToken && r.nextPageToken.length > 0) {
-    x[conf.token] = r.nextPageToken;
+    var t = (conf.token ? conf.token : 'token');
+    x[t] = r.nextPageToken;
   }
   if (r.last) {
-    x[conf.last] = r.last;
+    var l = (conf.last ? conf.last : 'last');
+    x[l] = r.last;
   }
   return x;
 }
@@ -132,42 +135,43 @@ function setValue(obj, path, value) {
 }
 exports.setValue = setValue;
 function getParameters(obj, config) {
+  var o = obj;
   if (!config) {
     var sfield = 'fields';
     var fields = void 0;
-    var fs = obj[sfield];
+    var fs = o[sfield];
     if (fs && Array.isArray(fs)) {
       fields = fs;
-      delete obj[sfield];
+      delete o[sfield];
     }
-    var refId = obj['refId'];
+    var refId = o['refId'];
     if (!refId) {
-      refId = obj['nextPageToken'];
+      refId = o['nextPageToken'];
     }
     var r = { fields: fields, refId: refId };
-    var pageSize = obj['limit'];
+    var pageSize = o['limit'];
     if (!pageSize) {
-      pageSize = obj['pageSize'];
+      pageSize = o['pageSize'];
     }
     if (pageSize && !isNaN(pageSize)) {
       var ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
-        var skip = obj['skip'];
+        var skip = o['skip'];
         if (skip && !isNaN(skip)) {
           var iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
             r.skip = iskip;
             r.skipOrRefId = r.skip;
-            deletePageInfo(obj);
+            deletePageInfo(o);
             return r;
           }
         }
-        var pageIndex = obj['page'];
+        var pageIndex = o['page'];
         if (!pageIndex) {
-          pageIndex = obj['pageIndex'];
+          pageIndex = o['pageIndex'];
           if (!pageIndex) {
-            pageIndex = obj['pageNo'];
+            pageIndex = o['pageNo'];
           }
         }
         if (pageIndex && !isNaN(pageIndex)) {
@@ -175,39 +179,39 @@ function getParameters(obj, config) {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
-          var firstPageSize = obj['firstLimit'];
+          var firstPageSize = o['firstLimit'];
           if (!firstPageSize) {
-            firstPageSize = obj['firstPageSize'];
+            firstPageSize = o['firstPageSize'];
           }
           if (!firstPageSize) {
-            firstPageSize = obj['initPageSize'];
+            firstPageSize = o['initPageSize'];
           }
           if (firstPageSize && !isNaN(firstPageSize)) {
             var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
               r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
               r.skipOrRefId = r.skip;
-              deletePageInfo(obj);
+              deletePageInfo(o);
               return r;
             }
           }
           r.skip = ipageSize * (ipageIndex - 1);
           r.skipOrRefId = r.skip;
-          deletePageInfo(obj);
+          deletePageInfo(o);
           return r;
         }
         r.skip = 0;
         if (r.refId && r.refId.length > 0) {
           r.skipOrRefId = r.refId;
         }
-        deletePageInfo(obj);
+        deletePageInfo(o);
         return r;
       }
     }
     if (r.refId && r.refId.length > 0) {
       r.skipOrRefId = r.refId;
     }
-    deletePageInfo(obj);
+    deletePageInfo(o);
     return r;
   }
   else {
@@ -216,22 +220,22 @@ function getParameters(obj, config) {
       sfield = 'fields';
     }
     var fields = void 0;
-    var fs = obj[sfield];
+    var fs = o[sfield];
     if (fs && Array.isArray(fs)) {
       fields = fs;
-      delete obj[sfield];
+      delete o[sfield];
     }
     var strRefId = config.refId;
     if (!strRefId || strRefId.length === 0) {
       strRefId = 'refId';
     }
-    var refId = obj[strRefId];
+    var refId = o[strRefId];
     var r = { fields: fields, refId: refId };
     var strLimit = config.limit;
     if (!strLimit || strLimit.length === 0) {
       strLimit = 'limit';
     }
-    var pageSize = obj[strLimit];
+    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));
@@ -241,13 +245,13 @@ function getParameters(obj, config) {
         if (!strSkip || strSkip.length === 0) {
           strSkip = 'skip';
         }
-        var skip = obj[strSkip];
+        var skip = o[strSkip];
         if (skip && !isNaN(skip)) {
           var iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
             r.skip = iskip;
             r.skipOrRefId = r.skip;
-            deletePageInfo(obj, arr);
+            deletePageInfo(o, arr);
             return r;
           }
         }
@@ -255,7 +259,7 @@ function getParameters(obj, config) {
         if (!strPage || strPage.length === 0) {
           strPage = 'page';
         }
-        var pageIndex = obj[strPage];
+        var pageIndex = o[strPage];
         if (pageIndex && !isNaN(pageIndex)) {
           var ipageIndex = Math.floor(parseFloat(pageIndex));
           if (ipageIndex < 1) {
@@ -265,33 +269,33 @@ function getParameters(obj, config) {
           if (!strFirstLimit || strFirstLimit.length === 0) {
             strFirstLimit = 'firstLimit';
           }
-          var firstPageSize = obj[strFirstLimit];
+          var firstPageSize = o[strFirstLimit];
           if (firstPageSize && !isNaN(firstPageSize)) {
             var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
               r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
               r.skipOrRefId = r.skip;
-              deletePageInfo(obj, arr);
+              deletePageInfo(o, arr);
               return r;
             }
           }
           r.skip = ipageSize * (ipageIndex - 1);
           r.skipOrRefId = r.skip;
-          deletePageInfo(obj, arr);
+          deletePageInfo(o, arr);
           return r;
         }
         r.skip = 0;
         if (r.refId && r.refId.length > 0) {
           r.skipOrRefId = r.refId;
         }
-        deletePageInfo(obj, arr);
+        deletePageInfo(o, arr);
         return r;
       }
     }
     if (r.refId && r.refId.length > 0) {
       r.skipOrRefId = r.refId;
     }
-    deletePageInfo(obj, arr);
+    deletePageInfo(o, arr);
     return r;
   }
 }
@@ -394,7 +398,7 @@ exports.buildMetadata = buildMetadata;
 var _datereg = '/Date(';
 var _re = /-?\d+/;
 function toDate(v) {
-  if (!v || v === '') {
+  if (!v) {
     return null;
   }
   if (v instanceof Date) {
@@ -406,36 +410,43 @@ function toDate(v) {
   var i = v.indexOf(_datereg);
   if (i >= 0) {
     var m = _re.exec(v);
-    var d = parseInt(m[0], null);
-    return new Date(d);
+    if (m !== null) {
+      var d = parseInt(m[0], 10);
+      return new Date(d);
+    }
+    else {
+      return null;
+    }
   }
   else {
     if (isNaN(v)) {
       return new Date(v);
     }
     else {
-      var d = parseInt(v, null);
+      var d = parseInt(v, 10);
       return new Date(d);
     }
   }
 }
 function format(obj, dates, nums) {
+  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 = obj[s];
+      var v = o[s];
       if (v) {
         if (v instanceof Date) {
           continue;
         }
         if (typeof v === 'string' || typeof v === 'number') {
           var d = toDate(v);
-          var error = d.toString();
-          if (!(d instanceof Date) || error === 'Invalid Date') {
-            delete obj[s];
-          }
-          else {
-            obj[s] = d;
+          if (d) {
+            if (!(d instanceof Date) || d.toString() === 'Invalid Date') {
+              delete o[s];
+            }
+            else {
+              o[s] = d;
+            }
           }
         }
         else if (typeof v === 'object') {
@@ -448,12 +459,13 @@ function format(obj, dates, nums) {
             }
             if (typeof v2 === 'string' || typeof v2 === 'number') {
               var d2 = toDate(v2);
-              var error2 = d2.toString();
-              if (!(d2 instanceof Date) || error2 === 'Invalid Date') {
-                delete v[key];
-              }
-              else {
-                v[key] = d2;
+              if (d2) {
+                if (!(d2 instanceof Date) || d2.toString() === 'Invalid Date') {
+                  delete v[key];
+                }
+                else {
+                  v[key] = d2;
+                }
               }
             }
           }
@@ -464,10 +476,10 @@ 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 = obj[s];
+      var v = o[s];
       if (v) {
         if (v instanceof Date) {
-          delete obj[s];
+          delete o[s];
           continue;
         }
         if (typeof v === 'number') {
@@ -475,12 +487,12 @@ function format(obj, dates, nums) {
         }
         if (typeof v === 'string') {
           if (!isNaN(v)) {
-            delete obj[s];
+            delete o[s];
             continue;
           }
           else {
             var i = parseFloat(v);
-            obj[s] = i;
+            o[s] = i;
           }
         }
         else if (typeof v === 'object') {
@@ -489,7 +501,7 @@ function format(obj, dates, nums) {
             var key = keys_4[_c];
             var v2 = v[key];
             if (v2 instanceof Date) {
-              delete obj[key];
+              delete o[key];
               continue;
             }
             if (typeof v2 === 'number') {
@@ -509,6 +521,6 @@ function format(obj, dates, nums) {
       }
     }
   }
-  return obj;
+  return o;
 }
 exports.format = format;

package/lib/search_func.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadataFunc = void 0;
 var search_1 = require("./search");
 function getMetadataFunc(viewService, dates, numbers, keys) {
   var m = { dates: dates, numbers: numbers };

package/lib/view.js

@@ -1,30 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildKeys = exports.buildId = exports.buildAndCheckId = void 0;
 function buildAndCheckId(req, res, keys) {
   var id = buildId(req, keys);
   if (!id) {
     res.status(400).end('invalid parameters');
-    return null;
+    return undefined;
   }
   return id;
 }
 exports.buildAndCheckId = buildAndCheckId;
 function buildId(req, attrs) {
-  if (!attrs) {
+  if (!attrs || attrs.length === 0) {
     var id = req.params['id'];
     if (id && id.length > 0) {
       return id;
     }
-    return null;
+    return undefined;
   }
   if (attrs && attrs.length === 1) {
-    var key = (attrs[0].name ? attrs[0].name : 'id');
-    var id = req.params[key];
+    var id = req.params['id'];
+    var n = attrs[0].name;
+    if ((!id || id.length === 0) && n && n.length > 0) {
+      id = req.params[n];
+    }
     if (id && id.length > 0) {
       if (attrs[0].type === 'integer' || attrs[0].type === 'number') {
         if (isNaN(id)) {
-          return null;
+          return undefined;
         }
         var v = parseFloat(id);
         return v;
@@ -35,13 +37,16 @@ function buildId(req, attrs) {
   var ids = {};
   for (var _i = 0, attrs_1 = attrs; _i < attrs_1.length; _i++) {
     var attr = attrs_1[_i];
+    if (!attr.name) {
+      return undefined;
+    }
     var v = req.params[attr.name];
     if (!v) {
-      return null;
+      return undefined;
     }
     if (attr.type === 'integer' || attr.type === 'number') {
       if (isNaN(v)) {
-        return null;
+        return undefined;
       }
       ids[attr.name] = parseFloat(v);
     }

package/package.json

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

package/src/GenericController.ts

@@ -7,8 +7,8 @@ import {resources} from './resources';
 import {buildAndCheckId, buildId} from './view';
 
 export interface GenericService<T, ID, R> {
-  metadata?(): Attributes;
-  load(id: ID, ctx?: any): Promise<T>;
+  metadata?(): Attributes|undefined;
+  load(id: ID, ctx?: any): Promise<T|null>;
   insert(obj: T, ctx?: any): Promise<R>;
   update(obj: T, ctx?: any): Promise<R>;
   patch?(obj: T, ctx?: any): Promise<R>;
@@ -16,8 +16,8 @@ export interface GenericService<T, ID, R> {
 }
 export class GenericController<T, ID> extends LoadController<T, ID> {
   status: StatusConfig;
-  metadata: Attributes;
-  constructor(log: (msg: string, ctx?: any) => void, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>) {
+  metadata?: Attributes;
+  constructor(log: (msg: any, ctx?: any) => void, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>) {
     super(log, service);
     this.status = initializeStatus(status);
     if (service.metadata) {
@@ -43,27 +43,31 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
   }
   update(req: Request, res: Response) {
-    const id = buildAndCheckIdWithBody<T, ID>(req, res, this.keys);
+    const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update);
     if (id) {
       validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate);
     }
   }
   patch(req: Request, res: Response) {
-    const id = buildAndCheckIdWithBody<T, ID>(req, res, this.keys);
-    if (id) {
+    const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch);
+    if (id && this.service.patch) {
       validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate);
     }
   }
   delete(req: Request, res: Response) {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
-      this.service.delete(id).then(count => {
-        res.status(getDeleteStatus(count)).json(count).end();
-      }).catch(err => handleError(err, res, this.log));
+      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));
+      }
     }
   }
 }
-export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
+export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: any, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
   const obj = req.body;
   if (!obj || obj === '') {
     return res.status(400).end('The request body cannot be empty.');
@@ -81,7 +85,7 @@ export function validateAndCreate<T>(req: Request, res: Response, status: Status
     create(res, status, obj, save, log);
   }
 }
-export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {
+export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: any, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {
   if (validate) {
     validate(obj, isPatch).then(errors => {
       if (errors && errors.length > 0) {
@@ -95,12 +99,16 @@ export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T
     update(res, status, obj, save, log);
   }
 }
-export function buildAndCheckIdWithBody<T, ID>(req: Request, res: Response, keys?: Attribute[]): ID {
+export function buildAndCheckIdWithBody<T, ID, R>(req: Request, res: Response, keys?: Attribute[], patch?: (obj: T, ctx?: any) => Promise<R>): ID | undefined {
   const obj = req.body;
   if (!obj || obj === '') {
     res.status(400).end('The request body cannot be empty.');
     return undefined;
   }
+  if (!patch) {
+    res.status(405).end('Method Not Allowed');
+    return undefined;
+  }
   const id = buildId<ID>(req, keys);
   if (!id) {
     res.status(400).end('Invalid parameters');

package/src/GenericSearchController.ts

@@ -3,19 +3,19 @@ import {ResultInfo, StatusConfig} from './edit';
 import {GenericController, GenericService} from './GenericController';
 import {handleError} from './http';
 import {ErrorMessage} from './metadata';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export interface Config extends StatusConfig, SearchConfig {
 }
-export class GenericSearchController<T, ID, S extends SearchModel> extends GenericController<T, ID> {
+export class GenericSearchController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: string, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: any, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, service, config, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);

package/src/HealthController.ts

@@ -5,7 +5,7 @@ export class HealthController {
   constructor(protected checkers: HealthChecker[]) {
     this.check = this.check.bind(this);
   }
-  async check(req: Request, res: Response) {
+  check(req: Request, res: Response) {
     check(this.checkers).then(heath => {
       if (heath.status === 'UP') {
         return res.status(200).json(heath).end();

package/src/LoadController.ts

@@ -4,16 +4,16 @@ import {Attribute, Attributes} from './metadata';
 import {buildAndCheckId, buildKeys} from './view';
 
 export interface ViewService<T, ID> {
-  metadata?(): Attributes;
-  load(id: ID, ctx?: any): Promise<T>;
+  metadata?(): Attributes|undefined;
+  load(id: ID, ctx?: any): Promise<T|null>;
 }
-function getViewFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>)): (id: ID, ctx?: any) => Promise<T> {
+function getViewFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>)): (id: ID, ctx?: any) => Promise<T|null> {
   if (typeof viewService === 'function') {
     return viewService;
   }
   return viewService.load;
 }
-function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[]): Attribute[] {
+function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[]): Attribute[] | undefined {
   if (keys) {
     if (Array.isArray(keys)) {
       if (keys.length > 0) {
@@ -38,8 +38,8 @@ function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: an
 }
 export class LoadController<T, ID> {
   protected keys?: Attribute[];
-  protected view: (id: ID, ctx?: any) => Promise<T>;
-  constructor(protected log: (msg: any, ctx?: any) => void, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[]) {
+  protected view: (id: ID, ctx?: any) => Promise<T|null>;
+  constructor(protected log: (msg: any, ctx?: any) => void, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>), keys?: Attributes|Attribute[]|string[]) {
     this.load = this.load.bind(this);
     this.view = getViewFunc(viewService);
     this.keys = getKeysFunc(viewService, keys);

package/src/LoadSearchController.ts

@@ -2,10 +2,10 @@ import {Request, Response} from 'express';
 import {handleError} from './http';
 import {LoadController, ViewService} from './LoadController';
 import {Attribute, Attributes} from './metadata';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, Metadata, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
-export class LoadSearchController<T, ID, S extends SearchModel> extends LoadController<T, ID> {
+export class LoadSearchController<T, ID, S extends Filter> extends LoadController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];

package/src/LowCodeController.ts

@@ -3,22 +3,22 @@ import {ResultInfo, StatusConfig} from './edit';
 import {GenericController, GenericService} from './GenericController';
 import {handleError} from './http';
 import {ErrorMessage} from './metadata';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export interface LowCodeConfig extends StatusConfig, SearchConfig {
 }
-export interface LowCodeService<T, ID, R, S extends SearchModel> extends GenericService<T, ID, R> {
+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>>;
 }
-export class LowCodeController<T, ID, S extends SearchModel> extends GenericController<T, ID> {
+export class LowCodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: string, ctx?: any) => void, public lowCodeService: LowCodeService<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: any, ctx?: any) => void, public lowCodeService: Service<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, lowCodeService, config, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);

package/src/SearchController.ts

@@ -1,8 +1,8 @@
 import {Request, Response} from 'express';
 import {handleError} from './http';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 
-export class SearchController<T, S extends SearchModel> {
+export class SearchController<T, S extends Filter> {
   config?: SearchConfig;
   csv?: boolean;
   fields?: string;