express-ext 0.2.0 → 0.2.2

package/lib/GenericController.js

@@ -20,12 +20,12 @@ var resources_1 = require("./resources");
 var view_1 = require("./view");
 var GenericController = (function (_super) {
   __extends(GenericController, _super);
-  function GenericController(log, service, status, build, validate) {
+  function GenericController(log, service, build, validate, returnNumber) {
     var _this = _super.call(this, log, service) || this;
     _this.service = service;
     _this.build = build;
     _this.validate = validate;
-    _this.status = edit_1.initializeStatus(status);
+    _this.returnNumber = returnNumber;
     if (service.metadata) {
       var m = service.metadata();
       if (m) {
@@ -47,18 +47,18 @@ var GenericController = (function (_super) {
     return this.insert(req, res);
   };
   GenericController.prototype.insert = function (req, res) {
-    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate, this.build);
+    validateAndCreate(req, res, this.service.insert, this.log, this.validate, this.build);
   };
   GenericController.prototype.update = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update);
     if (id) {
-      validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate, this.build);
+      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, this.build);
     }
   };
   GenericController.prototype.patch = function (req, res) {
     var id = buildAndCheckIdWithBody(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, this.build);
+      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, this.build);
     }
   };
   GenericController.prototype.delete = function (req, res) {
@@ -78,7 +78,7 @@ var GenericController = (function (_super) {
   return GenericController;
 }(LoadController_1.LoadController));
 exports.GenericController = GenericController;
-function validateAndCreate(req, res, status, save, log, validate, build) {
+function validateAndCreate(req, res, save, log, validate, build, returnNumber) {
   var obj = req.body;
   if (!obj || obj === '') {
     res.status(400).end('The request body cannot be empty.');
@@ -87,40 +87,38 @@ function validateAndCreate(req, res, status, save, log, validate, build) {
     if (validate) {
       validate(obj).then(function (errors) {
         if (errors && errors.length > 0) {
-          var r = { status: status.validation_error, errors: errors };
-          res.status(getStatusCode(errors)).json(r).end();
+          res.status(getStatusCode(errors)).json(errors).end();
         }
         else {
           if (build) {
             build(res, obj, true);
           }
-          edit_1.create(res, status, obj, save, log);
+          edit_1.create(res, obj, save, log, returnNumber);
         }
       }).catch(function (err) { return http_1.handleError(err, res, log); });
     }
     else {
-      edit_1.create(res, status, obj, save, log);
+      edit_1.create(res, obj, save, log, returnNumber);
     }
   }
 }
 exports.validateAndCreate = validateAndCreate;
-function validateAndUpdate(res, status, obj, isPatch, save, log, validate, build) {
+function validateAndUpdate(res, obj, isPatch, save, log, validate, build, returnNumber) {
   if (validate) {
     validate(obj, isPatch).then(function (errors) {
       if (errors && errors.length > 0) {
-        var r = { status: status.validation_error, errors: errors };
-        res.status(getStatusCode(errors)).json(r).end();
+        res.status(getStatusCode(errors)).json(errors).end();
       }
       else {
         if (build) {
           build(res, obj, false, isPatch);
         }
-        edit_1.update(res, status, obj, save, log);
+        edit_1.update(res, obj, save, log, returnNumber);
       }
     }).catch(function (err) { return http_1.handleError(err, res, log); });
   }
   else {
-    edit_1.update(res, status, obj, save, log);
+    edit_1.update(res, obj, save, log, returnNumber);
   }
 }
 exports.validateAndUpdate = validateAndUpdate;

package/lib/GenericSearchController.js

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

package/lib/LowCodeController.js

@@ -20,7 +20,7 @@ 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;
+    var _this = _super.call(this, log, lowCodeService, build, validate) || this;
     _this.lowCodeService = lowCodeService;
     _this.search = _this.search.bind(_this);
     _this.config = search_1.initializeConfig(config);
@@ -55,7 +55,7 @@ exports.LowcodeHandler = LowcodeController;
 var Controller = (function (_super) {
   __extends(Controller, _super);
   function Controller(log, lowCodeService, build, validate, config, dates, numbers) {
-    var _this = _super.call(this, log, lowCodeService, config, build, validate) || this;
+    var _this = _super.call(this, log, lowCodeService, build, validate) || this;
     _this.lowCodeService = lowCodeService;
     _this.search = _this.search.bind(_this);
     _this.config = search_1.initializeConfig(config);

package/lib/edit.js

@@ -1,21 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var http_1 = require("./http");
-function initializeStatus(s) {
-  if (s) {
-    return s;
-  }
-  var s1 = {
-    duplicate_key: 0,
-    not_found: 0,
-    success: 1,
-    version_error: 2,
-    validation_error: 4,
-    error: 4
-  };
-  return s1;
-}
-exports.initializeStatus = initializeStatus;
 function checkId(obj, id, keys) {
   var n = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
   var o = obj;
@@ -48,43 +33,41 @@ function checkId(obj, id, keys) {
   return true;
 }
 exports.checkId = checkId;
-function create(res, status, obj, insert, log) {
+function create(res, obj, insert, log, returnNumber) {
   insert(obj).then(function (result) {
     if (typeof result === 'number') {
       if (result >= 1) {
-        var r = { status: status.success, value: obj };
-        res.status(201).json(r).end();
-      }
-      else if (result === 0) {
-        var r = { status: status.duplicate_key };
-        res.status(201).json(r).end();
+        res.status(201).json(returnNumber ? result : obj).end();
       }
       else {
-        res.status(500).end('Internal Server Error');
+        res.status(409).json(result).end();
       }
     }
+    else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
+    }
     else {
-      res.status(200).json(result).end();
+      res.status(201).json(result).end();
     }
   }).catch(function (err) { return http_1.handleError(err, res, log); });
 }
 exports.create = create;
-function update(res, status, obj, save, log) {
+function update(res, obj, save, log, returnNumber) {
   save(obj).then(function (result) {
     if (typeof result === 'number') {
       if (result >= 1) {
-        var r = { status: status.success, value: obj };
-        res.status(201).json(r).end();
+        res.status(200).json(returnNumber ? result : obj).end();
       }
       else if (result === 0) {
-        var r = { status: status.not_found };
-        res.status(404).json(r).end();
+        res.status(404).json(result).end();
       }
       else {
-        var r = { status: status.not_found };
-        res.status(409).json(r).end();
+        res.status(409).json(result).end();
       }
     }
+    else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
+    }
     else {
       res.status(200).json(result).end();
     }

package/package.json

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

package/src/GenericController.ts

@@ -1,5 +1,5 @@
 import {Request, Response} from 'express';
-import {checkId, create, initializeStatus, isTypeError, ResultInfo, StatusConfig, update} from './edit';
+import {checkId, create, isTypeError, update} from './edit';
 import {handleError, Log} from './http';
 import {LoadController} from './LoadController';
 import {Attribute, Attributes, ErrorMessage} from './metadata';
@@ -8,7 +8,7 @@ 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|ResultInfo<T>>;
+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>;
@@ -18,11 +18,11 @@ export interface GenericService<T, ID, R> {
   delete?(id: ID, ctx?: any): Promise<number>;
 }
 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 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.status = initializeStatus(status);
+    this.returnNumber = returnNumber;
     if (service.metadata) {
       const m = service.metadata();
       if (m) {
@@ -43,18 +43,18 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     return this.insert(req, res);
   }
   insert(req: Request, res: Response): void {
-    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate, this.build);
+    validateAndCreate(req, res, this.service.insert, this.log, this.validate, this.build);
   }
   update(req: Request, res: Response): void {
     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, this.build);
+      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, 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, this.status, req.body, true, this.service.patch, this.log, this.validate, this.build);
+      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, this.build);
     }
   }
   delete(req: Request, res: Response): void {
@@ -70,7 +70,7 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     }
   }
 }
-export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>): 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.');
@@ -78,35 +78,33 @@ export function validateAndCreate<T>(req: Request, res: Response, status: Status
     if (validate) {
       validate(obj).then(errors => {
         if (errors && errors.length > 0) {
-          const r: ResultInfo<T> = {status: status.validation_error, errors};
-          res.status(getStatusCode(errors)).json(r).end();
+          res.status(getStatusCode(errors)).json(errors).end();
         } else {
           if (build) {
             build(res, obj, true);
           }
-          create(res, status, obj, save, log);
+          create(res, obj, save, log, returnNumber);
         }
       }).catch(err => handleError(err, res, log));
     } else {
-      create(res, status, obj, save, log);
+      create(res, obj, save, log, returnNumber);
     }
   }
 }
-export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>):  void {
+export function validateAndUpdate<T>(res: Response, obj: T, isPatch: boolean, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>, returnNumber?: boolean):  void {
   if (validate) {
     validate(obj, isPatch).then(errors => {
       if (errors && errors.length > 0) {
-        const r: ResultInfo<T> = {status: status.validation_error, errors};
-        res.status(getStatusCode(errors)).json(r).end();
+        res.status(getStatusCode(errors)).json(errors).end();
       } else {
         if (build) {
           build(res, obj, false, isPatch);
         }
-        update(res, status, obj, save, log);
+        update(res, obj, save, log, returnNumber);
       }
     }).catch(err => handleError(err, res, log));
   } else {
-    update(res, status, obj, save, log);
+    update(res, obj, save, log, returnNumber);
   }
 }
 export function buildAndCheckIdWithBody<T, ID, R>(req: Request, res: Response, keys?: Attribute[], patch?: (obj: T, ctx?: any) => Promise<R>): ID | undefined {

package/src/GenericSearchController.ts

@@ -1,13 +1,10 @@
 import {Request, Response} from 'express';
-import {ResultInfo, StatusConfig} from './edit';
 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';
 
-export interface Config extends StatusConfig, SearchConfig {
-}
 export class GenericSearchController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
@@ -16,8 +13,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, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
-    super(log, service, config, build, validate);
+  constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ErrorMessage[]>, config?: SearchConfig, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+    super(log, service, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {

package/src/LowCodeController.ts

@@ -1,13 +1,10 @@
 import {Request, Response} from 'express';
-import {ResultInfo, StatusConfig} from './edit';
 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';
 
-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>>;
 }
@@ -19,8 +16,8 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
   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);
+  constructor(log: Log, public lowCodeService: Service<T, ID, number|ErrorMessage[], S>, config?: SearchConfig, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+    super(log, lowCodeService, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {
@@ -55,8 +52,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>, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, config?: LowCodeConfig, dates?: string[], numbers?: string[]) {
-    super(log, lowCodeService, config, build, validate);
+  constructor(log: Log, public lowCodeService: Service<T, ID, number|T|ErrorMessage[], S>, build?: Build<T>, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, config?: SearchConfig, dates?: string[], numbers?: string[]) {
+    super(log, lowCodeService, build, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);
     if (this.config) {

package/src/edit.ts

@@ -1,7 +1,7 @@
 import {Response} from 'express';
 import {handleError} from './http';
 import {Attribute, ErrorMessage} from './metadata';
-
+/*
 export interface StatusConfig {
   duplicate_key: number|string;
   not_found: number|string;
@@ -30,6 +30,7 @@ export function initializeStatus(s?: StatusConfig): StatusConfig {
   };
   return s1;
 }
+*/
 export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
   const n: string = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
   const o: any = obj;
@@ -61,36 +62,33 @@ export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
   }
   return true;
 }
-export function create<T>(res: Response, status: StatusConfig, obj: T, insert: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string, ctx?: any) => void): void {
+export function create<T>(res: Response, obj: T, insert: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
   insert(obj).then(result => {
     if (typeof result === 'number') {
       if (result >= 1) {
-        const r: ResultInfo<T> = {status: status.success, value: obj};
-        res.status(201).json(r).end();
-      } else if (result === 0) {
-        const r: ResultInfo<T> = {status: status.duplicate_key};
-        res.status(201).json(r).end();
+        res.status(201).json(returnNumber ? result : obj).end();
       } else {
-        res.status(500).end('Internal Server Error');
+        res.status(409).json(result).end();
       }
+    } else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
     } else {
-      res.status(200).json(result).end();
+      res.status(201).json(result).end();
     }
   }).catch(err => handleError(err, res, log));
 }
-export function update<T>(res: Response, status: StatusConfig, obj: T, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string, ctx?: any) => void): void {
+export function update<T>(res: Response, obj: T, save: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
   save(obj).then(result => {
     if (typeof result === 'number') {
       if (result >= 1) {
-        const r: ResultInfo<T> = {status: status.success, value: obj};
-        res.status(201).json(r).end();
+        res.status(200).json(returnNumber ? result : obj).end();
       } else if (result === 0) {
-        const r: ResultInfo<T> = {status: status.not_found};
-        res.status(404).json(r).end();
+        res.status(404).json(result).end();
       } else {
-        const r: ResultInfo<T> = {status: status.not_found};
-        res.status(409).json(r).end();
+        res.status(409).json(result).end();
       }
+    } else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
     } else {
       res.status(200).json(result).end();
     }