wapplr 1.0.78 → 1.0.79

package/dist/common/requests.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createRequests;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -54,7 +54,7 @@ function createDefaultRequestManager() {
     return _defaultSendRequest.apply(this, arguments);
   }
   function _defaultSendRequest() {
-    _defaultSendRequest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
+    _defaultSendRequest = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
       var _p$req, _p$req$wappRequest;
       var p,
         wapp,
@@ -74,9 +74,10 @@ function createDefaultRequestManager() {
         requestBody,
         cookie,
         response,
-        _args = arguments;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args = arguments,
+        _t;
+      return (0, _regenerator2["default"])().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
             p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             wapp = requestManager.wapp;
@@ -98,8 +99,8 @@ function createDefaultRequestManager() {
             }, p)) : body;
             cookie = req && req.headers ? req.headers.cookie : null;
             response = null;
-            _context.prev = 12;
-            _context.next = 15;
+            _context.p = 1;
+            _context.n = 2;
             return fetch.apply(void 0, (0, _toConsumableArray2["default"])(formatBeforeRequest(url, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
               headers: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, cookie ? {
                 cookie: cookie
@@ -107,33 +108,30 @@ function createDefaultRequestManager() {
             }, restOptions), {}, {
               body: requestBody
             }), p)));
-          case 15:
-            response = _context.sent;
+          case 2:
+            response = _context.v;
             if (!(response && response.json)) {
-              _context.next = 20;
+              _context.n = 4;
               break;
             }
-            _context.next = 19;
+            _context.n = 3;
             return response.json();
-          case 19:
-            response = _context.sent;
-          case 20:
+          case 3:
+            response = _context.v;
+          case 4:
             if (response && response.data && !response.errors && !response.error) {
               response = response.data;
             }
-            return _context.abrupt("return", response);
-          case 24:
-            _context.prev = 24;
-            _context.t0 = _context["catch"](12);
-            console.log(_context.t0);
-            return _context.abrupt("return", {
-              error: _context.t0
+            return _context.a(2, response);
+          case 5:
+            _context.p = 5;
+            _t = _context.v;
+            console.log(_t);
+            return _context.a(2, {
+              error: _t
             });
-          case 28:
-          case "end":
-            return _context.stop();
         }
-      }, _callee, null, [[12, 24]]);
+      }, _callee, null, [[1, 5]]);
     }));
     return _defaultSendRequest.apply(this, arguments);
   }
@@ -174,16 +172,16 @@ function createRequests() {
     return _defaultSend.apply(this, arguments);
   }
   function _defaultSend() {
-    _defaultSend = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(p) {
+    _defaultSend = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(p) {
       var res, response;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return (0, _regenerator2["default"])().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             res = p.res;
-            _context2.next = 3;
+            _context2.n = 1;
             return requestManager.sendRequest(p);
-          case 3:
-            response = _context2.sent;
+          case 1:
+            response = _context2.v;
             if (res && res.wappResponse.store && response) {
               res.wappResponse.store.dispatch(wapp.states.stateManager.actions.res({
                 type: "INS_RES",
@@ -191,10 +189,7 @@ function createRequests() {
                 value: response
               }));
             }
-            return _context2.abrupt("return", response);
-          case 6:
-          case "end":
-            return _context2.stop();
+            return _context2.a(2, response);
         }
       }, _callee2);
     }));

package/dist/common/router.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createDefaultRouter = createDefaultRouter;
 exports["default"] = createRouter;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -111,7 +111,7 @@ function createDefaultRouter() {
     return _defaultResolve.apply(this, arguments);
   }
   function _defaultResolve() {
-    _defaultResolve = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
+    _defaultResolve = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
       var p,
         path,
         req,
@@ -122,34 +122,31 @@ function createDefaultRouter() {
         rest,
         r,
         _args = arguments;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return (0, _regenerator2["default"])().w(function (_context) {
+        while (1) switch (_context.n) {
           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;
+            _context.n = 1;
             return action((0, _objectSpread2["default"])({
               wapp: wapp,
               req: req,
               res: res
             }, rest));
-          case 5:
-            r = _context.sent;
-            _context.next = 8;
+          case 1:
+            r = _context.v;
+            _context.n = 2;
             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();
+          case 2:
+            r = _context.v;
+            return _context.a(2, r);
         }
       }, _callee);
     }));
@@ -159,20 +156,17 @@ function createDefaultRouter() {
     return _defaultAction.apply(this, arguments);
   }
   function _defaultAction() {
-    _defaultAction = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {
+    _defaultAction = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2() {
       var p,
         wapp,
         rest,
         _args2 = arguments;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return (0, _regenerator2["default"])().w(function (_context2) {
+        while (1) switch (_context2.n) {
           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();
+            return _context2.a(2, (0, _objectSpread2["default"])({}, rest));
         }
       }, _callee2);
     }));
@@ -282,40 +276,37 @@ function createRouter() {
     return _defaultHandle.apply(this, arguments);
   }
   function _defaultHandle() {
-    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, next) {
+    _defaultHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(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) {
+      return (0, _regenerator2["default"])().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             wappResponse = res.wappResponse;
             wappRequest = req.wappRequest;
             routerRes = routerMiddleware.routeManager.resolve;
             path = wappRequest.path || wappRequest.url;
-            _context3.next = 6;
+            _context3.n = 1;
             return routerRes({
               path: path,
               req: req,
               res: res
             });
-          case 6:
-            route = _context3.sent;
+          case 1:
+            route = _context3.v;
             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;
+              _context3.n = 2;
               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();
+          case 2:
+            return _context3.a(2, next());
         }
       }, _callee3);
     }));
@@ -345,23 +336,20 @@ function createRouter() {
     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) {
+    _routerMiddleware = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee4(req, res, next) {
+      return (0, _regenerator2["default"])().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (!(typeof routerMiddleware.handle === "function")) {
-              _context4.next = 4;
+              _context4.n = 2;
               break;
             }
-            _context4.next = 3;
+            _context4.n = 1;
             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();
+          case 1:
+            return _context4.a(2, _context4.v);
+          case 2:
+            return _context4.a(2, routerMiddleware);
         }
       }, _callee4);
     }));

package/dist/common/states.js

@@ -10,6 +10,17 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread6 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _utils = require("./utils");
+function copy(obj) {
+  var r = {};
+  try {
+    r = structuredClone(obj);
+  } catch (e) {
+    try {
+      r = (0, _utils.copyObject)(obj);
+    } catch (e) {}
+  }
+  return r;
+}
 function createDefaultStateManager() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp;
@@ -20,7 +31,7 @@ function createDefaultStateManager() {
         var action = arguments.length > 1 ? arguments[1] : undefined;
         switch (action.type) {
           case "SET_REQ":
-            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
+            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? copy(action.payload.value) : action.payload.value));
           default:
             return state;
         }
@@ -32,12 +43,12 @@ function createDefaultStateManager() {
         var action = arguments.length > 1 ? arguments[1] : undefined;
         switch (action.type) {
           case "SET_RES":
-            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
+            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? copy(action.payload.value) : action.payload.value));
           case "INS_RES":
             if (typeof action.payload.value === "object" && action.payload.value && typeof state[action.payload.name] === "object" && state[action.payload.name]) {
-              return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state[action.payload.name]), (0, _utils.copyObject)(action.payload.value))));
+              return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state[action.payload.name]), copy(action.payload.value))));
             }
-            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
+            return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? copy(action.payload.value) : action.payload.value));
           default:
             return state;
         }
@@ -91,16 +102,16 @@ function createDefaultStateManager() {
       getState: function getState(p) {
         var keys = p && typeof p == "string" ? p : p && typeof p == "object" && typeof p.keys == "string" ? p.keys : "";
         if (keys) {
-          var find = function find(keys, o) {
+          var _find = function find(keys, o) {
             var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
             if (keys[i + 1] && keys[i] && o[keys[i]] && typeof o[keys[i]] == "object") {
-              find(keys, o[keys[i]], i + 1);
+              _find(keys, o[keys[i]], i + 1);
             } else if (!keys[i + 1] && typeof o[keys[i]] !== "undefined") {
               found = o[keys[i]];
             }
           };
           var found;
-          find(keys.split("."), state);
+          _find(keys.split("."), state);
           return typeof found === "object" && found ? (0, _utils.copyObject)(found) : found;
         }
         try {

package/dist/server/app.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = createApp;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("../common/utils.js");
@@ -50,60 +50,56 @@ function createApp() {
     return _defaultHandle.apply(this, arguments);
   }
   function _defaultHandle() {
-    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, out) {
+    _defaultHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(req, res, out) {
       var middlewares, index, next, _next;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return (0, _regenerator2["default"])().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             _next = function _next3() {
-              _next = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(err) {
-                var func, defaultArgs, args, requestMethod, requestUrl;
-                return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+              _next = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(err) {
+                var func, defaultArgs, args, requestMethod, requestUrl, _t;
+                return (0, _regenerator2["default"])().w(function (_context2) {
+                  while (1) switch (_context2.p = _context2.n) {
                     case 0:
                       if (!middlewares[index]) {
-                        _context2.next = 19;
+                        _context2.n = 5;
                         break;
                       }
                       func = middlewares[index];
                       index = index + 1;
-                      defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
-                        return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
-                          while (1) switch (_context.prev = _context.next) {
+                      defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
+                        return (0, _regenerator2["default"])().w(function (_context) {
+                          while (1) switch (_context.n) {
                             case 0:
-                              _context.next = 2;
+                              _context.n = 1;
                               return next(err);
-                            case 2:
-                            case "end":
-                              return _context.stop();
+                            case 1:
+                              return _context.a(2);
                           }
                         }, _callee);
                       })) : next];
                       args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
-                      _context2.prev = 5;
-                      _context2.next = 8;
+                      _context2.p = 1;
+                      _context2.n = 2;
                       return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
-                    case 8:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 11:
-                      _context2.prev = 11;
-                      _context2.t0 = _context2["catch"](5);
-                      res.status(500, _context2.t0);
-                      _context2.next = 16;
-                      return next(_context2.t0);
-                    case 16:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 17:
-                      _context2.next = 25;
-                      break;
-                    case 19:
+                    case 2:
+                      return _context2.a(2, _context2.v);
+                    case 3:
+                      _context2.p = 3;
+                      _t = _context2.v;
+                      res.status(500, _t);
+                      _context2.n = 4;
+                      return next(_t);
+                    case 4:
+                      return _context2.a(2, _context2.v);
+                    case 5:
                       if (!(typeof out === "function")) {
-                        _context2.next = 24;
+                        _context2.n = 6;
                         break;
                       }
                       index = 0;
-                      return _context2.abrupt("return", out(err));
-                    case 24:
+                      return _context2.a(2, out(err));
+                    case 6:
                       if (err) {
                         index = 0;
                         app.errorHandler(err, req, res, out);
@@ -114,13 +110,10 @@ function createApp() {
                         requestUrl = req.url;
                         res.send(requestMethod + " " + requestUrl);
                       }
-                    case 25:
-                      return _context2.abrupt("return", null);
-                    case 26:
-                    case "end":
-                      return _context2.stop();
+                    case 7:
+                      return _context2.a(2, null);
                   }
-                }, _callee2, null, [[5, 11]]);
+                }, _callee2, null, [[1, 3]]);
               }));
               return _next.apply(this, arguments);
             };
@@ -129,13 +122,10 @@ function createApp() {
             };
             middlewares = app.middlewares;
             index = 0;
-            _context3.next = 6;
+            _context3.n = 1;
             return next();
-          case 6:
-            return _context3.abrupt("return", _context3.sent);
-          case 7:
-          case "end":
-            return _context3.stop();
+          case 1:
+            return _context3.a(2, _context3.v);
         }
       }, _callee3);
     }));
@@ -204,21 +194,21 @@ function createApp() {
     return _app.apply(this, arguments);
   }
   function _app() {
-    _app = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
+    _app = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee4() {
       var req,
         res,
         next,
         defaultOut,
         fullUrl,
         _args4 = arguments;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return (0, _regenerator2["default"])().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             req = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
             res = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
             next = _args4.length > 2 ? _args4[2] : undefined;
             if (!(typeof app.handle === "function")) {
-              _context4.next = 13;
+              _context4.n = 1;
               break;
             }
             defaultOut = function defaultOut(err) {
@@ -268,13 +258,10 @@ function createApp() {
                 res.send(JSON.stringify(json));
               };
             }
-            _context4.next = 13;
+            _context4.n = 1;
             return app.handle(req, res, next || defaultOut);
-          case 13:
-            return _context4.abrupt("return", app);
-          case 14:
-          case "end":
-            return _context4.stop();
+          case 1:
+            return _context4.a(2, app);
         }
       }, _callee4);
     }));