express-ext 0.2.2 → 0.2.4

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/GenericSearchController.js

@@ -1,22 +1,32 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-  var extendStatics = function (d, b) {
-    extendStatics = Object.setPrototypeOf ||
-      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-      function (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);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var GenericController_1 = require("./GenericController");
-var http_1 = require("./http");
-var search_1 = require("./search");
-var search_func_1 = require("./search_func");
+'use strict';
+var __extends =
+  (this && this.__extends) ||
+  (function () {
+    var extendStatics = function (d, b) {
+      extendStatics =
+        Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array &&
+          function (d, b) {
+            d.__proto__ = b;
+          }) ||
+        function (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);
+      function __() {
+        this.constructor = d;
+      }
+      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
+    };
+  })();
+Object.defineProperty(exports, '__esModule', { value: true });
+var GenericController_1 = require('./GenericController');
+var http_1 = require('./http');
+var search_1 = require('./search');
+var search_func_1 = require('./search_func');
 var GenericSearchController = (function (_super) {
   __extends(GenericSearchController, _super);
   function GenericSearchController(log, find, service, config, build, validate, dates, numbers) {
@@ -44,10 +54,14 @@ var GenericSearchController = (function (_super) {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.find(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.find(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return GenericSearchController;
-}(GenericController_1.GenericController));
+})(GenericController_1.GenericController);
 exports.GenericSearchController = GenericSearchController;

package/lib/LoadSearchController.js

@@ -1,22 +1,32 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-  var extendStatics = function (d, b) {
-    extendStatics = Object.setPrototypeOf ||
-      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-      function (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);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_1 = require("./http");
-var LoadController_1 = require("./LoadController");
-var search_1 = require("./search");
-var search_func_1 = require("./search_func");
+'use strict';
+var __extends =
+  (this && this.__extends) ||
+  (function () {
+    var extendStatics = function (d, b) {
+      extendStatics =
+        Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array &&
+          function (d, b) {
+            d.__proto__ = b;
+          }) ||
+        function (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);
+      function __() {
+        this.constructor = d;
+      }
+      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
+    };
+  })();
+Object.defineProperty(exports, '__esModule', { value: true });
+var http_1 = require('./http');
+var LoadController_1 = require('./LoadController');
+var search_1 = require('./search');
+var search_func_1 = require('./search_func');
 function useSearchController(log, find, viewService, array, dates, numbers, keys, config) {
   var c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
   c.array = array;
@@ -35,8 +45,7 @@ var LoadSearchController = (function (_super) {
     if (config) {
       if (typeof config === 'boolean') {
         _this.csv = config;
-      }
-      else {
+      } else {
         _this.config = search_1.initializeConfig(config);
         if (_this.config) {
           _this.csv = _this.config.csv;
@@ -60,12 +69,16 @@ var LoadSearchController = (function (_super) {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.find(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.find(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return LoadSearchController;
-}(LoadController_1.LoadController));
+})(LoadController_1.LoadController);
 exports.LoadSearchController = LoadSearchController;
 var QueryController = (function (_super) {
   __extends(QueryController, _super);
@@ -77,8 +90,7 @@ var QueryController = (function (_super) {
     if (config) {
       if (typeof config === 'boolean') {
         _this.csv = config;
-      }
-      else {
+      } else {
         _this.config = search_1.initializeConfig(config);
         if (_this.config) {
           _this.csv = _this.config.csv;
@@ -102,11 +114,16 @@ var QueryController = (function (_super) {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.query.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.query
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return QueryController;
-}(LoadController_1.LoadController));
+})(LoadController_1.LoadController);
 exports.QueryController = QueryController;
 exports.QueryHandler = QueryController;

package/lib/LowCodeController.js

@@ -1,22 +1,32 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-  var extendStatics = function (d, b) {
-    extendStatics = Object.setPrototypeOf ||
-      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-      function (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);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var GenericController_1 = require("./GenericController");
-var http_1 = require("./http");
-var search_1 = require("./search");
-var search_func_1 = require("./search_func");
+'use strict';
+var __extends =
+  (this && this.__extends) ||
+  (function () {
+    var extendStatics = function (d, b) {
+      extendStatics =
+        Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array &&
+          function (d, b) {
+            d.__proto__ = b;
+          }) ||
+        function (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);
+      function __() {
+        this.constructor = d;
+      }
+      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
+    };
+  })();
+Object.defineProperty(exports, '__esModule', { value: true });
+var GenericController_1 = require('./GenericController');
+var http_1 = require('./http');
+var search_1 = require('./search');
+var search_func_1 = require('./search_func');
 var LowcodeController = (function (_super) {
   __extends(LowcodeController, _super);
   function LowcodeController(log, lowCodeService, config, build, validate, dates, numbers) {
@@ -44,12 +54,17 @@ var LowcodeController = (function (_super) {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.lowCodeService
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return LowcodeController;
-}(GenericController_1.GenericController));
+})(GenericController_1.GenericController);
 exports.LowcodeController = LowcodeController;
 exports.LowcodeHandler = LowcodeController;
 var Controller = (function (_super) {
@@ -79,10 +94,15 @@ var Controller = (function (_super) {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.lowCodeService
+      .search(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return Controller;
-}(GenericController_1.GenericController));
+})(GenericController_1.GenericController);
 exports.Controller = Controller;

package/lib/SearchController.js

@@ -1,7 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_1 = require("./http");
-var search_1 = require("./search");
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var http_1 = require('./http');
+var search_1 = require('./search');
 var SearchController = (function () {
   function SearchController(log, find, config, dates, numbers) {
     this.log = log;
@@ -12,8 +12,7 @@ var SearchController = (function () {
     if (config) {
       if (typeof config === 'boolean') {
         this.csv = config;
-      }
-      else {
+      } else {
         this.config = search_1.initializeConfig(config);
         if (this.config) {
           this.csv = this.config.csv;
@@ -31,10 +30,14 @@ var SearchController = (function () {
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
-    this.find(s2, l.limit, l.skipOrRefId, l.fields)
-      .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
-      .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+    this.find(s2, l.limit, l.offsetOrNextPageToken, l.fields)
+      .then(function (result) {
+        return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, _this.log);
+      });
   };
   return SearchController;
-}());
+})();
 exports.SearchController = SearchController;

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/lib/http.js

@@ -1,5 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
 Object.defineProperty(Error.prototype, 'toJSON', {
   value: function () {
     var alt = {};
@@ -9,14 +9,13 @@ Object.defineProperty(Error.prototype, 'toJSON', {
     return alt;
   },
   configurable: true,
-  writable: true
+  writable: true,
 });
 function handleError(err, res, log) {
   if (log) {
     log(toString(err));
     res.status(500).end('Internal Server Error');
-  }
-  else {
+  } else {
     res.status(500).end(toString(err));
   }
 }
@@ -25,8 +24,7 @@ exports.error = handleError;
 function toString(v) {
   if (typeof v === 'string') {
     return v;
-  }
-  else {
+  } else {
     return JSON.stringify(v);
   }
 }
@@ -48,8 +46,7 @@ exports.attrs = attrs;
 function respondModel(obj, res) {
   if (obj) {
     res.status(200).json(obj).end();
-  }
-  else {
+  } else {
     res.status(404).json(null).end();
   }
 }
@@ -91,14 +88,12 @@ function queryParam(req, res, name) {
   if (!v) {
     res.status(400).end("'" + name + "' cannot be empty");
     return undefined;
-  }
-  else {
+  } else {
     var v1 = v.toString();
     if (v1.length === 0) {
       res.status(400).end("'" + name + "' cannot be empty");
       return undefined;
-    }
-    else {
+    } else {
       return v1;
     }
   }
@@ -287,8 +282,7 @@ function minimize(obj) {
     var v = obj[key];
     if (v == null) {
       delete obj[key];
-    }
-    else if (Array.isArray(v) && v.length > 0) {
+    } else if (Array.isArray(v) && v.length > 0) {
       var v1 = v[0];
       if (typeof v1 === o && !(v1 instanceof Date)) {
         for (var _a = 0, v_1 = v; _a < v_1.length; _a++) {