wapplr 1.0.74 → 1.0.76

package/dist/common/log/renderedContent.js

@@ -1,109 +1,96 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = renderedContent;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var defaultTemplateStyle = require("./../template/template_css.js")["default"];
-
 var defaultAppStyle = require("./../template/app_css.js")["default"];
-
 var defaultLogoStyle = require("./../logo/logo_css.js")["default"];
-
 var defaultLogStyle = require("./log_css.js")["default"];
-
 function getLogo(p) {
   var logoStyle = p.logoStyle;
   return "<div class=\"".concat(logoStyle.logo, "\">\n    <div class=\"").concat(logoStyle.icon, "\">\n        <svg class=\"").concat(logoStyle.svg, "\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 252 211.72\">\n            <path d=\"M15.52,246.7c13-22.86,26-45.68,38.85-68.57Q86.31,121.39,118.19,64.6a17.15,17.15,0,0,1,5.74-5.9c11.18-6.91,22.53-13.55,33.83-20.27,1.07-.63,2.19-1.17,4.63-2.46L57.52,222.7h210v1c-6.78,3.79-13.62,7.48-20.32,11.41-7,4.08-13.8,8.38-20.68,12.59q-103.26,0-206.52,0A21.71,21.71,0,0,1,15.52,246.7Z\" transform=\"translate(-15.52 -35.97)\" />\n            <path d=\"M225.94,198.17c-9.24,0-17.66.1-26.07-.12-1.11,0-2.57-1.41-3.21-2.53q-23.55-41.67-46.87-83.45a5.41,5.41,0,0,1-.16-4.4c3.89-7.34,8.06-14.52,12.67-22.72Z\" transform=\"translate(-15.52 -35.97)\" />\n        </svg>\n    </div>\n</div>");
 }
-
 function getStyle(p) {
   var type = p.type,
-      templateStyle = p.templateStyle,
-      appStyle = p.appStyle,
-      logoStyle = p.logoStyle,
-      logStyle = p.logStyle;
+    templateStyle = p.templateStyle,
+    appStyle = p.appStyle,
+    logoStyle = p.logoStyle,
+    logStyle = p.logStyle;
   return "<style ".concat(type === "content" ? "scoped" : "", ">").concat(templateStyle._getCss(), " ").concat(appStyle._getCss(), " ").concat(logoStyle._getCss(), " ").concat(logStyle._getCss(), " </style>");
 }
-
 function getContent(p) {
   var templateStyle = p.templateStyle,
-      logStyle = p.logStyle,
-      text = p.text,
-      copyright = p.copyright,
-      toConsole = p.toConsole,
-      logo = p.logo,
-      footerMenu = p.footerMenu;
+    logStyle = p.logStyle,
+    text = p.text,
+    copyright = p.copyright,
+    toConsole = p.toConsole,
+    logo = p.logo,
+    footerMenu = p.footerMenu;
   return "<div class=\"".concat(templateStyle.page, "\">\n                <div class=\"").concat(templateStyle.header, "\">\n                    <div class=\"").concat(templateStyle.innerHeader, "\">\n                        <div class=\"").concat(templateStyle.logo, "\">\n                            ").concat(logo, "\n                        </div>\n                    </div>\n                </div>\n                <div class=\"").concat(templateStyle.content, "\">\n                    <div class=\"").concat(logStyle.log, "\">\n                        <div class=\"").concat(logStyle.logo, "\">\n                            ").concat(logo, "\n                        </div>\n                    <div>").concat(text, "</div>\n                    </div>\n                </div>\n                <div class=\"").concat(templateStyle.footer, "\">\n                    <div>\n                        <div class=\"").concat(templateStyle.menu, "\">\n                            ").concat(footerMenu, "\n                        </div>\n                        <div class=\"").concat(templateStyle.copyright, "\">").concat(copyright, "</div>\n                    </div>\n                </div>\n                <script>\n                window.addEventListener(\"scroll\", function (e) {\n                    const header = document.body.querySelector(\".").concat(templateStyle.header, "\");\n                    if (header){\n                        header.classList.toggle(\"").concat(templateStyle.sticky, "\", window.scrollY > 0 )\n                    }\n                });\n                if (").concat(typeof toConsole === "string", "){\n                    console.log(`").concat(toConsole, "`);\n                }\n                </script>\n            </div>");
 }
-
 function getHtml(p) {
   var title = p.title,
-      style = p.style,
-      content = p.content,
-      appStyle = p.appStyle;
+    style = p.style,
+    content = p.content,
+    appStyle = p.appStyle;
   return "<html lang=\"en\">\n    <head>\n        <meta charSet=\"utf-8\"/>\n        <title>".concat(title, "</title>\n        <meta name=\"description\" content=\"").concat(title.split(" | ")[0], "\"/>\n        <meta name=\"author\" content=\"Wapplr\"/>\n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n        <link rel=\"icon\" href=\"data:image/png;base64,iVBORw0KGgo=\"/>\n        ").concat(style, "\n    </head>\n    <body>\n        <div class=\"").concat(appStyle.app, "\" id=\"wapplr-container-element-id-buildHash\">\n            ").concat(content, "\n        </div>\n    </body>\n</html>\n");
 }
-
 function renderedContent() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var _p$templateStyle = p.templateStyle,
-      templateStyle = _p$templateStyle === void 0 ? defaultTemplateStyle : _p$templateStyle,
-      _p$appStyle = p.appStyle,
-      appStyle = _p$appStyle === void 0 ? defaultAppStyle : _p$appStyle,
-      _p$logoStyle = p.logoStyle,
-      logoStyle = _p$logoStyle === void 0 ? defaultLogoStyle : _p$logoStyle,
-      _p$logStyle = p.logStyle,
-      logStyle = _p$logStyle === void 0 ? defaultLogStyle : _p$logStyle;
+    templateStyle = _p$templateStyle === void 0 ? defaultTemplateStyle : _p$templateStyle,
+    _p$appStyle = p.appStyle,
+    appStyle = _p$appStyle === void 0 ? defaultAppStyle : _p$appStyle,
+    _p$logoStyle = p.logoStyle,
+    logoStyle = _p$logoStyle === void 0 ? defaultLogoStyle : _p$logoStyle,
+    _p$logStyle = p.logStyle,
+    logStyle = _p$logStyle === void 0 ? defaultLogStyle : _p$logStyle;
   var _p$title = p.title,
-      title = _p$title === void 0 ? "Log | Wapplr" : _p$title,
-      _p$text = p.text,
-      text = _p$text === void 0 ? "[" + Date.now() + " - ::1] HTTP:1.1 GET / - [200]" : _p$text,
-      _p$copyright = p.copyright,
-      copyright = _p$copyright === void 0 ? "Wapplr ".concat(new Date().getFullYear(), " \xA9") : _p$copyright,
-      _p$toConsole = p.toConsole,
-      toConsole = _p$toConsole === void 0 ? false : _p$toConsole,
-      _p$logo = p.logo,
-      logo = _p$logo === void 0 ? getLogo((0, _objectSpread2["default"])({
-    logoStyle: logoStyle
-  }, p)) : _p$logo,
-      _p$footerMenu = p.footerMenu,
-      footerMenu = _p$footerMenu === void 0 ? "" : _p$footerMenu,
-      _p$type = p.type,
-      type = _p$type === void 0 ? "" : _p$type;
+    title = _p$title === void 0 ? "Log | Wapplr" : _p$title,
+    _p$text = p.text,
+    text = _p$text === void 0 ? "[" + Date.now() + " - ::1] HTTP:1.1 GET / - [200]" : _p$text,
+    _p$copyright = p.copyright,
+    copyright = _p$copyright === void 0 ? "Wapplr ".concat(new Date().getFullYear(), " \xA9") : _p$copyright,
+    _p$toConsole = p.toConsole,
+    toConsole = _p$toConsole === void 0 ? false : _p$toConsole,
+    _p$logo = p.logo,
+    logo = _p$logo === void 0 ? getLogo((0, _objectSpread2["default"])({
+      logoStyle: logoStyle
+    }, p)) : _p$logo,
+    _p$footerMenu = p.footerMenu,
+    footerMenu = _p$footerMenu === void 0 ? "" : _p$footerMenu,
+    _p$type = p.type,
+    type = _p$type === void 0 ? "" : _p$type;
   var _p$style = p.style,
-      style = _p$style === void 0 ? getStyle((0, _objectSpread2["default"])({
-    templateStyle: templateStyle,
-    appStyle: appStyle,
-    logoStyle: logoStyle,
-    logStyle: logStyle
-  }, p)) : _p$style,
-      _p$content = p.content,
-      content = _p$content === void 0 ? getContent((0, _objectSpread2["default"])({
-    templateStyle: templateStyle,
-    logStyle: logStyle,
-    text: text,
-    copyright: copyright,
-    toConsole: toConsole,
-    logo: logo,
-    footerMenu: footerMenu
-  }, p)) : _p$content;
-
+    style = _p$style === void 0 ? getStyle((0, _objectSpread2["default"])({
+      templateStyle: templateStyle,
+      appStyle: appStyle,
+      logoStyle: logoStyle,
+      logStyle: logStyle
+    }, p)) : _p$style,
+    _p$content = p.content,
+    content = _p$content === void 0 ? getContent((0, _objectSpread2["default"])({
+      templateStyle: templateStyle,
+      logStyle: logStyle,
+      text: text,
+      copyright: copyright,
+      toConsole: toConsole,
+      logo: logo,
+      footerMenu: footerMenu
+    }, p)) : _p$content;
   if (type === "content") {
     return "".concat(content, " ").concat(style);
   }
-
   var _p$html = p.html,
-      html = _p$html === void 0 ? getHtml((0, _objectSpread2["default"])({
-    title: title,
-    style: style,
-    content: content,
-    appStyle: appStyle
-  }, p)) : _p$html;
+    html = _p$html === void 0 ? getHtml((0, _objectSpread2["default"])({
+      title: title,
+      style: style,
+      content: content,
+      appStyle: appStyle
+    }, p)) : _p$html;
   return html;
 }

package/dist/common/logo/index.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = logo;
-
 var style = require("./logo_css.js")["default"];
-
 function logo(_ref) {
   var wapp = _ref.wapp;
   var styles = wapp.styles;

package/dist/common/middlewares.js

@@ -1,78 +1,60 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createMiddlewares;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _log = _interopRequireDefault(require("./log"));
-
 var _states = _interopRequireDefault(require("./states"));
-
 var _requests = _interopRequireDefault(require("./requests"));
-
 var _router = _interopRequireDefault(require("./router"));
-
 var _contents = _interopRequireDefault(require("./contents"));
-
 var _styles = _interopRequireDefault(require("./styles"));
-
 var _utils = require("./utils");
-
 function createWappMiddleware() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp;
-
   function defaultAddHandle(obj) {
     if (typeof obj === "object" && !obj.length) {
       Object.keys(obj).forEach(function (handleName) {
         var handle = obj[handleName];
-
         if (typeof handle == "function") {
           wappMiddleware.handles[handleName] = handle;
         }
       });
     }
   }
-
   function defaultWappMiddleware(req, res, next) {
     var globals = wapp.globals;
     var DEV = globals.DEV;
     var config = wapp.getTargetObject().config;
     var _config$containerElem = config.containerElementId,
-        containerElementId = _config$containerElem === void 0 ? "app" : _config$containerElem,
-        _config$appStateName = config.appStateName,
-        appStateName = _config$appStateName === void 0 ? "APP_STATE" : _config$appStateName;
+      containerElementId = _config$containerElem === void 0 ? "app" : _config$containerElem,
+      _config$appStateName = config.appStateName,
+      appStateName = _config$appStateName === void 0 ? "APP_STATE" : _config$appStateName;
     var container = null;
-
     if (typeof document !== "undefined") {
       container = containerElementId && document.getElementById(containerElementId) ? document.getElementById(containerElementId) : res.container ? res.container : document.body;
-
       if (DEV) {
         window.wapp = wapp;
       }
-    } // these properties are plus things, usually there are not in request or response
-    // timestamp, remoteAddress, container (Html Element on the client side)
+    }
 
+    // these properties are plus things, usually there are not in request or response
+    // timestamp, remoteAddress, container (Html Element on the client side)
 
     if (!req.timestamp) {
       req.timestamp = Date.now();
     }
-
     if (!req.remoteAddress) {
       req.remoteAddress = (req.headers && req.headers["x-forwarded-for"] || "").split(",").pop().trim() || req.socket && req.socket.remoteAddress || "::1";
     }
-
     if (wapp.target === "web" && container) {
       res.container = container;
     }
-
     var wappRequest = {};
     var wappResponse = {};
     wappRequest.timestamp = req.timestamp;
@@ -140,7 +122,6 @@ function createWappMiddleware() {
       writable: false,
       value: wappResponse
     }));
-
     wappResponse.status = function status() {
       if (!wappResponse.sended) {
         var http1 = wappRequest.httpVersion === "1.1" || wappRequest.httpVersion && Number(wappRequest.httpVersion.split(".")[0]) === 1;
@@ -150,29 +131,23 @@ function createWappMiddleware() {
         var error = arguments.length <= 1 ? undefined : arguments[1];
         var isError = !!(error && error.message && error.stack);
         wappResponse.statusCode = statusCode;
-
         if (statusCode) {
           if (statusCode === 200) {
             wappResponse.statusMessage = tempStatusCode === 200 && tempStatusMessage ? tempStatusMessage : "OK";
           }
-
           if (statusCode === 304) {
             wappResponse.statusMessage = tempStatusCode === 304 && tempStatusMessage ? tempStatusMessage : "Not modified";
           }
-
           if (statusCode === 404) {
             wappResponse.statusMessage = tempStatusCode === 404 && tempStatusMessage ? tempStatusMessage : "Not found";
           }
-
           if (statusCode === 500) {
             wappResponse.statusMessage = isError && error.message ? error.name + ": " + error.message : tempStatusCode === 500 && tempStatusMessage ? tempStatusMessage : "Error: Internal Server Error";
           }
-
           if (http1) {
             res.statusMessage = wappResponse.statusMessage;
           }
         }
-
         if (wappResponse.store) {
           if (wappResponse.store.getState("res.statusCode") !== wappResponse.statusCode) {
             wappResponse.store.dispatch(wapp.states.runAction("res", {
@@ -180,14 +155,12 @@ function createWappMiddleware() {
               value: wappResponse.statusCode
             }));
           }
-
           if (wappResponse.store.getState("res.statusMessage") !== wappResponse.statusMessage) {
             wappResponse.store.dispatch(wapp.states.runAction("res", {
               name: "statusMessage",
               value: wappResponse.statusMessage
             }));
           }
-
           if (wappResponse.store.getState("res.errorMessage") !== wappResponse.errorMessage) {
             wappResponse.store.dispatch(wapp.states.runAction("res", {
               name: "errorMessage",
@@ -195,28 +168,23 @@ function createWappMiddleware() {
             }));
           }
         }
-
         return res.status.apply(res, arguments);
       }
     };
-
     wappResponse.send = function send() {
       if (!wappResponse.sended) {
         for (var _len = arguments.length, attributes = new Array(_len), _key = 0; _key < _len; _key++) {
           attributes[_key] = arguments[_key];
         }
-
         var html = attributes[0],
-            restAttr = attributes.slice(1);
+          restAttr = attributes.slice(1);
         wappResponse.sendData = {
           data: html
         };
         wappMiddleware.runSendMiddlewares(req, res, function next() {
           var _wappResponse$sendDat;
-
           var endHtml = ((_wappResponse$sendDat = wappResponse.sendData) === null || _wappResponse$sendDat === void 0 ? void 0 : _wappResponse$sendDat.data) || "";
           var callback = restAttr[0];
-
           if (typeof callback === 'function') {
             res.send.apply(res, [endHtml, function () {
               callback();
@@ -228,47 +196,38 @@ function createWappMiddleware() {
         });
       }
     };
-
     Object.defineProperty(res, "_originalEndFunction", {
       enumerable: false,
       writable: false,
       configurable: false,
       value: res.end
     });
-
     res.end = function () {
       res._originalEndFunction.apply(res, arguments);
-
       wappResponse.sended = true;
     };
-
     Object.defineProperty(res, "_originalStatusFunction", {
       enumerable: false,
       writable: false,
       configurable: false,
       value: res.status
     });
-
     res.status = function () {
       if (!wappResponse.sended) {
         res._originalStatusFunction.apply(res, arguments);
       }
     };
-
     if (wapp.globals.DEV) {
       wapp.wappResponse = wappResponse;
       wapp.wappRequest = wappRequest;
     }
-
     next();
   }
-
   function defaultHandle(req, res, out) {
     var handles = Object.keys(wappMiddleware.handles).sort().map(function (key) {
       return wappMiddleware.handles[key];
     });
     var index = 0;
-
     function next(err) {
       if (handles[index]) {
         var func = handles[index];
@@ -280,13 +239,10 @@ function createWappMiddleware() {
         index = 0;
         return out(err);
       }
-
       return null;
     }
-
     return next();
   }
-
   function defaultRunSendMiddlewares(req, res, out) {
     if (wappMiddleware.sendMiddlewares) {
       var next = function next() {
@@ -297,10 +253,8 @@ function createWappMiddleware() {
         } else if (typeof out == "function") {
           return out();
         }
-
         return null;
       };
-
       var sendMiddlewares = Object.keys(wappMiddleware.sendMiddlewares).map(function (key) {
         return wappMiddleware.sendMiddlewares[key];
       });
@@ -309,22 +263,18 @@ function createWappMiddleware() {
     } else if (typeof out == "function") {
       return out();
     }
-
     return null;
   }
-
   function defaultAddSendMiddleware(obj) {
     if (typeof obj === "object" && !obj.length) {
       Object.keys(obj).forEach(function (handleName) {
         var handle = obj[handleName];
-
         if (typeof handle == "function") {
           wappMiddleware.sendMiddlewares[handleName] = handle;
         }
       });
     }
   }
-
   var wappMiddlewareProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -347,15 +297,12 @@ function createWappMiddleware() {
       value: {}
     })
   });
-
   function wappMiddleware(req, res, next) {
     if (typeof wappMiddleware.handle === "function") {
       wappMiddleware.handle(req, res, next);
     }
-
     return wappMiddleware;
   }
-
   (0, _utils.mergeProperties)(wappMiddleware, wappMiddlewareProperties);
   Object.defineProperty(wappMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,
@@ -368,7 +315,6 @@ function createWappMiddleware() {
   }));
   return wappMiddleware;
 }
-
 function createMiddlewares(p) {
   return {
     wapp: createWappMiddleware(p),