express-ext 0.5.18 → 0.6.1

package/lib/http.js

@@ -1,310 +1,316 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-Object.defineProperty(Error.prototype, 'toJSON', {
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var resources_1 = require("./resources")
+Object.defineProperty(Error.prototype, "toJSON", {
   value: function () {
-    var alt = {};
+    var alt = {}
     Object.getOwnPropertyNames(this).forEach(function (key) {
-      alt[key] = this[key];
-    }, this);
-    return alt;
+      alt[key] = this[key]
+    }, this)
+    return alt
   },
   configurable: true,
   writable: true,
-});
-function handleError(err, res, log) {
-  if (log) {
-    log(toString(err));
-    res.status(500).end('Internal Server Error');
+})
+function handleError(err, res) {
+  if (resources_1.resources.log) {
+    resources_1.resources.log(toString(err))
+    res.status(500).end("Internal Server Error")
   } else {
-    res.status(500).end(toString(err));
+    if (resources_1.resources.returnServerError) {
+      res.status(500).end(toString(err))
+    } else {
+      console.error(toString(err))
+      res.status(500).end("Internal Server Error")
+    }
   }
 }
-exports.handleError = handleError;
-exports.error = handleError;
+exports.handleError = handleError
+exports.error = handleError
 function toString(v) {
-  if (typeof v === 'string') {
-    return v;
+  if (typeof v === "string") {
+    return v
   } else {
-    return JSON.stringify(v);
+    return JSON.stringify(v)
   }
 }
-exports.toString = toString;
+exports.toString = toString
 function attr(name) {
-  return { name: name, type: 'string' };
+  return { name: name, type: "string" }
 }
-exports.attr = attr;
+exports.attr = attr
 function attrs(keys) {
-  var atts = [];
+  var atts = []
   for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var str = keys_1[_i];
-    var at = { name: str, type: 'string' };
-    atts.push(at);
+    var str = keys_1[_i]
+    var at = { name: str, type: "string" }
+    atts.push(at)
   }
-  return atts;
+  return atts
 }
-exports.attrs = attrs;
+exports.attrs = attrs
 function respondModel(obj, res) {
   if (obj) {
-    res.status(200).json(obj).end();
+    res.status(200).json(obj).end()
   } else {
-    res.status(404).json(null).end();
+    res.status(404).json(null).end()
   }
 }
-exports.respondModel = respondModel;
+exports.respondModel = respondModel
 function queryRequiredParams(req, res, name, split) {
-  var v = req.query[name];
+  var v = req.query[name]
   if (!v) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
-  var v2 = v.toString();
+  var v2 = v.toString()
   if (v2.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
   if (!split) {
-    split = ',';
+    split = ","
   }
-  return v2.split(split);
+  return v2.split(split)
 }
-exports.queryRequiredParams = queryRequiredParams;
+exports.queryRequiredParams = queryRequiredParams
 function queryParams(req, name, d, split) {
-  var q = req.query[name];
+  var q = req.query[name]
   if (!q) {
-    return d;
+    return d
   }
-  var v = q.toString();
+  var v = q.toString()
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
   if (!split) {
-    split = ',';
+    split = ","
   }
-  return v.split(split);
+  return v.split(split)
 }
-exports.queryParams = queryParams;
+exports.queryParams = queryParams
 function queryParam(req, res, name) {
-  var v = req.query[name];
+  var v = req.query[name]
   if (!v) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   } else {
-    var v1 = v.toString();
+    var v1 = v.toString()
     if (v1.length === 0) {
-      res.status(400).end("'" + name + "' cannot be empty");
-      return undefined;
+      res.status(400).end("'" + name + "' cannot be empty")
+      return undefined
     } else {
-      return v1;
+      return v1
     }
   }
 }
-exports.queryParam = queryParam;
+exports.queryParam = queryParam
 function query(req, name, d) {
-  var p = req.query[name];
+  var p = req.query[name]
   if (!p || p.toString().length === 0) {
-    return d;
+    return d
   }
-  return p.toString();
+  return p.toString()
 }
-exports.query = query;
+exports.query = query
 function queryRequiredNumber(req, res, name) {
-  var field = req.query[name];
+  var field = req.query[name]
   if (!field) {
-    return undefined;
+    return undefined
   }
-  var v = field.toString();
+  var v = field.toString()
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
   if (isNaN(v)) {
-    res.status(400).end("'" + name + "' is not a valid number");
-    return undefined;
+    res.status(400).end("'" + name + "' is not a valid number")
+    return undefined
   }
-  var n = parseFloat(v);
-  return n;
+  var n = parseFloat(v)
+  return n
 }
-exports.queryRequiredNumber = queryRequiredNumber;
+exports.queryRequiredNumber = queryRequiredNumber
 function queryNumber(req, name, d) {
-  var field = req.query[name];
-  var v = field ? field.toString() : undefined;
+  var field = req.query[name]
+  var v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
   if (isNaN(v)) {
-    return d;
+    return d
   }
-  var n = parseFloat(v);
-  return n;
+  var n = parseFloat(v)
+  return n
 }
-exports.queryNumber = queryNumber;
+exports.queryNumber = queryNumber
 function queryRequiredDate(req, res, name) {
-  var field = req.query[name];
+  var field = req.query[name]
   if (!field) {
-    return undefined;
+    return undefined
   }
-  var v = field.toString();
+  var v = field.toString()
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
-  var date = new Date(v);
-  if (date.toString() === 'Invalid Date') {
-    res.status(400).end("'" + name + "' is not a valid date");
-    return undefined;
+  var date = new Date(v)
+  if (date.toString() === "Invalid Date") {
+    res.status(400).end("'" + name + "' is not a valid date")
+    return undefined
   }
-  return date;
+  return date
 }
-exports.queryRequiredDate = queryRequiredDate;
+exports.queryRequiredDate = queryRequiredDate
 function queryDate(req, name, d) {
-  var field = req.query[name];
+  var field = req.query[name]
   if (field) {
-    var v = field.toString();
+    var v = field.toString()
     if (!v || v.length === 0) {
-      return d;
+      return d
     }
-    var date = new Date(v);
-    if (date.toString() === 'Invalid Date') {
-      return d;
+    var date = new Date(v)
+    if (date.toString() === "Invalid Date") {
+      return d
     }
-    return date;
+    return date
   }
-  return undefined;
+  return undefined
 }
-exports.queryDate = queryDate;
+exports.queryDate = queryDate
 function param(req, res, name) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
-  return v;
+  return v
 }
-exports.param = param;
-exports.getParam = param;
+exports.param = param
+exports.getParam = param
 function params(req, name, d, split) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
   if (!split) {
-    split = ',';
+    split = ","
   }
-  return v.split(split);
+  return v.split(split)
 }
-exports.params = params;
-exports.getParams = params;
+exports.params = params
+exports.getParams = params
 function getRequiredParameters(req, res, name, split) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
   if (!split) {
-    split = ',';
+    split = ","
   }
-  return v.split(split);
+  return v.split(split)
 }
-exports.getRequiredParameters = getRequiredParameters;
+exports.getRequiredParameters = getRequiredParameters
 function getRequiredNumber(req, res, name) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
   if (isNaN(v)) {
-    res.status(400).end("'" + name + "' must be a number");
-    return undefined;
+    res.status(400).end("'" + name + "' must be a number")
+    return undefined
   }
-  var n = parseFloat(v);
-  return n;
+  var n = parseFloat(v)
+  return n
 }
-exports.getRequiredNumber = getRequiredNumber;
+exports.getRequiredNumber = getRequiredNumber
 function getNumber(req, name, d) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
   if (isNaN(v)) {
-    return d;
+    return d
   }
-  var n = parseFloat(v);
-  return n;
+  var n = parseFloat(v)
+  return n
 }
-exports.getNumber = getNumber;
+exports.getNumber = getNumber
 function getInteger(req, name, d) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
   if (isNaN(v)) {
-    return d;
+    return d
   }
-  var n = parseFloat(v);
-  var s = n.toFixed(0);
-  return parseFloat(s);
+  var n = parseFloat(v)
+  var s = n.toFixed(0)
+  return parseFloat(s)
 }
-exports.getInteger = getInteger;
+exports.getInteger = getInteger
 function getRequiredDate(req, res, name) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    res.status(400).end("'" + name + "' cannot be empty");
-    return undefined;
+    res.status(400).end("'" + name + "' cannot be empty")
+    return undefined
   }
-  var date = new Date(v);
-  if (date.toString() === 'Invalid Date') {
-    res.status(400).end("'" + name + "' must be a date");
-    return undefined;
+  var date = new Date(v)
+  if (date.toString() === "Invalid Date") {
+    res.status(400).end("'" + name + "' must be a date")
+    return undefined
   }
-  return date;
+  return date
 }
-exports.getRequiredDate = getRequiredDate;
+exports.getRequiredDate = getRequiredDate
 function getDate(req, name, d) {
-  var v = req.params[name];
+  var v = req.params[name]
   if (!v || v.length === 0) {
-    return d;
+    return d
   }
-  var date = new Date(v);
-  if (date.toString() === 'Invalid Date') {
-    return d;
+  var date = new Date(v)
+  if (date.toString() === "Invalid Date") {
+    return d
   }
-  return date;
+  return date
 }
-exports.getDate = getDate;
-var o = 'object';
+exports.getDate = getDate
+var o = "object"
 function minimize(obj) {
   if (!obj || typeof obj !== o) {
-    return obj;
+    return obj
   }
-  var keys = Object.keys(obj);
+  var keys = Object.keys(obj)
   for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-    var key = keys_2[_i];
-    var v = obj[key];
+    var key = keys_2[_i]
+    var v = obj[key]
     if (v == null) {
-      delete obj[key];
+      delete obj[key]
     } else if (Array.isArray(v) && v.length > 0) {
-      var v1 = v[0];
+      var v1 = v[0]
       if (typeof v1 === o && !(v1 instanceof Date)) {
         for (var _a = 0, v_1 = v; _a < v_1.length; _a++) {
-          var item = v_1[_a];
-          minimize(item);
+          var item = v_1[_a]
+          minimize(item)
         }
       }
     }
   }
-  return obj;
+  return obj
 }
-exports.minimize = minimize;
+exports.minimize = minimize
 function minimizeArray(arrs) {
   if (!arrs) {
-    return arrs;
+    return arrs
   }
   if (arrs.length > 0) {
     for (var _i = 0, arrs_1 = arrs; _i < arrs_1.length; _i++) {
-      var obj = arrs_1[_i];
-      minimize(obj);
+      var obj = arrs_1[_i]
+      minimize(obj)
     }
   }
-  return arrs;
+  return arrs
 }
-exports.minimizeArray = minimizeArray;
+exports.minimizeArray = minimizeArray

package/lib/index.js

@@ -40,16 +40,14 @@ __export(require("./search"))
 __export(require("./SearchController"))
 __export(require("./view"))
 var SavedController = (function () {
-  function SavedController(savedService, log, id, userId) {
+  function SavedController(savedService, id, userId) {
     this.savedService = savedService
-    this.log = log
     this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.save = this.save.bind(this)
     this.remove = this.remove.bind(this)
   }
   SavedController.prototype.save = function (req, res) {
-    var _this = this
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -67,11 +65,10 @@ var SavedController = (function () {
         res.status(status).json(result).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   SavedController.prototype.remove = function (req, res) {
-    var _this = this
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -89,23 +86,21 @@ var SavedController = (function () {
         res.status(status).json(result).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return SavedController
 })()
 exports.SavedController = SavedController
 var FollowController = (function () {
-  function FollowController(service, log, id, userId) {
+  function FollowController(service, id, userId) {
     this.service = service
-    this.log = log
     this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.follow = this.follow.bind(this)
     this.unfollow = this.unfollow.bind(this)
   }
   FollowController.prototype.follow = function (req, res) {
-    var _this = this
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -123,11 +118,10 @@ var FollowController = (function () {
         res.status(status).json(result).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   FollowController.prototype.unfollow = function (req, res) {
-    var _this = this
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -145,15 +139,14 @@ var FollowController = (function () {
         res.status(status).json(result).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return FollowController
 })()
 exports.FollowController = FollowController
 var UserReactionController = (function () {
-  function UserReactionController(log, service, author, id, reaction) {
-    this.log = log
+  function UserReactionController(service, author, id, reaction) {
     this.service = service
     this.author = author
     this.reaction = reaction
@@ -163,7 +156,6 @@ var UserReactionController = (function () {
     this.checkReaction = this.checkReaction.bind(this)
   }
   UserReactionController.prototype.react = function (req, res) {
-    var _this = this
     var id = req.params.id
     var author = req.params.author
     var reaction = req.params.reaction
@@ -185,11 +177,10 @@ var UserReactionController = (function () {
         res.status(200).json(count).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   UserReactionController.prototype.unreact = function (req, res) {
-    var _this = this
     var id = req.params.id
     var author = req.params.author
     var reaction = req.params.reaction
@@ -211,11 +202,10 @@ var UserReactionController = (function () {
         res.status(200).json(count).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   UserReactionController.prototype.checkReaction = function (req, res) {
-    var _this = this
     var id = req.params.id
     var author = req.params.author
     if (!id || id.length === 0) {
@@ -232,7 +222,7 @@ var UserReactionController = (function () {
         res.status(200).json(count).end()
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return UserReactionController
@@ -321,7 +311,7 @@ function respond(res, result, returnObject) {
   }
 }
 exports.respond = respond
-function save(isEdit, res, obj, service, log, returnNumber) {
+function save(isEdit, res, obj, service, returnNumber) {
   if (!isEdit) {
     service
       .create(obj)
@@ -335,7 +325,7 @@ function save(isEdit, res, obj, service, log, returnNumber) {
         }
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, log)
+        return http_1.handleError(err, res)
       })
   } else {
     service
@@ -355,7 +345,7 @@ function save(isEdit, res, obj, service, log, returnNumber) {
         }
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, log)
+        return http_1.handleError(err, res)
       })
   }
 }

package/package.json

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