express-ext 0.1.25 → 0.1.28

package/lib/GenericController.js

@@ -20,11 +20,11 @@ var resources_1 = require("./resources");
 var view_1 = require("./view");
 var GenericController = (function (_super) {
   __extends(GenericController, _super);
-  function GenericController(log, service, status, validate, build) {
+  function GenericController(log, service, status, build, validate) {
     var _this = _super.call(this, log, service) || this;
     _this.service = service;
-    _this.validate = validate;
     _this.build = build;
+    _this.validate = validate;
     _this.status = edit_1.initializeStatus(status);
     if (service.metadata) {
       var m = service.metadata();

package/lib/GenericSearchController.js

@@ -19,8 +19,8 @@ var search_1 = require("./search");
 var search_func_1 = require("./search_func");
 var GenericSearchController = (function (_super) {
   __extends(GenericSearchController, _super);
-  function GenericSearchController(log, find, service, config, validate, build, dates, numbers) {
-    var _this = _super.call(this, log, service, config, validate, build) || this;
+  function GenericSearchController(log, find, service, config, build, validate, dates, numbers) {
+    var _this = _super.call(this, log, service, config, build, validate) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     _this.config = search_1.initializeConfig(config);

package/lib/LoadSearchController.js

@@ -67,3 +67,44 @@ var LoadSearchController = (function (_super) {
   return LoadSearchController;
 }(LoadController_1.LoadController));
 exports.LoadSearchController = LoadSearchController;
+var ViewController = (function (_super) {
+  __extends(ViewController, _super);
+  function ViewController(log, query, config, dates, numbers) {
+    var _this = _super.call(this, log, query) || this;
+    _this.query = query;
+    _this.search = _this.search.bind(_this);
+    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;
+  }
+  ViewController.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 ViewController;
+}(LoadController_1.LoadController));
+exports.ViewController = ViewController;

package/lib/LowCodeController.js

@@ -17,10 +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;
 var Controller = (function (_super) {
   __extends(Controller, _super);
-  function Controller(log, lowCodeService, config, validate, build, dates, numbers) {
-    var _this = _super.call(this, log, lowCodeService, config, validate, build) || this;
+  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);
     _this.config = search_1.initializeConfig(config);

package/lib/index.js

@@ -12,7 +12,6 @@ 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");

package/package.json

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

package/src/GenericController.ts

@@ -20,7 +20,7 @@ export interface GenericService<T, ID, R> {
 export class GenericController<T, ID> extends LoadController<T, ID> {
   status: StatusConfig;
   metadata?: Attributes;
-  constructor(log: Log, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: Validate<T>, public build?: Build<T>) {
+  constructor(log: Log, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public build?: Build<T>, public validate?: Validate<T>) {
     super(log, service);
     this.status = initializeStatus(status);
     if (service.metadata) {
@@ -157,12 +157,13 @@ 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) {
     this.build = this.build.bind(this);
   }
   build(res: Response, obj: T, isCreate?: boolean, isPatch?: boolean): void {
-    let o: any = obj;
+    const o: any = obj;
     let usr = '';
     if (this.user.length > 0) {
       if (this.payload.length > 0) {

package/src/GenericSearchController.ts

@@ -16,8 +16,8 @@ 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|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, build?: Build<T>, dates?: string[], numbers?: string[]) {
-    super(log, service, config, validate, build);
+  constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+    super(log, service, config, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {

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,44 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
       .catch(err => handleError(err, res, this.log));
   }
 }
+export class ViewController<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[]) {
+    super(log, query);
+    this.search = this.search.bind(this);
+    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));
+  }
+}

package/src/LowCodeController.ts

@@ -11,6 +11,41 @@ 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 LowcodeController<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>, config?: LowCodeConfig, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, 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));
+  }
+}
 export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
@@ -19,8 +54,8 @@ 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|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, build?: Build<T>, dates?: string[], numbers?: string[]) {
-    super(log, lowCodeService, config, validate, build);
+  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) {

package/src/index.ts

@@ -13,7 +13,7 @@ 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};