express-ext 0.1.14 → 0.1.15

package/lib/HealthController.js

@@ -7,12 +7,12 @@ var HealthController = (function () {
     this.check = this.check.bind(this);
   }
   HealthController.prototype.check = function (req, res) {
-    health_1.check(this.checkers).then(function (heath) {
-      if (heath.status === 'UP') {
-        return res.status(200).json(heath).end();
+    health_1.health(this.checkers).then(function (r) {
+      if (r.status === 'UP') {
+        return res.status(200).json(r).end();
       }
       else {
-        return res.status(500).json(heath).end();
+        return res.status(500).json(r).end();
       }
     });
   };

package/lib/LogController.js

@@ -49,7 +49,13 @@ var LogController = (function () {
       }
     }
     if (obj.constants !== undefined && typeof obj.constants === 'object') {
-      this.logger.constants = obj.constants;
+      var ks = Object.keys(obj.constants);
+      if (ks.length > 0) {
+        this.logger.constants = obj.constants;
+      }
+      else {
+        this.logger.constants = undefined;
+      }
       changed = true;
     }
     if (obj.name) {
@@ -65,10 +71,10 @@ var LogController = (function () {
       }
     }
     if (changed) {
-      return res.status(200).end('true');
+      return res.status(200).json(true).end();
     }
     else {
-      return res.status(204).end('false');
+      return res.status(204).json(false).end();
     }
   };
   return LogController;

package/lib/health.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
   }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-function check(checkers) {
+function health(checkers) {
   return __awaiter(this, void 0, void 0, function () {
     var p, total, count, _i, checkers_1, checker, sub, r, err_1;
     return __generator(this, function (_a) {
@@ -90,4 +90,4 @@ function check(checkers) {
     });
   });
 }
-exports.check = check;
+exports.health = health;

package/lib/log.js

@@ -190,10 +190,10 @@ var MiddlewareController = (function () {
       changed = true;
     }
     if (changed) {
-      return res.status(200).end('true');
+      return res.status(200).json(true).end();
     }
     else {
-      return res.status(204).end('false');
+      return res.status(204).json(false).end();
     }
   };
   return MiddlewareController;

package/lib/resources.js

@@ -1,2 +1,37 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var resources=(function(){function resources(){}
-return resources}());exports.resources=resources
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var resources = (function () {
+  function resources() {
+  }
+  return resources;
+}());
+exports.resources = resources;
+var TypeChecker = (function () {
+  function TypeChecker(attributes, allowUndefined) {
+    this.attributes = attributes;
+    this.allowUndefined = allowUndefined;
+    this.check = this.check.bind(this);
+  }
+  TypeChecker.prototype.check = function (req, res, next) {
+    var obj = req.body;
+    if (!obj || obj === '') {
+      return res.status(400).end('The request body cannot be empty');
+    }
+    else {
+      var errors = resources.check(obj, this.attributes, this.allowUndefined);
+      if (errors.length > 0) {
+        res.status(400).json(errors).end();
+      }
+      else {
+        next();
+      }
+    }
+  };
+  return TypeChecker;
+}());
+exports.TypeChecker = TypeChecker;
+function check(attributes, allowUndefined) {
+  var x = new TypeChecker(attributes, allowUndefined);
+  return x.check;
+}
+exports.check = check;

package/package.json

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

package/src/HealthController.ts

@@ -1,16 +1,16 @@
 import {Request, Response} from 'express';
-import {check, HealthChecker} from './health';
+import {health, HealthChecker} from './health';
 
 export class HealthController {
   constructor(protected checkers: HealthChecker[]) {
     this.check = this.check.bind(this);
   }
   check(req: Request, res: Response) {
-    check(this.checkers).then(heath => {
-      if (heath.status === 'UP') {
-        return res.status(200).json(heath).end();
+    health(this.checkers).then(r => {
+      if (r.status === 'UP') {
+        return res.status(200).json(r).end();
       } else {
-        return res.status(500).json(heath).end();
+        return res.status(500).json(r).end();
       }
     });
   }

package/src/LogController.ts

@@ -99,7 +99,12 @@ export class LogController {
       }
     }
     if (obj.constants !== undefined && typeof obj.constants === 'object') {
-      this.logger.constants = obj.constants;
+      const ks = Object.keys(obj.constants);
+      if (ks.length > 0) {
+        this.logger.constants = obj.constants;
+      } else {
+        this.logger.constants = undefined;
+      }
       changed = true;
     }
     if (obj.name) {
@@ -115,9 +120,9 @@ export class LogController {
       }
     }
     if (changed) {
-      return res.status(200).end('true');
+      return res.status(200).json(true).end();
     } else {
-      return res.status(204).end('false');
+      return res.status(204).json(false).end();
     }
   }
 }

package/src/health.ts

@@ -16,7 +16,7 @@ export interface HealthChecker {
   check(): Promise<AnyMap>;
 }
 
-export async function check(checkers: HealthChecker[]): Promise<Health> {
+export async function health(checkers: HealthChecker[]): Promise<Health> {
   const p: Health = { status: 'UP' };
   const total = checkers.length - 1;
   let count = 0;

package/src/log.ts

@@ -200,9 +200,9 @@ export class MiddlewareController {
       changed = true;
     }
     if (changed) {
-      return res.status(200).end('true');
+      return res.status(200).json(true).end();
     } else {
-      return res.status(204).end('false');
+      return res.status(204).json(false).end();
     }
   }
 }

package/src/metadata.ts

@@ -1,9 +1,11 @@
-export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
+export type Type = 'ObjectId' | 'date' | 'datetime' | 'time'
     | 'boolean' | 'number' | 'integer' | 'string' | 'text'
     | 'object' | 'array' | 'binary'
     | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
-export type FormatType = 'currency' | 'percentage' | 'email' | 'url' | 'phone' | 'fax' | 'ipv4' | 'ipv6';
+export type Format = 'currency' | 'percentage' | 'email' | 'url' | 'phone' | 'fax' | 'ipv4' | 'ipv6';
 
+export type DataType = Type;
+export type FormatType = Format;
 export interface ErrorMessage {
   field: string;
   code: string;
@@ -17,8 +19,8 @@ export interface Model {
 
 export interface Attribute {
   name?: string;
-  type?: DataType;
-  format?: FormatType;
+  type?: Type;
+  format?: Format;
   required?: boolean;
   key?: boolean;
   length?: number;

package/src/resources.ts

@@ -1,10 +1,36 @@
-import {Attributes, ErrorMessage} from './metadata';
+import { NextFunction, Request, Response } from 'express';
+import { Attributes, ErrorMessage } from './metadata';
 
 // tslint:disable-next-line:class-name
 export class resources {
   static createValidator?: <T>(attributes: Attributes, allowUndefined?: boolean, max?: number) => Validator<T>;
+  static check: (obj: any, attributes: Attributes, allowUndefined?: boolean, patch?: boolean) => ErrorMessage[];
 }
 
 export interface Validator<T> {
   validate(obj: T, patch?: boolean): Promise<ErrorMessage[]>;
 }
+
+export class TypeChecker {
+  constructor(public attributes: Attributes, public allowUndefined?: boolean) {
+    this.check = this.check.bind(this);
+  }
+  check(req: Request, res: Response, next: NextFunction): void {
+    const obj = req.body;
+    if (!obj || (obj as any) === '') {
+      return res.status(400).end('The request body cannot be empty');
+    } else {
+      const errors = resources.check(obj, this.attributes, this.allowUndefined);
+      if (errors.length > 0) {
+        res.status(400).json(errors).end();
+      } else {
+        next();
+      }
+    }
+  }
+}
+export type Handler = (req: Request, res: Response, next: NextFunction) => void;
+export function check(attributes: Attributes, allowUndefined?: boolean): Handler {
+  const x = new TypeChecker(attributes, allowUndefined);
+  return x.check;
+}