wapplr 1.0.74 → 1.0.76

package/dist/common/router.js

@@ -1,31 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDefaultRouter = createDefaultRouter;
 exports["default"] = createRouter;
-
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _utils = require("./utils");
-
 var _excluded = ["action"],
-    _excluded2 = ["wapp"];
-
+  _excluded2 = ["wapp"];
 function createDefaultRouter() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp,
-      routes = p.routes;
-
+    routes = p.routes;
   function match() {
     var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var path = p.path;
@@ -36,7 +27,6 @@ function createDefaultRouter() {
       if (path && r.path) {
         var _match = false;
         var thisParams = {};
-
         try {
           var rPath = r.path.slice(-1) === "/" ? r.path.slice(0, -1) : r.path;
           var sPath = path.slice(-1) === "/" ? path.slice(0, -1) : path;
@@ -47,31 +37,25 @@ function createDefaultRouter() {
           rpa.forEach(function (rpas, i) {
             var param = rpas && rpas.slice(0, 1) === ":";
             var allow = rpas === "*";
-
             if (allow) {
               wasAllowChar = true;
             }
-
             if (typeof pa[i] == "string") {
               if (pa[i] === rpas || param || allow) {} else {
                 allPartIsMatch = false;
               }
-
               if (param) {
                 thisParams[rpas.slice(1)] = pa[i];
               }
             }
           });
-
           if (pa.length > rpa.length && !wasAllowChar) {
             allPartIsMatch = false;
           }
-
           if (allPartIsMatch) {
             _match = true;
           }
         } catch (e) {}
-
         if (_match && !route) {
           params = thisParams;
           route = r;
@@ -82,7 +66,6 @@ function createDefaultRouter() {
       params: params
     }) : route;
   }
-
   function getRoute() {
     var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var path = p.path;
@@ -90,12 +73,10 @@ function createDefaultRouter() {
       requestPath: null,
       status: null
     };
-
     if (path) {
       var routeByPath = router.match({
         path: path
       });
-
       if (routeByPath) {
         r = (0, _objectSpread2["default"])({
           requestPath: path,
@@ -103,7 +84,6 @@ function createDefaultRouter() {
         }, routeByPath);
       }
     }
-
     if (!r.status) {
       var notFoundPath = router.match({
         path: "/404"
@@ -118,7 +98,6 @@ function createDefaultRouter() {
         path: router.routes[0].path
       }) : null;
       var foundPath = notFoundPath ? notFoundPath : homePath ? homePath : firstPath ? firstPath : (0, _objectSpread2["default"])({}, r);
-
       if (foundPath) {
         r = (0, _objectSpread2["default"])({
           requestPath: path,
@@ -126,94 +105,79 @@ function createDefaultRouter() {
         }, foundPath);
       }
     }
-
     return r;
   }
-
   function defaultResolve() {
     return _defaultResolve.apply(this, arguments);
   }
-
   function _defaultResolve() {
     _defaultResolve = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
       var p,
-          path,
-          req,
-          res,
-          _router$getRoute,
-          _router$getRoute$acti,
-          action,
-          rest,
-          r,
-          _args = arguments;
-
+        path,
+        req,
+        res,
+        _router$getRoute,
+        _router$getRoute$acti,
+        action,
+        rest,
+        r,
+        _args = arguments;
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-              path = p.path, req = p.req, res = p.res;
-              _router$getRoute = router.getRoute({
-                path: path
-              }), _router$getRoute$acti = _router$getRoute.action, action = _router$getRoute$acti === void 0 ? defaultAction : _router$getRoute$acti, rest = (0, _objectWithoutProperties2["default"])(_router$getRoute, _excluded);
-              _context.next = 5;
-              return action((0, _objectSpread2["default"])({
-                wapp: wapp,
-                req: req,
-                res: res
-              }, rest));
-
-            case 5:
-              r = _context.sent;
-              _context.next = 8;
-              return router.action((0, _objectSpread2["default"])({
-                wapp: wapp,
-                req: req,
-                res: res
-              }, r));
-
-            case 8:
-              r = _context.sent;
-              return _context.abrupt("return", r);
-
-            case 10:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            path = p.path, req = p.req, res = p.res;
+            _router$getRoute = router.getRoute({
+              path: path
+            }), _router$getRoute$acti = _router$getRoute.action, action = _router$getRoute$acti === void 0 ? defaultAction : _router$getRoute$acti, rest = (0, _objectWithoutProperties2["default"])(_router$getRoute, _excluded);
+            _context.next = 5;
+            return action((0, _objectSpread2["default"])({
+              wapp: wapp,
+              req: req,
+              res: res
+            }, rest));
+          case 5:
+            r = _context.sent;
+            _context.next = 8;
+            return router.action((0, _objectSpread2["default"])({
+              wapp: wapp,
+              req: req,
+              res: res
+            }, r));
+          case 8:
+            r = _context.sent;
+            return _context.abrupt("return", r);
+          case 10:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
     return _defaultResolve.apply(this, arguments);
   }
-
   function defaultAction() {
     return _defaultAction.apply(this, arguments);
   }
-
   function _defaultAction() {
     _defaultAction = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {
       var p,
-          wapp,
-          rest,
-          _args2 = arguments;
+        wapp,
+        rest,
+        _args2 = arguments;
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              p = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-              wapp = p.wapp, rest = (0, _objectWithoutProperties2["default"])(p, _excluded2);
-              return _context2.abrupt("return", (0, _objectSpread2["default"])({}, rest));
-
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            p = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+            wapp = p.wapp, rest = (0, _objectWithoutProperties2["default"])(p, _excluded2);
+            return _context2.abrupt("return", (0, _objectSpread2["default"])({}, rest));
+          case 3:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
     return _defaultAction.apply(this, arguments);
   }
-
   function defaultAdd(obj) {
     if (typeof obj === "object" && obj.length) {
       obj.forEach(function (route) {
@@ -224,7 +188,6 @@ function createDefaultRouter() {
               foundRoute = true;
             }
           });
-
           if (!foundRoute) {
             router.routes.push(route);
           }
@@ -238,14 +201,12 @@ function createDefaultRouter() {
             foundRoute = true;
           }
         });
-
         if (!foundRoute) {
           router.routes.push(obj);
         }
       }
     }
   }
-
   function defaultReplace(obj) {
     if (typeof obj === "object" && obj.length) {
       obj.forEach(function (objRoute) {
@@ -257,7 +218,6 @@ function createDefaultRouter() {
               replaced = true;
             }
           });
-
           if (!replaced) {
             router.routes.push(objRoute);
           }
@@ -272,14 +232,12 @@ function createDefaultRouter() {
             replaced = true;
           }
         });
-
         if (!replaced) {
           router.routes.push(obj);
         }
       }
     }
   }
-
   var defaultRoutes = routes || [{
     path: "/",
     contentName: "log"
@@ -315,74 +273,60 @@ function createDefaultRouter() {
   });
   return router;
 }
-
 function createRouter() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp,
-      _p$routeManager = p.routeManager,
-      routeManager = _p$routeManager === void 0 ? createDefaultRouter(p) : _p$routeManager;
-
+    _p$routeManager = p.routeManager,
+    routeManager = _p$routeManager === void 0 ? createDefaultRouter(p) : _p$routeManager;
   function defaultHandle(_x, _x2, _x3) {
     return _defaultHandle.apply(this, arguments);
   }
-
   function _defaultHandle() {
     _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, next) {
       var wappResponse, wappRequest, routerRes, path, route;
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              wappResponse = res.wappResponse;
-              wappRequest = req.wappRequest;
-              routerRes = routerMiddleware.routeManager.resolve;
-              path = wappRequest.path || wappRequest.url;
-              _context3.next = 6;
-              return routerRes({
-                path: path,
-                req: req,
-                res: res
-              });
-
-            case 6:
-              route = _context3.sent;
-              wappResponse.statusCode = wappResponse.statusCode === 200 || !wappResponse.statusCode ? route.status : wappResponse.statusCode;
-              wappResponse.route = route;
-
-              if (wappResponse.statusCode) {
-                wappResponse.status(wappResponse.statusCode);
-              }
-
-              if (!(wappRequest.path === "/500" && wappResponse.statusCode === 404)) {
-                _context3.next = 13;
-                break;
-              }
-
-              //test an error
-              wappResponse.route.contentName = "";
-              throw new Error("Internal Server Error (Test)");
-
-            case 13:
-              return _context3.abrupt("return", next());
-
-            case 14:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            wappResponse = res.wappResponse;
+            wappRequest = req.wappRequest;
+            routerRes = routerMiddleware.routeManager.resolve;
+            path = wappRequest.path || wappRequest.url;
+            _context3.next = 6;
+            return routerRes({
+              path: path,
+              req: req,
+              res: res
+            });
+          case 6:
+            route = _context3.sent;
+            wappResponse.statusCode = wappResponse.statusCode === 200 || !wappResponse.statusCode ? route.status : wappResponse.statusCode;
+            wappResponse.route = route;
+            if (wappResponse.statusCode) {
+              wappResponse.status(wappResponse.statusCode);
+            }
+            if (!(wappRequest.path === "/500" && wappResponse.statusCode === 404)) {
+              _context3.next = 13;
+              break;
+            }
+            //test an error
+            wappResponse.route.contentName = "";
+            throw new Error("Internal Server Error (Test)");
+          case 13:
+            return _context3.abrupt("return", next());
+          case 14:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }));
     return _defaultHandle.apply(this, arguments);
   }
-
   function defaultAdd(p) {
     return routerMiddleware.routeManager.add(p);
   }
-
   function defaultReplace(p) {
     return routerMiddleware.routeManager.replace(p);
   }
-
   var routerMiddlewareProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -397,41 +341,32 @@ function createRouter() {
       value: defaultReplace
     })
   });
-
   function routerMiddleware(_x4, _x5, _x6) {
     return _routerMiddleware.apply(this, arguments);
   }
-
   function _routerMiddleware() {
     _routerMiddleware = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4(req, res, next) {
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              if (!(typeof routerMiddleware.handle === "function")) {
-                _context4.next = 4;
-                break;
-              }
-
-              _context4.next = 3;
-              return routerMiddleware.handle(req, res, next);
-
-            case 3:
-              return _context4.abrupt("return", _context4.sent);
-
-            case 4:
-              return _context4.abrupt("return", routerMiddleware);
-
-            case 5:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (!(typeof routerMiddleware.handle === "function")) {
+              _context4.next = 4;
+              break;
+            }
+            _context4.next = 3;
+            return routerMiddleware.handle(req, res, next);
+          case 3:
+            return _context4.abrupt("return", _context4.sent);
+          case 4:
+            return _context4.abrupt("return", routerMiddleware);
+          case 5:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }));
     return _routerMiddleware.apply(this, arguments);
   }
-
   (0, _utils.mergeProperties)(routerMiddleware, routerMiddlewareProperties);
   Object.defineProperty(routerMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,