express-ext 0.4.2 → 0.4.3

package/lib/GenericController.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict"
 var __extends =
   (this && this.__extends) ||
   (function () {
@@ -7,246 +7,242 @@ var __extends =
         Object.setPrototypeOf ||
         ({ __proto__: [] } instanceof Array &&
           function (d, b) {
-            d.__proto__ = b;
+            d.__proto__ = b
           }) ||
         function (d, b) {
-          for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-        };
-      return extendStatics(d, b);
-    };
+          for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]
+        }
+      return extendStatics(d, b)
+    }
     return function (d, b) {
-      extendStatics(d, b);
+      extendStatics(d, b)
       function __() {
-        this.constructor = d;
+        this.constructor = d
       }
-      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
-    };
-  })();
-Object.defineProperty(exports, '__esModule', { value: true });
-var edit_1 = require('./edit');
-var http_1 = require('./http');
-var LoadController_1 = require('./LoadController');
-var resources_1 = require('./resources');
-var view_1 = require('./view');
+      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __())
+    }
+  })()
+Object.defineProperty(exports, "__esModule", { value: true })
+var edit_1 = require("./edit")
+var http_1 = require("./http")
+var LoadController_1 = require("./LoadController")
+var resources_1 = require("./resources")
+var view_1 = require("./view")
 var GenericController = (function (_super) {
-  __extends(GenericController, _super);
+  __extends(GenericController, _super)
   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.returnNumber = returnNumber;
+    var _this = _super.call(this, log, service) || this
+    _this.service = service
+    _this.build = build
+    _this.validate = validate
+    _this.returnNumber = returnNumber
     if (service.metadata) {
-      var m = service.metadata();
+      var m = service.metadata()
       if (m) {
-        _this.metadata = m;
+        _this.metadata = m
       }
     }
-    _this.create = _this.create.bind(_this);
-    _this.update = _this.update.bind(_this);
-    _this.patch = _this.patch.bind(_this);
-    _this.delete = _this.delete.bind(_this);
+    _this.create = _this.create.bind(_this)
+    _this.update = _this.update.bind(_this)
+    _this.patch = _this.patch.bind(_this)
+    _this.delete = _this.delete.bind(_this)
     if (!validate && resources_1.resources.createValidator && _this.metadata) {
-      var v = resources_1.resources.createValidator(_this.metadata);
-      _this.validate = v.validate;
+      var v = resources_1.resources.createValidator(_this.metadata)
+      _this.validate = v.validate
     }
-    return _this;
+    return _this
   }
   GenericController.prototype.create = function (req, res) {
-    validateAndCreate(req, res, this.service.create, 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);
+    var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update)
     if (id) {
-      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, undefined, this.build);
+      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, undefined, this.build)
     }
-  };
+  }
   GenericController.prototype.patch = function (req, res) {
-    var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.patch);
+    var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.patch)
     if (id && this.service.patch) {
-      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build);
+      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build)
     }
-  };
+  }
   GenericController.prototype.delete = function (req, res) {
-    var _this = this;
-    var id = view_1.buildAndCheckId(req, res, this.keys);
+    var _this = this
+    var id = view_1.buildAndCheckId(req, res, this.keys)
     if (id) {
       if (!this.service.delete) {
-        res.status(405).end('Method Not Allowed');
+        res.status(405).end("Method Not Allowed")
       } else {
         this.service
           .delete(id)
           .then(function (count) {
-            res.status(getDeleteStatus(count)).json(count).end();
+            res.status(getDeleteStatus(count)).json(count).end()
           })
           .catch(function (err) {
-            return http_1.handleError(err, res, _this.log);
-          });
+            return http_1.handleError(err, res, _this.log)
+          })
       }
     }
-  };
-  return GenericController;
-})(LoadController_1.LoadController);
-exports.GenericController = GenericController;
+  }
+  return GenericController
+})(LoadController_1.LoadController)
+exports.GenericController = GenericController
 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.');
+  var obj = req.body
+  if (!obj || obj === "") {
+    res.status(400).end("The request body cannot be empty.")
   } else {
     if (validate) {
       validate(obj)
         .then(function (errors) {
           if (errors && errors.length > 0) {
-            res.status(getStatusCode(errors)).json(errors).end();
+            res.status(edit_1.getStatusCode(errors)).json(errors).end()
           } else {
             if (build) {
-              build(res, obj, true);
+              build(res, obj, true)
             }
-            edit_1.create(res, obj, save, log, returnNumber);
+            edit_1.create(res, obj, save, log, returnNumber)
           }
         })
         .catch(function (err) {
-          return http_1.handleError(err, res, log);
-        });
+          return http_1.handleError(err, res, log)
+        })
     } else {
-      edit_1.create(res, obj, save, log, returnNumber);
+      edit_1.create(res, obj, save, log, returnNumber)
     }
   }
 }
-exports.validateAndCreate = validateAndCreate;
+exports.validateAndCreate = validateAndCreate
 function validateAndUpdate(res, obj, isPatch, save, log, validate, resource, build, returnNumber) {
   if (validate) {
     validate(obj, resource, isPatch)
       .then(function (errors) {
         if (errors && errors.length > 0) {
-          res.status(getStatusCode(errors)).json(errors).end();
+          res.status(edit_1.getStatusCode(errors)).json(errors).end()
         } else {
           if (build) {
-            build(res, obj, false, isPatch);
+            build(res, obj, false, isPatch)
           }
-          edit_1.update(res, obj, save, log, returnNumber);
+          edit_1.update(res, obj, save, log, returnNumber)
         }
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, log);
-      });
+        return http_1.handleError(err, res, log)
+      })
   } else {
-    edit_1.update(res, obj, save, log, returnNumber);
+    edit_1.update(res, obj, save, log, returnNumber)
   }
 }
-exports.validateAndUpdate = validateAndUpdate;
+exports.validateAndUpdate = validateAndUpdate
 function buildAndCheckIdWithBody(req, res, keys, patch) {
-  var obj = req.body;
-  if (!obj || obj === '') {
-    res.status(400).end('The request body cannot be empty.');
-    return undefined;
+  var obj = req.body
+  if (!obj || obj === "") {
+    res.status(400).end("The request body cannot be empty.")
+    return undefined
   }
   if (!patch) {
-    res.status(405).end('Method Not Allowed');
-    return undefined;
+    res.status(405).end("Method Not Allowed")
+    return undefined
   }
-  var id = view_1.buildId(req, keys);
+  var id = view_1.buildId(req, keys)
   if (!id) {
-    res.status(400).end('Invalid parameters');
-    return undefined;
+    res.status(400).end("Invalid parameters")
+    return undefined
   }
-  var ok = edit_1.checkId(obj, id, keys);
+  var ok = edit_1.checkId(obj, id, keys)
   if (!ok) {
-    res.status(400).end('body and url are not matched');
-    return undefined;
+    res.status(400).end("body and url are not matched")
+    return undefined
   }
-  return id;
+  return id
 }
-exports.buildAndCheckIdWithBody = buildAndCheckIdWithBody;
+exports.buildAndCheckIdWithBody = buildAndCheckIdWithBody
 function getDeleteStatus(count) {
   if (count > 0) {
-    return 200;
+    return 200
   } else if (count === 0) {
-    return 404;
+    return 404
   } else {
-    return 409;
+    return 409
   }
 }
-exports.getDeleteStatus = getDeleteStatus;
-function getStatusCode(errs) {
-  return edit_1.isTypeError(errs) ? 400 : 422;
-}
-exports.getStatusCode = getStatusCode;
+exports.getDeleteStatus = getDeleteStatus
 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 : '',
-    c.version ? c.version : '',
-  );
-  return b.build;
+    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;
+exports.useBuild = useBuild
 var Builder = (function () {
   function Builder(generate, id, payload, user, updatedBy, updatedAt, createdBy, createdAt, version) {
-    this.generate = generate;
-    this.id = id;
-    this.payload = payload;
-    this.user = user;
-    this.updatedBy = updatedBy;
-    this.updatedAt = updatedAt;
-    this.createdBy = createdBy;
-    this.createdAt = createdAt;
-    this.version = version;
-    this.build = this.build.bind(this);
+    this.generate = generate
+    this.id = id
+    this.payload = payload
+    this.user = user
+    this.updatedBy = updatedBy
+    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) {
-    var o = obj;
-    var usr = '';
+    var o = obj
+    var usr = ""
     if (this.user.length > 0) {
       if (this.payload.length > 0) {
-        var payload = res.locals[this.payload];
+        var payload = res.locals[this.payload]
         if (payload) {
-          usr = payload[this.user];
+          usr = payload[this.user]
         }
       } else {
-        usr = res.locals[this.user];
+        usr = res.locals[this.user]
       }
     }
     if (!usr) {
-      usr = '';
+      usr = ""
     }
-    var now = new Date();
+    var now = new Date()
     if (isCreate) {
       if (this.generate && this.id.length > 0) {
-        o[this.id] = this.generate();
+        o[this.id] = this.generate()
       }
       if (usr.length > 0) {
         if (this.createdAt.length > 0) {
-          o[this.createdAt] = now;
+          o[this.createdAt] = now
         }
         if (this.createdBy.length > 0) {
-          o[this.createdBy] = usr;
+          o[this.createdBy] = usr
         }
       }
       if (this.version.length > 0) {
-        o[this.version] = 1;
+        o[this.version] = 1
       }
     } else if (isPatch) {
-      var keys = Object.keys(o);
+      var keys = Object.keys(o)
       if (keys.length === 0) {
-        return;
+        return
       }
     }
     if (usr.length > 0) {
       if (this.updatedAt.length > 0) {
-        o[this.updatedAt] = now;
+        o[this.updatedAt] = now
       }
       if (this.updatedBy.length > 0) {
-        o[this.updatedBy] = usr;
+        o[this.updatedBy] = usr
       }
     }
-  };
-  return Builder;
-})();
-exports.Builder = Builder;
+  }
+  return Builder
+})()
+exports.Builder = Builder

package/lib/edit.js

@@ -1,108 +1,116 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var http_1 = require('./http');
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+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;
+  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];
+    var v = o[n]
     if (!v) {
-      o[n] = i;
-      return true;
+      o[n] = i
+      return true
     }
     if (v != i) {
-      return false;
+      return false
     }
-    return true;
+    return true
   }
-  var ks = Object.keys(i);
+  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];
+    var k = ks_1[_i]
+    var v = o[k]
     if (!v) {
-      o[k] = i[k];
+      o[k] = i[k]
     } else {
       if (v != i[k]) {
-        return false;
+        return false
       }
     }
-    o[k] = i[k];
+    o[k] = i[k]
   }
-  return true;
+  return true
 }
-exports.checkId = checkId;
+exports.checkId = checkId
 function create(res, obj, insert, log, returnNumber) {
   insert(obj)
     .then(function (result) {
-      if (typeof result === 'number') {
+      if (typeof result === "number") {
         if (result >= 1) {
           res
             .status(201)
             .json(returnNumber ? result : obj)
-            .end();
+            .end()
         } else {
-          res.status(409).json(result).end();
+          res.status(409).json(result).end()
         }
       } else if (Array.isArray(result)) {
-        res.status(422).json(result).end();
+        res.status(422).json(result).end()
       } else {
-        res.status(201).json(result).end();
+        res.status(201).json(result).end()
       }
     })
     .catch(function (err) {
-      return http_1.handleError(err, res, log);
-    });
+      return http_1.handleError(err, res, log)
+    })
 }
-exports.create = create;
+exports.create = create
 function update(res, obj, save, log, returnNumber) {
   save(obj)
     .then(function (result) {
-      if (typeof result === 'number') {
+      if (typeof result === "number") {
         if (result >= 1) {
           res
             .status(200)
             .json(returnNumber ? result : obj)
-            .end();
+            .end()
         } else if (result === 0) {
-          res.status(404).json(result).end();
+          res.status(404).json(result).end()
         } else {
-          res.status(409).json(result).end();
+          res.status(409).json(result).end()
         }
       } else if (Array.isArray(result)) {
-        res.status(422).json(result).end();
+        res.status(422).json(result).end()
       } else {
-        res.status(200).json(result).end();
+        res.status(200).json(result).end()
       }
     })
     .catch(function (err) {
-      return http_1.handleError(err, res, log);
-    });
+      return http_1.handleError(err, res, log)
+    })
 }
-exports.update = update;
+exports.update = update
 function isTypeError(errs) {
   if (!errs) {
-    return false;
+    return false
   }
   for (var _i = 0, errs_1 = errs; _i < errs_1.length; _i++) {
-    var err = errs_1[_i];
-    var c = err.code;
+    var err = errs_1[_i]
+    var c = err.code
     if (
-      c === 'type' ||
-      c === 'string' ||
-      c === 'number' ||
-      c === 'date' ||
-      c === 'boolean' ||
-      c === 'strings' ||
-      c === 'numbers' ||
-      c === 'integers' ||
-      c === 'dates' ||
-      c === 'datetimes' ||
-      c === 'booleans'
+      c === "type" ||
+      c === "string" ||
+      c === "number" ||
+      c === "date" ||
+      c === "boolean" ||
+      c === "strings" ||
+      c === "numbers" ||
+      c === "integers" ||
+      c === "dates" ||
+      c === "datetimes" ||
+      c === "booleans"
     ) {
-      return true;
+      return true
     }
   }
-  return false;
+  return false
+}
+exports.isTypeError = isTypeError
+function getStatusCode(errs) {
+  return isTypeError(errs) ? 400 : 422
+}
+exports.getStatusCode = getStatusCode
+function respondError(res, errors) {
+  res.status(getStatusCode(errors)).json(errors).end()
 }
-exports.isTypeError = isTypeError;
+exports.respondError = respondError

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "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, isTypeError, update } from "./edit"
+import { checkId, create, getStatusCode, update } from "./edit"
 import { handleError, Log } from "./http"
 import { LoadController } from "./LoadController"
 import { Attribute, Attributes, ErrorMessage } from "./metadata"
@@ -165,9 +165,7 @@ export function getDeleteStatus(count: number): number {
     return 409
   }
 }
-export function getStatusCode(errs: ErrorMessage[]): number {
-  return isTypeError(errs) ? 400 : 422
-}
+
 export interface ModelConfig {
   id?: string
   payload?: string

package/src/edit.ts

@@ -140,3 +140,9 @@ export function isTypeError(errs: ErrorMessage[]): boolean {
   }
   return false
 }
+export function getStatusCode(errs: ErrorMessage[]): number {
+  return isTypeError(errs) ? 400 : 422
+}
+export function respondError(res: Response, errors: ErrorMessage[]) {
+  res.status(getStatusCode(errors)).json(errors).end()
+}