express-ext 0.1.5 → 0.1.10

package/lib/GenericController.js

@@ -13,7 +13,6 @@ var __extends = (this && this.__extends) || (function () {
   };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCode = exports.getDeleteStatus = exports.buildAndCheckIdWithBody = exports.validateAndUpdate = exports.validateAndCreate = exports.GenericController = void 0;
 var edit_1 = require("./edit");
 var http_1 = require("./http");
 var LoadController_1 = require("./LoadController");
@@ -50,14 +49,14 @@ var GenericController = (function (_super) {
     validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
   };
   GenericController.prototype.update = function (req, res) {
-    var id = buildAndCheckIdWithBody(req, res, this.keys);
+    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);
     }
   };
   GenericController.prototype.patch = function (req, res) {
-    var id = buildAndCheckIdWithBody(req, res, this.keys);
-    if (id) {
+    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);
     }
   };
@@ -65,9 +64,14 @@ var GenericController = (function (_super) {
     var _this = this;
     var id = view_1.buildAndCheckId(req, res, this.keys);
     if (id) {
-      this.service.delete(id).then(function (count) {
-        res.status(getDeleteStatus(count)).json(count).end();
-      }).catch(function (err) { return http_1.handleError(err, res, _this.log); });
+      if (!this.service.delete) {
+        res.status(405).end('Method Not Allowed');
+      }
+      else {
+        this.service.delete(id).then(function (count) {
+          res.status(getDeleteStatus(count)).json(count).end();
+        }).catch(function (err) { return http_1.handleError(err, res, _this.log); });
+      }
     }
   };
   return GenericController;
@@ -111,12 +115,16 @@ function validateAndUpdate(res, status, obj, isPatch, save, log, validate) {
   }
 }
 exports.validateAndUpdate = validateAndUpdate;
-function buildAndCheckIdWithBody(req, res, keys) {
+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;
   }
+  if (!patch) {
+    res.status(405).end('Method Not Allowed');
+    return undefined;
+  }
   var id = view_1.buildId(req, keys);
   if (!id) {
     res.status(400).end('Invalid parameters');

package/lib/GenericSearchController.js

@@ -13,7 +13,6 @@ var __extends = (this && this.__extends) || (function () {
   };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenericSearchController = void 0;
 var GenericController_1 = require("./GenericController");
 var http_1 = require("./http");
 var search_1 = require("./search");

package/lib/HealthController.js

@@ -1,42 +1,5 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-    function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-  function verb(n) { return function (v) { return step([n, v]); }; }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0: case 1: t = op; break;
-        case 4: _.label++; return { value: op[1], done: false };
-        case 5: _.label++; y = op[1]; op = [0]; continue;
-        case 7: op = _.ops.pop(); _.trys.pop(); continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-          if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-          if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-          if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-          if (t[2]) _.ops.pop();
-          _.trys.pop(); continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-  }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HealthController = void 0;
 var health_1 = require("./health");
 var HealthController = (function () {
   function HealthController(checkers) {
@@ -44,18 +7,13 @@ var HealthController = (function () {
     this.check = this.check.bind(this);
   }
   HealthController.prototype.check = function (req, res) {
-    return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_a) {
-        health_1.check(this.checkers).then(function (heath) {
-          if (heath.status === 'UP') {
-            return res.status(200).json(heath).end();
-          }
-          else {
-            return res.status(500).json(heath).end();
-          }
-        });
-        return [2];
-      });
+    health_1.check(this.checkers).then(function (heath) {
+      if (heath.status === 'UP') {
+        return res.status(200).json(heath).end();
+      }
+      else {
+        return res.status(500).json(heath).end();
+      }
     });
   };
   return HealthController;

package/lib/LoadController.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadController = void 0;
 var http_1 = require("./http");
 var view_1 = require("./view");
 function getViewFunc(viewService) {

package/lib/LoadSearchController.js

@@ -13,7 +13,6 @@ var __extends = (this && this.__extends) || (function () {
   };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadSearchController = void 0;
 var http_1 = require("./http");
 var LoadController_1 = require("./LoadController");
 var search_1 = require("./search");

package/lib/LowCodeController.js

@@ -13,7 +13,6 @@ var __extends = (this && this.__extends) || (function () {
   };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LowCodeController = void 0;
 var GenericController_1 = require("./GenericController");
 var http_1 = require("./http");
 var search_1 = require("./search");

package/lib/SearchController.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SearchController = void 0;
 var http_1 = require("./http");
 var search_1 = require("./search");
 var SearchController = (function () {

package/lib/edit.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTypeError = exports.update = exports.create = exports.checkId = exports.initializeStatus = void 0;
 var http_1 = require("./http");
 function initializeStatus(s) {
   if (s) {
@@ -11,40 +10,40 @@ function initializeStatus(s) {
     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 = 'id';
-  if (keys && keys.length === 1) {
-    n = keys[0].name;
-  }
+  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 = obj[n];
+    var v = o[n];
     if (!v) {
-      obj[n] = id;
+      o[n] = i;
       return true;
     }
-    if (v != id) {
+    if (v != i) {
       return false;
     }
     return true;
   }
-  var ks = Object.keys(id);
+  var ks = Object.keys(i);
   for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
     var k = ks_1[_i];
-    var v = obj[k];
+    var v = o[k];
     if (!v) {
-      obj[k] = id[k];
+      o[k] = i[k];
     }
     else {
-      if (v != id[k]) {
+      if (v != i[k]) {
         return false;
       }
     }
-    obj[k] = id[k];
+    o[k] = i[k];
   }
   return true;
 }

package/lib/health.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
   });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
   function verb(n) { return function (v) { return step([n, v]); }; }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
@@ -36,19 +36,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
   }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.check = void 0;
 function check(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) {
       switch (_a.label) {
         case 0:
-          p = {
-            status: 'UP',
-            details: {},
-          };
+          p = { status: 'UP' };
           total = checkers.length - 1;
           count = 0;
+          p.details = {};
           _i = 0, checkers_1 = checkers;
           _a.label = 1;
         case 1:
@@ -88,7 +85,7 @@ function check(checkers) {
         case 5:
           _i++;
           return [3, 1];
-        case 6: return [2];
+        case 6: return [2, p];
       }
     });
   });

package/lib/http.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDate = exports.getRequiredDate = exports.getInteger = exports.getNumber = exports.getRequiredNumber = exports.getRequiredParameters = exports.params = exports.param = exports.queryDate = exports.queryRequiredDate = exports.queryNumber = exports.queryRequiredNumber = exports.query = exports.queryParam = exports.queryParams = exports.queryRequiredParams = exports.respondModel = exports.attrs = exports.attr = exports.handleError = void 0;
 function handleError(err, res, log) {
   if (log) {
-    log(JSON.stringify(err));
+    log(toString(err));
     res.status(500).end('Internal Server Error');
   }
   else {
-    res.status(500).end(JSON.stringify(err));
+    res.status(500).end(toString(err));
   }
 }
 exports.handleError = handleError;
+function toString(v) {
+  if (typeof v === 'string') {
+    return v;
+  }
+  else {
+    return JSON.stringify(v);
+  }
+}
+exports.toString = toString;
 function attr(name) {
   return { name: name, type: 'string' };
 }
@@ -53,7 +61,10 @@ function queryRequiredParams(req, res, name, split) {
 exports.queryRequiredParams = queryRequiredParams;
 function queryParams(req, name, d, split) {
   var q = req.query[name];
-  var v = q && q.toString();
+  if (!q) {
+    return d;
+  }
+  var v = q.toString();
   if (!v || v.length === 0) {
     return d;
   }
@@ -64,12 +75,21 @@ function queryParams(req, name, d, split) {
 }
 exports.queryParams = queryParams;
 function queryParam(req, res, name) {
-  var v = req.query[name].toString();
-  if (!v || v.length === 0) {
+  var v = req.query[name];
+  if (!v) {
     res.status(400).end("'" + name + "' cannot be empty");
     return undefined;
   }
-  return v;
+  else {
+    var v1 = v.toString();
+    if (v1.length === 0) {
+      res.status(400).end("'" + name + "' cannot be empty");
+      return undefined;
+    }
+    else {
+      return v1;
+    }
+  }
 }
 exports.queryParam = queryParam;
 function query(req, name, d) {
@@ -82,6 +102,9 @@ function query(req, name, d) {
 exports.query = query;
 function queryRequiredNumber(req, res, name) {
   var field = req.query[name];
+  if (!field) {
+    return undefined;
+  }
   var v = field.toString();
   if (!v || v.length === 0) {
     res.status(400).end("'" + name + "' cannot be empty");
@@ -110,6 +133,9 @@ function queryNumber(req, name, d) {
 exports.queryNumber = queryNumber;
 function queryRequiredDate(req, res, name) {
   var field = req.query[name];
+  if (!field) {
+    return undefined;
+  }
   var v = field.toString();
   if (!v || v.length === 0) {
     res.status(400).end("'" + name + "' cannot be empty");

package/lib/index.js

@@ -1,41 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-  for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LowCodeHandler = exports.GenericSearchHandler = exports.LoadSearchHandler = exports.SearchHandler = exports.GenericHandler = exports.LoadHandler = exports.HealthHandler = void 0;
-var GenericController_1 = require("./GenericController");
-Object.defineProperty(exports, "GenericHandler", { enumerable: true, get: function () { return GenericController_1.GenericController; } });
-var GenericSearchController_1 = require("./GenericSearchController");
-Object.defineProperty(exports, "GenericSearchHandler", { enumerable: true, get: function () { return GenericSearchController_1.GenericSearchController; } });
-var HealthController_1 = require("./HealthController");
-Object.defineProperty(exports, "HealthHandler", { enumerable: true, get: function () { return HealthController_1.HealthController; } });
-var LoadController_1 = require("./LoadController");
-Object.defineProperty(exports, "LoadHandler", { enumerable: true, get: function () { return LoadController_1.LoadController; } });
-var LoadSearchController_1 = require("./LoadSearchController");
-Object.defineProperty(exports, "LoadSearchHandler", { enumerable: true, get: function () { return LoadSearchController_1.LoadSearchController; } });
-var LowCodeController_1 = require("./LowCodeController");
-Object.defineProperty(exports, "LowCodeHandler", { enumerable: true, get: function () { return LowCodeController_1.LowCodeController; } });
-var SearchController_1 = require("./SearchController");
-Object.defineProperty(exports, "SearchHandler", { enumerable: true, get: function () { return SearchController_1.SearchController; } });
-__exportStar(require("./health"), exports);
-__exportStar(require("./HealthController"), exports);
-__exportStar(require("./http"), exports);
-__exportStar(require("./view"), exports);
-__exportStar(require("./LoadController"), exports);
-__exportStar(require("./search_func"), exports);
-__exportStar(require("./search"), exports);
-__exportStar(require("./SearchController"), exports);
-__exportStar(require("./LoadSearchController"), exports);
-__exportStar(require("./resources"), exports);
-__exportStar(require("./edit"), exports);
-__exportStar(require("./GenericController"), exports);
-__exportStar(require("./GenericSearchController"), exports);
-__exportStar(require("./LowCodeController"), exports);
+"use strict";function __export(m){for(var p in m)if(!exports.hasOwnProperty(p))exports[p]=m[p]}
+Object.defineProperty(exports,"__esModule",{value:!0});var GenericController_1=require("./GenericController");exports.GenericHandler=GenericController_1.GenericController;var GenericSearchController_1=require("./GenericSearchController");exports.GenericSearchHandler=GenericSearchController_1.GenericSearchController;var HealthController_1=require("./HealthController");exports.HealthHandler=HealthController_1.HealthController;var LoadController_1=require("./LoadController");exports.LoadHandler=LoadController_1.LoadController;exports.ViewHandler=LoadController_1.LoadController;exports.ViewController=LoadController_1.LoadController;var LoadSearchController_1=require("./LoadSearchController");exports.LoadSearchHandler=LoadSearchController_1.LoadSearchController;var LowCodeController_1=require("./LowCodeController");exports.LowCodeHandler=LowCodeController_1.LowCodeController;exports.Handler=LowCodeController_1.LowCodeController;exports.Controller=LowCodeController_1.LowCodeController;var SearchController_1=require("./SearchController");exports.SearchHandler=SearchController_1.SearchController;__export(require("./health"));__export(require("./HealthController"));__export(require("./http"));__export(require("./view"));__export(require("./LoadController"));__export(require("./search_func"));__export(require("./search"));__export(require("./SearchController"));__export(require("./LoadSearchController"));__export(require("./resources"));__export(require("./edit"));__export(require("./GenericController"));__export(require("./GenericSearchController"));__export(require("./LowCodeController"))

package/lib/resources.js

@@ -1,9 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resources = void 0;
-var resources = (function () {
-  function resources() {
-  }
-  return resources;
-}());
-exports.resources = resources;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var resources=(function(){function resources(){}
+return resources}());exports.resources=resources