express-ext 0.2.7 → 0.3.1

package/lib/GenericController.js

@@ -1,23 +1,33 @@
-"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 edit_1 = require("./edit");
-var http_1 = require("./http");
-var LoadController_1 = require("./LoadController");
-var resources_1 = require("./resources");
-var view_1 = require("./view");
+'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 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);
   function GenericController(log, service, build, validate, returnNumber) {
@@ -48,13 +58,13 @@ var GenericController = (function (_super) {
   GenericController.prototype.update = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update);
     if (id) {
-      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, 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);
     if (id && this.service.patch) {
-      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, this.build);
+      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build);
     }
   };
   GenericController.prototype.delete = function (req, res) {
@@ -63,57 +73,64 @@ var GenericController = (function (_super) {
     if (id) {
       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); });
+      } 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;
-}(LoadController_1.LoadController));
+})(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.');
-  }
-  else {
+  } else {
     if (validate) {
-      validate(obj).then(function (errors) {
-        if (errors && errors.length > 0) {
-          res.status(getStatusCode(errors)).json(errors).end();
-        }
-        else {
-          if (build) {
-            build(res, obj, true);
+      validate(obj)
+        .then(function (errors) {
+          if (errors && errors.length > 0) {
+            res.status(getStatusCode(errors)).json(errors).end();
+          } else {
+            if (build) {
+              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); });
-    }
-    else {
+        })
+        .catch(function (err) {
+          return http_1.handleError(err, res, log);
+        });
+    } else {
       edit_1.create(res, obj, save, log, returnNumber);
     }
   }
 }
 exports.validateAndCreate = validateAndCreate;
-function validateAndUpdate(res, obj, isPatch, save, log, validate, build, returnNumber) {
+function validateAndUpdate(res, obj, isPatch, save, log, validate, resource, build, returnNumber) {
   if (validate) {
-    validate(obj, isPatch).then(function (errors) {
-      if (errors && errors.length > 0) {
-        res.status(getStatusCode(errors)).json(errors).end();
-      }
-      else {
-        if (build) {
-          build(res, obj, false, isPatch);
+    validate(obj, resource, isPatch)
+      .then(function (errors) {
+        if (errors && errors.length > 0) {
+          res.status(getStatusCode(errors)).json(errors).end();
+        } else {
+          if (build) {
+            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); });
-  }
-  else {
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, log);
+      });
+  } else {
     edit_1.update(res, obj, save, log, returnNumber);
   }
 }
@@ -144,21 +161,29 @@ exports.buildAndCheckIdWithBody = buildAndCheckIdWithBody;
 function getDeleteStatus(count) {
   if (count > 0) {
     return 200;
-  }
-  else if (count === 0) {
+  } else if (count === 0) {
     return 404;
-  }
-  else {
+  } else {
     return 409;
   }
 }
 exports.getDeleteStatus = getDeleteStatus;
 function getStatusCode(errs) {
-  return (edit_1.isTypeError(errs) ? 400 : 422);
+  return edit_1.isTypeError(errs) ? 400 : 422;
 }
 exports.getStatusCode = getStatusCode;
 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 : '');
+  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;
 }
 exports.useBuild = useBuild;
@@ -184,8 +209,7 @@ var Builder = (function () {
         if (payload) {
           usr = payload[this.user];
         }
-      }
-      else {
+      } else {
         usr = res.locals[this.user];
       }
     }
@@ -208,8 +232,7 @@ var Builder = (function () {
       if (this.version.length > 0) {
         o[this.version] = 1;
       }
-    }
-    else if (isPatch) {
+    } else if (isPatch) {
       var keys = Object.keys(o);
       if (keys.length === 0) {
         return;
@@ -225,5 +248,5 @@ var Builder = (function () {
     }
   };
   return Builder;
-}());
+})();
 exports.Builder = Builder;

package/lib/GenericSearchController.js

@@ -26,7 +26,6 @@ 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) {
@@ -42,7 +41,7 @@ var GenericSearchController = (function (_super) {
     if (!_this.fields || _this.fields.length === 0) {
       _this.fields = 'fields';
     }
-    var m = search_func_1.getMetadataFunc(service, dates, numbers);
+    var m = search_1.getMetadataFunc(service, dates, numbers);
     if (m) {
       _this.dates = m.dates;
       _this.numbers = m.numbers;
@@ -54,7 +53,7 @@ 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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })

package/lib/LoadSearchController.js

@@ -26,7 +26,6 @@ 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;
@@ -57,7 +56,7 @@ var LoadSearchController = (function (_super) {
     if (!_this.fields || _this.fields.length === 0) {
       _this.fields = 'fields';
     }
-    var m = search_func_1.getMetadataFunc(viewService, dates, numbers, keys);
+    var m = search_1.getMetadataFunc(viewService, dates, numbers, keys);
     if (m) {
       _this.dates = m.dates;
       _this.numbers = m.numbers;
@@ -69,7 +68,7 @@ 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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })
@@ -102,7 +101,7 @@ var QueryController = (function (_super) {
     if (!_this.fields || _this.fields.length === 0) {
       _this.fields = 'fields';
     }
-    var m = search_func_1.getMetadataFunc(query, dates, numbers);
+    var m = search_1.getMetadataFunc(query, dates, numbers);
     if (m) {
       _this.dates = m.dates;
       _this.numbers = m.numbers;
@@ -115,7 +114,7 @@ var QueryController = (function (_super) {
     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.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })

package/lib/LowCodeController.js

@@ -26,7 +26,6 @@ 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) {
@@ -42,7 +41,7 @@ var LowcodeController = (function (_super) {
     if (!_this.fields || _this.fields.length === 0) {
       _this.fields = 'fields';
     }
-    var m = search_func_1.getMetadataFunc(lowCodeService, dates, numbers);
+    var m = search_1.getMetadataFunc(lowCodeService, dates, numbers);
     if (m) {
       _this.dates = m.dates;
       _this.numbers = m.numbers;
@@ -55,7 +54,7 @@ var LowcodeController = (function (_super) {
     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.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })
@@ -82,7 +81,7 @@ var Controller = (function (_super) {
     if (!_this.fields || _this.fields.length === 0) {
       _this.fields = 'fields';
     }
-    var m = search_func_1.getMetadataFunc(lowCodeService, dates, numbers);
+    var m = search_1.getMetadataFunc(lowCodeService, dates, numbers);
     if (m) {
       _this.dates = m.dates;
       _this.numbers = m.numbers;
@@ -95,7 +94,7 @@ var Controller = (function (_super) {
     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.offsetOrNextPageToken, l.fields)
+      .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })

package/lib/SearchController.js

@@ -30,7 +30,7 @@ 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.offsetOrNextPageToken, l.fields)
+    this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config);
       })

package/lib/edit.js

@@ -1,8 +1,8 @@
-"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 n = keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id';
   var o = obj;
   var i = id;
   if (!keys || keys.length === 1) {
@@ -22,8 +22,7 @@ function checkId(obj, id, keys) {
     var v = o[k];
     if (!v) {
       o[k] = i[k];
-    }
-    else {
+    } else {
       if (v != i[k]) {
         return false;
       }
@@ -34,38 +33,51 @@ function checkId(obj, id, keys) {
 }
 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();
+  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 {
+        res.status(201).json(result).end();
       }
-    }
-    else {
-      res.status(422).json(result).end();
-    }
-  }).catch(function (err) { return http_1.handleError(err, res, log); });
+    })
+    .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();
+  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();
+        } 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();
       }
-      else if (result === 0) {
-        res.status(404).json(result).end();
-      }
-      else {
-        res.status(409).json(result).end();
-      }
-    }
-    else {
-      res.status(422).json(result).end();
-    }
-  }).catch(function (err) { return http_1.handleError(err, res, log); });
+    })
+    .catch(function (err) {
+      return http_1.handleError(err, res, log);
+    });
 }
 exports.update = update;
 function isTypeError(errs) {
@@ -75,7 +87,19 @@ function isTypeError(errs) {
   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') {
+    if (
+      c === 'type' ||
+      c === 'string' ||
+      c === 'number' ||
+      c === 'date' ||
+      c === 'boolean' ||
+      c === 'strings' ||
+      c === 'numbers' ||
+      c === 'integers' ||
+      c === 'dates' ||
+      c === 'datetimes' ||
+      c === 'booleans'
+    ) {
       return true;
     }
   }

package/lib/index.js

@@ -35,7 +35,6 @@ __export(require('./LogController'));
 __export(require('./LowCodeController'));
 __export(require('./resources'));
 __export(require('./search'));
-__export(require('./search_func'));
 __export(require('./SearchController'));
 __export(require('./view'));
 function allow(access) {
@@ -306,3 +305,9 @@ var UserReactionController = (function () {
 exports.UserReactionController = UserReactionController;
 exports.ReactController = UserReactionController;
 exports.ReactionController = UserReactionController;
+function addDays(d, n) {
+  var newDate = new Date(d);
+  newDate.setDate(newDate.getDate() + n);
+  return newDate;
+}
+exports.addDays = addDays;

package/lib/resources.js

@@ -5,7 +5,8 @@ var http = require('http');
 var https = require('https');
 var resources = (function () {
   function resources() {}
-  resources.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
+  resources.limits = [12, 24, 60, 100, 120, 180, 300, 600];
+  resources.pages = 'pages';
   resources.page = 'page';
   resources.limit = 'limit';
   resources.defaultLimit = 12;
@@ -15,6 +16,11 @@ var resources = (function () {
   return resources;
 })();
 exports.resources = resources;
+function getView(req, view) {
+  var partial = req.query[resources.partial];
+  return partial == 'true' ? resources.pages + '/' + view : view;
+}
+exports.getView = getView;
 var TypeChecker = (function () {
   function TypeChecker(attributes, allowUndefined) {
     this.attributes = attributes;

package/lib/search.js

@@ -386,16 +386,6 @@ function getParameters(obj, config) {
       var ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
-        var skip = o['skip'];
-        if (skip && !isNaN(skip)) {
-          var iskip = Math.floor(parseFloat(skip));
-          if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
-            deletePageInfo(o);
-            return r;
-          }
-        }
         var pageIndex = o['page'];
         if (!pageIndex) {
           pageIndex = o['pageIndex'];
@@ -408,37 +398,21 @@ function getParameters(obj, config) {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
-          var firstPageSize = o['firstLimit'];
-          if (!firstPageSize) {
-            firstPageSize = o['firstPageSize'];
-          }
-          if (!firstPageSize) {
-            firstPageSize = o['initPageSize'];
-          }
-          if (firstPageSize && !isNaN(firstPageSize)) {
-            var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
-            if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
-              deletePageInfo(o);
-              return r;
-            }
-          }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+          r.page = ipageIndex;
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o);
           return r;
         }
-        r.offset = 0;
+        r.page = 1;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o);
     return r;
@@ -477,8 +451,8 @@ function getParameters(obj, config) {
         if (skip && !isNaN(skip)) {
           var iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
+            r.page = iskip;
+            r.pageOrNextPageToken = r.page;
             deletePageInfo(o, arr);
             return r;
           }
@@ -501,27 +475,27 @@ function getParameters(obj, config) {
           if (firstPageSize && !isNaN(firstPageSize)) {
             var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
+              r.page = ipageSize * (ipageIndex - 2) + ifirstPageSize;
+              r.pageOrNextPageToken = r.page;
               deletePageInfo(o, arr);
               return r;
             }
           }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+          r.page = ipageSize * (ipageIndex - 1);
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o, arr);
           return r;
         }
-        r.offset = 0;
+        r.page = 0;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o, arr);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o, arr);
     return r;
@@ -734,3 +708,22 @@ function format(obj, dates, nums) {
   return o;
 }
 exports.format = format;
+function getMetadataFunc(viewService, dates, numbers, keys) {
+  var m = { dates: dates, numbers: numbers };
+  if ((m.dates && m.dates.length > 0) || (m.numbers && m.numbers.length > 0)) {
+    return m;
+  }
+  if (keys) {
+    if (!Array.isArray(keys)) {
+      return buildMetadata(keys);
+    }
+  }
+  if (typeof viewService !== 'function' && viewService.metadata) {
+    var metadata = viewService.metadata();
+    if (metadata) {
+      return buildMetadata(metadata);
+    }
+  }
+  return undefined;
+}
+exports.getMetadataFunc = getMetadataFunc;

package/package.json

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