express-ext 0.1.26 → 0.1.29

package/lib/LoadController.js

@@ -52,8 +52,8 @@ var LoadController = (function () {
   return LoadController;
 }());
 exports.LoadController = LoadController;
-var QueryController = (function () {
-  function QueryController(log, loadData, name, param, max, maxName) {
+var ItemController = (function () {
+  function ItemController(log, loadData, name, param, max, maxName) {
     this.log = log;
     this.loadData = loadData;
     this.param = param;
@@ -63,10 +63,10 @@ var QueryController = (function () {
     this.load = this.load.bind(this);
     this.query = this.query.bind(this);
   }
-  QueryController.prototype.query = function (req, res) {
+  ItemController.prototype.query = function (req, res) {
     return this.load(req, res);
   };
-  QueryController.prototype.load = function (req, res) {
+  ItemController.prototype.load = function (req, res) {
     var _this = this;
     var v = this.param ? req.params[this.name] : req.query[this.name];
     if (!v) {
@@ -85,6 +85,7 @@ var QueryController = (function () {
       }
     }
   };
-  return QueryController;
+  return ItemController;
 }());
-exports.QueryController = QueryController;
+exports.ItemController = ItemController;
+exports.ItemHandler = ItemController;

package/lib/LoadSearchController.js

@@ -67,3 +67,46 @@ var LoadSearchController = (function (_super) {
   return LoadSearchController;
 }(LoadController_1.LoadController));
 exports.LoadSearchController = LoadSearchController;
+var QueryController = (function (_super) {
+  __extends(QueryController, _super);
+  function QueryController(log, query, config, dates, numbers, array) {
+    var _this = _super.call(this, log, query) || this;
+    _this.query = query;
+    _this.search = _this.search.bind(_this);
+    _this.array = array;
+    if (config) {
+      if (typeof config === 'boolean') {
+        _this.csv = config;
+      }
+      else {
+        _this.config = search_1.initializeConfig(config);
+        if (_this.config) {
+          _this.csv = _this.config.csv;
+          _this.fields = _this.config.fields;
+          _this.excluding = _this.config.excluding;
+        }
+      }
+    }
+    if (!_this.fields || _this.fields.length === 0) {
+      _this.fields = 'fields';
+    }
+    var m = search_func_1.getMetadataFunc(query, dates, numbers);
+    if (m) {
+      _this.dates = m.dates;
+      _this.numbers = m.numbers;
+    }
+    return _this;
+  }
+  QueryController.prototype.search = function (req, res) {
+    var _this = this;
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
+    var l = search_1.getParameters(s, this.config);
+    var s2 = search_1.format(s, this.dates, this.numbers);
+    this.query.search(s2, l.limit, l.skipOrRefId, l.fields)
+      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
+      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+  };
+  return QueryController;
+}(LoadController_1.LoadController));
+exports.QueryController = QueryController;
+exports.QueryHandler = QueryController;

package/lib/LowCodeController.js

@@ -17,9 +17,44 @@ var GenericController_1 = require("./GenericController");
 var http_1 = require("./http");
 var search_1 = require("./search");
 var search_func_1 = require("./search_func");
+var LowcodeController = (function (_super) {
+  __extends(LowcodeController, _super);
+  function LowcodeController(log, lowCodeService, config, build, validate, dates, numbers) {
+    var _this = _super.call(this, log, lowCodeService, config, build, validate) || this;
+    _this.lowCodeService = lowCodeService;
+    _this.search = _this.search.bind(_this);
+    _this.config = search_1.initializeConfig(config);
+    if (_this.config) {
+      _this.csv = _this.config.csv;
+      _this.fields = _this.config.fields;
+      _this.excluding = _this.config.excluding;
+    }
+    if (!_this.fields || _this.fields.length === 0) {
+      _this.fields = 'fields';
+    }
+    var m = search_func_1.getMetadataFunc(lowCodeService, dates, numbers);
+    if (m) {
+      _this.dates = m.dates;
+      _this.numbers = m.numbers;
+    }
+    return _this;
+  }
+  LowcodeController.prototype.search = function (req, res) {
+    var _this = this;
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
+    var l = search_1.getParameters(s, this.config);
+    var s2 = search_1.format(s, this.dates, this.numbers);
+    this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)
+      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
+      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+  };
+  return LowcodeController;
+}(GenericController_1.GenericController));
+exports.LowcodeController = LowcodeController;
+exports.LowcodeHandler = LowcodeController;
 var Controller = (function (_super) {
   __extends(Controller, _super);
-  function Controller(log, lowCodeService, config, build, validate, dates, numbers) {
+  function Controller(log, lowCodeService, build, validate, config, dates, numbers) {
     var _this = _super.call(this, log, lowCodeService, config, build, validate) || this;
     _this.lowCodeService = lowCodeService;
     _this.search = _this.search.bind(_this);

package/lib/index.js

@@ -12,14 +12,12 @@ exports.HealthHandler = HealthController_1.HealthController;
 var LoadController_1 = require("./LoadController");
 exports.LoadHandler = LoadController_1.LoadController;
 exports.ViewHandler = LoadController_1.LoadController;
-exports.ViewController = LoadController_1.LoadController;
 var LoadSearchController_1 = require("./LoadSearchController");
 exports.LoadSearchHandler = LoadSearchController_1.LoadSearchController;
 var LogController_1 = require("./LogController");
 exports.LogHandler = LogController_1.LogController;
 var LowCodeController_1 = require("./LowCodeController");
-exports.LowCodeHandler = LowCodeController_1.Controller;
-exports.LowCodeController = LowCodeController_1.Controller;
+exports.Handler = LowCodeController_1.Controller;
 var SearchController_1 = require("./SearchController");
 exports.SearchHandler = SearchController_1.SearchController;
 __export(require("./health"));
@@ -72,3 +70,30 @@ function allow(access) {
   };
 }
 exports.allow = allow;
+var SavedController = (function () {
+  function SavedController(log, service, item, id) {
+    this.log = log;
+    this.service = service;
+    this.item = item;
+    this.id = (id && id.length > 0 ? id : 'id');
+    this.save = this.save.bind(this);
+    this.load = this.load.bind(this);
+  }
+  SavedController.prototype.save = function (req, res) {
+    var id = req.params[this.id];
+    var itemId = req.params[this.item];
+    this.service.save(id, itemId).then(function (data) {
+      res.status(200).json(data).end();
+    })
+      .catch(function (err) { return console.log(err); });
+  };
+  SavedController.prototype.load = function (req, res) {
+    var id = req.params[this.id];
+    this.service.load(id).then(function (data) {
+      res.status(200).json(data).send();
+    })
+      .catch(function (err) { return console.log(err); });
+  };
+  return SavedController;
+}());
+exports.SavedController = SavedController;

package/package.json

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

package/src/LoadController.ts

@@ -55,7 +55,7 @@ export class LoadController<T, ID> {
   }
 }
 // tslint:disable-next-line:max-classes-per-file
-export class QueryController<T> {
+export class ItemController<T> {
   constructor(protected log: Log, private loadData: (keyword: string, max?: number) => Promise<T>, name?: string, protected param?: boolean, max?: number, maxName?: string) {
     this.name = (name && name.length > 0 ? name : 'keyword');
     this.max = (max && max > 0 ? max : 20);
@@ -86,3 +86,4 @@ export class QueryController<T> {
     }
   }
 }
+export {ItemController as ItemHandler};

package/src/LoadSearchController.ts

@@ -9,6 +9,11 @@ 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>;
+}
 export interface SearchManager {
   search(req: Request, res: Response): void;
   load(req: Request, res: Response): void;
@@ -62,3 +67,46 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
       .catch(err => handleError(err, res, this.log));
   }
 }
+export class QueryController<T, ID, S extends Filter> extends LoadController<T, ID> {
+  config?: SearchConfig;
+  csv?: boolean;
+  dates?: string[];
+  numbers?: string[];
+  fields?: string;
+  excluding?: 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;
+    if (config) {
+      if (typeof config === 'boolean') {
+        this.csv = config;
+      } else {
+        this.config = initializeConfig(config);
+        if (this.config) {
+          this.csv = this.config.csv;
+          this.fields = this.config.fields;
+          this.excluding = this.config.excluding;
+        }
+      }
+    }
+    if (!this.fields || this.fields.length === 0) {
+      this.fields = 'fields';
+    }
+    const m = getMetadataFunc(query, dates, numbers);
+    if (m) {
+      this.dates = m.dates;
+      this.numbers = m.numbers;
+    }
+  }
+  search(req: Request, res: Response): void {
+    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));
+  }
+}
+export {QueryController as QueryHandler};

package/src/LowCodeController.ts

@@ -11,7 +11,7 @@ export interface LowCodeConfig extends StatusConfig, SearchConfig {
 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 Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
+export class LowcodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];
@@ -46,3 +46,39 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
       .catch(err => handleError(err, res, this.log));
   }
 }
+export {LowcodeController as LowcodeHandler};
+export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
+  config?: SearchConfig;
+  csv?: boolean;
+  dates?: string[];
+  numbers?: string[];
+  fields?: string;
+  excluding?: string;
+  array?: string[];
+  constructor(log: Log, public lowCodeService: Service<T, ID, number|ResultInfo<T>, S>, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, config?: LowCodeConfig, dates?: string[], numbers?: string[]) {
+    super(log, lowCodeService, config, build, validate);
+    this.search = this.search.bind(this);
+    this.config = initializeConfig(config);
+    if (this.config) {
+      this.csv = this.config.csv;
+      this.fields = this.config.fields;
+      this.excluding = this.config.excluding;
+    }
+    if (!this.fields || this.fields.length === 0) {
+      this.fields = 'fields';
+    }
+    const m = getMetadataFunc(lowCodeService, dates, numbers);
+    if (m) {
+      this.dates = m.dates;
+      this.numbers = m.numbers;
+    }
+  }
+  search(req: Request, res: Response) {
+    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));
+  }
+}

package/src/index.ts

@@ -13,15 +13,13 @@ export {HealthController as HealthHandler};
 export {LogController as LogHandler};
 export {LoadController as LoadHandler};
 export {LoadController as ViewHandler};
-export {LoadController as ViewController};
+// export {LoadController as ViewController};
 
 export {GenericController as GenericHandler};
 export {SearchController as SearchHandler};
 export {LoadSearchController as LoadSearchHandler};
 export {GenericSearchController as GenericSearchHandler};
-export {Controller as LowCodeHandler};
-// export {Controller as Handler};
-export {Controller as LowCodeController};
+export {Controller as Handler};
 export {Service as LowCodeService};
 
 export * from './health';
@@ -81,3 +79,30 @@ export function allow(access: AccessConfig): (req: Request, res: Response, next:
     next();
   };
 }
+export interface SavedService<T> {
+  load(id: string): Promise<T[]>;
+  save(id: string, itemId: string): Promise<number>;
+}
+export class SavedController<T> {
+  constructor(public log: (msg: string) => void, public service: SavedService<T>, public item: string, id?: string) {
+    this.id = (id && id.length > 0 ? id : 'id');
+    this.save = this.save.bind(this);
+    this.load = this.load.bind(this);
+  }
+  id: string;
+  save(req: Request, res: Response) {
+    const id = req.params[this.id];
+    const itemId = req.params[this.item];
+    this.service.save(id, itemId).then(data => {
+      res.status(200).json(data).end();
+    })
+    .catch(err => console.log(err));
+  }
+  load(req: Request, res: Response) {
+    const id = req.params[this.id];
+    this.service.load(id).then(data => {
+      res.status(200).json(data).send();
+    })
+    .catch(err => console.log(err));
+  }
+}