express-ext 0.2.2 → 0.2.3

package/lib/GenericController.js

@@ -33,7 +33,6 @@ var GenericController = (function (_super) {
       }
     }
     _this.create = _this.create.bind(_this);
-    _this.insert = _this.insert.bind(_this);
     _this.update = _this.update.bind(_this);
     _this.patch = _this.patch.bind(_this);
     _this.delete = _this.delete.bind(_this);
@@ -44,10 +43,7 @@ var GenericController = (function (_super) {
     return _this;
   }
   GenericController.prototype.create = function (req, res) {
-    return this.insert(req, res);
-  };
-  GenericController.prototype.insert = function (req, res) {
-    validateAndCreate(req, res, this.service.insert, this.log, this.validate, this.build);
+    validateAndCreate(req, res, this.service.create, this.log, this.validate, this.build);
   };
   GenericController.prototype.update = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update);

package/lib/client.js

@@ -1,69 +1,90 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var http = require("http");
-var https = require("https");
-function getHealthSecure(url, timeout) {
-  return new Promise(function (resolve) {
-    https.get(url, { rejectUnauthorized: false }, function (res) {
-      var data = '';
-      res.on('data', function (d) {
-        data += d;
-      });
-      res.on('end', function () {
-        resolve({ statusCode: res.statusCode, data: data, statusMessage: res.statusMessage });
-      });
-    }).on('error', function (e) {
-      return { statusCode: 500, statusMessage: e };
-    });
-    setTimeout(function () { return resolve({ statusCode: 408, statusMessage: 'Time out' }); }, timeout);
-  });
-}
-function getHealth(url, timeout) {
-  return new Promise(function (resolve) {
-    http.get(url, function (res) {
-      var data = '';
-      res.on('data', function (d) {
-        data += d;
-      });
-      res.on('end', function () {
-        resolve({ statusCode: res.statusCode, data: data, statusMessage: res.statusMessage });
-      });
-    }).on('error', function (e) {
-      return { statusCode: 500, statusMessage: e };
-    });
-    setTimeout(function () { return resolve({ statusCode: 408, statusMessage: 'Time out' }); }, timeout);
-  });
-}
-var ClientChecker = (function () {
-  function ClientChecker(service, url, timeout) {
-    this.service = service;
-    this.url = url;
-    this.timeout = (timeout ? timeout : 4200);
-    this.check = this.check.bind(this);
-    this.name = this.name.bind(this);
-    this.build = this.build.bind(this);
+var http_1 = require("./http");
+function checkId(obj, id, keys) {
+  var n = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
+  var o = obj;
+  var i = id;
+  if (!keys || keys.length === 1) {
+    var v = o[n];
+    if (!v) {
+      o[n] = i;
+      return true;
+    }
+    if (v != i) {
+      return false;
+    }
+    return true;
+  }
+  var ks = Object.keys(i);
+  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
+    var k = ks_1[_i];
+    var v = o[k];
+    if (!v) {
+      o[k] = i[k];
+    }
+    else {
+      if (v != i[k]) {
+        return false;
+      }
+    }
+    o[k] = i[k];
   }
-  ClientChecker.prototype.check = function () {
-    var obj = {};
-    if (this.url.startsWith('https://')) {
-      return getHealthSecure(this.url, this.timeout).then(function (r) { return obj = r; });
+  return true;
+}
+exports.checkId = checkId;
+function create(res, obj, insert, log, returnNumber) {
+  insert(obj).then(function (result) {
+    if (typeof result === 'number') {
+      if (result >= 1) {
+        res.status(201).json(returnNumber ? result : obj).end();
+      }
+      else {
+        res.status(409).json(result).end();
+      }
+    }
+    else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
     }
     else {
-      return getHealth(this.url, this.timeout).then(function (r) { return obj = r; });
+      res.status(201).json(result).end();
     }
-  };
-  ClientChecker.prototype.name = function () {
-    return this.service;
-  };
-  ClientChecker.prototype.build = function (data, err) {
-    if (err) {
-      if (!data) {
-        data = {};
+  }).catch(function (err) { return http_1.handleError(err, res, log); });
+}
+exports.create = create;
+function update(res, obj, save, log, returnNumber) {
+  save(obj).then(function (result) {
+    if (typeof result === 'number') {
+      if (result >= 1) {
+        res.status(200).json(returnNumber ? result : obj).end();
+      }
+      else if (result === 0) {
+        res.status(404).json(result).end();
       }
-      data['error'] = err;
+      else {
+        res.status(409).json(result).end();
+      }
+    }
+    else if (Array.isArray(result)) {
+      res.status(422).json(result).end();
+    }
+    else {
+      res.status(200).json(result).end();
+    }
+  }).catch(function (err) { return http_1.handleError(err, res, log); });
+}
+exports.update = update;
+function isTypeError(errs) {
+  if (!errs) {
+    return false;
+  }
+  for (var _i = 0, errs_1 = errs; _i < errs_1.length; _i++) {
+    var err = errs_1[_i];
+    var c = err.code;
+    if (c === 'string' || c === 'number' || c === 'date' || c === 'boolean') {
+      return true;
     }
-    return data;
-  };
-  return ClientChecker;
-}());
-exports.ClientChecker = ClientChecker;
+  }
+  return false;
+}
+exports.isTypeError = isTypeError;

package/lib/edit.js

@@ -43,11 +43,8 @@ function create(res, obj, insert, log, returnNumber) {
         res.status(409).json(result).end();
       }
     }
-    else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    }
     else {
-      res.status(201).json(result).end();
+      res.status(422).json(result).end();
     }
   }).catch(function (err) { return http_1.handleError(err, res, log); });
 }
@@ -65,11 +62,8 @@ function update(res, obj, save, log, returnNumber) {
         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(422).json(result).end();
     }
   }).catch(function (err) { return http_1.handleError(err, res, log); });
 }

package/package.json

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

package/src/GenericController.ts

@@ -12,7 +12,7 @@ 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>;
-  insert(obj: T, ctx?: any): Promise<R>;
+  create(obj: T, ctx?: any): Promise<R>;
   update(obj: T, ctx?: any): Promise<R>;
   patch?(obj: Partial<T>, ctx?: any): Promise<R>;
   delete?(id: ID, ctx?: any): Promise<number>;
@@ -30,7 +30,6 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
       }
     }
     this.create = this.create.bind(this);
-    this.insert = this.insert.bind(this);
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
     this.delete = this.delete.bind(this);
@@ -40,10 +39,7 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     }
   }
   create(req: Request, res: Response): void {
-    return this.insert(req, res);
-  }
-  insert(req: Request, res: Response): void {
-    validateAndCreate(req, res, this.service.insert, this.log, this.validate, this.build);
+    validateAndCreate(req, res, this.service.create, 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);