express-ext 0.1.22 → 0.1.25

package/lib/GenericController.js

@@ -164,12 +164,12 @@ function getStatusCode(errs) {
 }
 exports.getStatusCode = getStatusCode;
 function useBuild(c, generate) {
-  var b = new Builder(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 : '');
+  var b = new Builder(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;
 }
 exports.useBuild = useBuild;
 var Builder = (function () {
-  function Builder(generate, id, payload, user, updatedBy, updatedAt, createdBy, createdAt) {
+  function Builder(generate, id, payload, user, updatedBy, updatedAt, createdBy, createdAt, version) {
     this.generate = generate;
     this.id = id;
     this.payload = payload;
@@ -178,6 +178,7 @@ var Builder = (function () {
     this.updatedAt = updatedAt;
     this.createdBy = createdBy;
     this.createdAt = createdAt;
+    this.version = version;
     this.build = this.build.bind(this);
   }
   Builder.prototype.build = function (res, obj, isCreate, isPatch) {
@@ -210,6 +211,9 @@ var Builder = (function () {
           o[this.createdBy] = usr;
         }
       }
+      if (this.version.length > 0) {
+        o[this.version] = 1;
+      }
     }
     else if (isPatch) {
       var keys = Object.keys(o);

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, dates, numbers) {
-    var _this = _super.call(this, log, service, config, validate) || this;
+  function GenericSearchController(log, find, service, config, validate, build, dates, numbers) {
+    var _this = _super.call(this, log, service, config, validate, build) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     _this.config = search_1.initializeConfig(config);

package/lib/LoadController.js

@@ -52,3 +52,39 @@ var LoadController = (function () {
   return LoadController;
 }());
 exports.LoadController = LoadController;
+var QueryController = (function () {
+  function QueryController(log, loadData, name, param, max, maxName) {
+    this.log = log;
+    this.loadData = loadData;
+    this.param = param;
+    this.name = (name && name.length > 0 ? name : 'keyword');
+    this.max = (max && max > 0 ? max : 20);
+    this.maxName = (maxName && maxName.length > 0 ? maxName : 'max');
+    this.load = this.load.bind(this);
+    this.query = this.query.bind(this);
+  }
+  QueryController.prototype.query = function (req, res) {
+    return this.load(req, res);
+  };
+  QueryController.prototype.load = function (req, res) {
+    var _this = this;
+    var v = this.param ? req.params[this.name] : req.query[this.name];
+    if (!v) {
+      res.status(400).end("'" + this.name + "' cannot be empty");
+    }
+    else {
+      var s = v.toString();
+      if (s.length === 0) {
+        res.status(400).end("'" + this.name + "' cannot be empty");
+      }
+      else {
+        var max = http_1.queryNumber(req, this.maxName, this.max);
+        this.loadData(s, max)
+          .then(function (result) { return http_1.respondModel(http_1.minimize(result), res); })
+          .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+      }
+    }
+  };
+  return QueryController;
+}());
+exports.QueryController = QueryController;

package/lib/LowCodeController.js

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

package/package.json

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

package/src/GenericController.ts

@@ -151,13 +151,14 @@ export interface ModelConfig {
   updatedAt?: string;
   createdBy?: string;
   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 : '');
+  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;
 }
 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) {
+  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 {
@@ -189,6 +190,9 @@ export class Builder<T> {
           o[this.createdBy] = usr;
         }
       }
+      if (this.version.length > 0) {
+        o[this.version] = 1;
+      }
     } else if (isPatch) {
       const keys = Object.keys(o);
       if (keys.length === 0) {

package/src/GenericSearchController.ts

@@ -1,6 +1,6 @@
 import {Request, Response} from 'express';
 import {ResultInfo, StatusConfig} from './edit';
-import {GenericController, GenericService} from './GenericController';
+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';
@@ -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[]>, dates?: string[], numbers?: string[]) {
-    super(log, service, config, validate);
+  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);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {

package/src/LoadController.ts

@@ -1,5 +1,5 @@
 import {Request, Response} from 'express';
-import {attrs, handleError, Log, minimize, respondModel} from './http';
+import {attrs, handleError, Log, minimize, queryNumber, respondModel} from './http';
 import {Attribute, Attributes} from './metadata';
 import {buildAndCheckId, buildKeys} from './view';
 
@@ -8,13 +8,13 @@ export interface ViewService<T, ID> {
   load(id: ID, ctx?: any): Promise<T|null>;
 }
 export type Load<T, ID> = ((id: ID, ctx?: any) => Promise<T|null>);
-function getViewFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>)): (id: ID, ctx?: any) => Promise<T|null> {
+function getViewFunc<T, ID>(viewService: ViewService<T, ID> | Load<T, ID>): (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[] | undefined {
+function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | Load<T, ID>, keys?: Attributes|Attribute[]|string[]): Attribute[] | undefined {
   if (keys) {
     if (Array.isArray(keys)) {
       if (keys.length > 0) {
@@ -54,3 +54,35 @@ export class LoadController<T, ID> {
     }
   }
 }
+// tslint:disable-next-line:max-classes-per-file
+export class QueryController<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);
+    this.maxName = (maxName && maxName.length > 0 ? maxName : 'max');
+    this.load = this.load.bind(this);
+    this.query = this.query.bind(this);
+  }
+  name: string;
+  max: number;
+  maxName: string;
+  query(req: Request, res: Response) {
+    return this.load(req, res);
+  }
+  load(req: Request, res: Response) {
+    const v = this.param ? req.params[this.name] : req.query[this.name];
+    if (!v) {
+      res.status(400).end(`'${this.name}' cannot be empty`);
+    } else {
+      const s = v.toString();
+      if (s.length === 0) {
+        res.status(400).end(`'${this.name}' cannot be empty`);
+      } else {
+        const max = queryNumber(req, this.maxName, this.max);
+        this.loadData(s, max)
+          .then(result => respondModel(minimize(result), res))
+          .catch(err => handleError(err, res, this.log));
+      }
+    }
+  }
+}

package/src/LowCodeController.ts

@@ -1,6 +1,6 @@
 import {Request, Response} from 'express';
 import {ResultInfo, StatusConfig} from './edit';
-import {GenericController, GenericService} from './GenericController';
+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';
@@ -19,8 +19,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[]>, dates?: string[], numbers?: string[]) {
-    super(log, lowCodeService, config, validate);
+  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);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {