wapplr 1.0.75 → 1.0.77

package/dist/common/contents.js

@@ -1,116 +1,96 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createContents;
-
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-
+var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _utils = require("./utils");
-
 function createDefaultContentManager() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp;
-
   function defaultResolve() {
     return _defaultResolve.apply(this, arguments);
   }
-
   function _defaultResolve() {
     _defaultResolve = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
       var p,
-          route,
-          wapp,
-          req,
-          res,
-          contentName,
-          contents,
-          content,
-          _args = arguments;
+        route,
+        wapp,
+        req,
+        res,
+        contentName,
+        contents,
+        content,
+        _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] : {};
-              route = p.route, wapp = p.wapp, req = p.req, res = p.res;
-              contentName = route.contentName;
-              contents = contentManager.contents;
-              content = contentName && contents[contentName] ? (0, _objectSpread2["default"])({}, contents[contentName]) : null;
-
-              if (!contentManager.firstRequest) {
-                _context.next = 8;
-                break;
-              }
-
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            route = p.route, wapp = p.wapp, req = p.req, res = p.res;
+            contentName = route.contentName;
+            contents = contentManager.contents;
+            content = contentName && contents[contentName] ? (0, _objectSpread2["default"])({}, contents[contentName]) : null;
+            if (!contentManager.firstRequest) {
               _context.next = 8;
-              return contentManager.firstRequest({
-                wapp: wapp,
-                req: req,
-                res: res
-              });
-
-            case 8:
-              if (!(content && content.request)) {
-                _context.next = 11;
-                break;
-              }
-
+              break;
+            }
+            _context.next = 8;
+            return contentManager.firstRequest({
+              wapp: wapp,
+              req: req,
+              res: res
+            });
+          case 8:
+            if (!(content && content.request)) {
               _context.next = 11;
-              return content.request({
-                wapp: wapp,
-                req: req,
-                res: res
-              });
-
-            case 11:
-              return _context.abrupt("return", content);
-
-            case 12:
-            case "end":
-              return _context.stop();
-          }
+              break;
+            }
+            _context.next = 11;
+            return content.request({
+              wapp: wapp,
+              req: req,
+              res: res
+            });
+          case 11:
+            return _context.abrupt("return", content);
+          case 12:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
     return _defaultResolve.apply(this, arguments);
   }
-
   function getTitle(_ref) {
     var wapp = _ref.wapp,
-        res = _ref.res;
+      res = _ref.res;
     var config = wapp.getTargetObject().config;
     var _config$siteName = config.siteName,
-        siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName;
+      siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName;
     var _res$wappResponse = res.wappResponse,
-        statusCode = _res$wappResponse.statusCode,
-        statusMessage = _res$wappResponse.statusMessage,
-        errorMessage = _res$wappResponse.errorMessage;
+      statusCode = _res$wappResponse.statusCode,
+      statusMessage = _res$wappResponse.statusMessage,
+      errorMessage = _res$wappResponse.errorMessage;
     var title = "Home";
-
     if (statusCode === 404) {
       title = statusMessage || "Not found";
     }
-
     if (statusCode === 500) {
       title = errorMessage || statusMessage || "Internal Server Error";
     }
-
     return title + " | " + siteName;
   }
-
   var defaultContentValues = Object.create(Object.prototype, {
     render: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: function render(_ref2) {
         var wapp = _ref2.wapp,
-            req = _ref2.req,
-            res = _ref2.res;
+          req = _ref2.req,
+          res = _ref2.res;
         return wapp.log.render({
           wapp: wapp,
           req: req,
@@ -121,8 +101,8 @@ function createDefaultContentManager() {
     title: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: function title(_ref3) {
         var wapp = _ref3.wapp,
-            req = _ref3.req,
-            res = _ref3.res;
+          req = _ref3.req,
+          res = _ref3.res;
         return getTitle({
           wapp: wapp,
           req: req,
@@ -133,8 +113,8 @@ function createDefaultContentManager() {
     description: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: function description(_ref4) {
         var wapp = _ref4.wapp,
-            req = _ref4.req,
-            res = _ref4.res;
+          req = _ref4.req,
+          res = _ref4.res;
         var config = wapp.getTargetObject().config;
         var description = config.description;
         return description ? description : getTitle({
@@ -149,8 +129,8 @@ function createDefaultContentManager() {
         var wapp = _ref5.wapp;
         var config = wapp.getTargetObject().config;
         var author = config.author,
-            _config$siteName2 = config.siteName,
-            siteName = _config$siteName2 === void 0 ? "Wapplr" : _config$siteName2;
+          _config$siteName2 = config.siteName,
+          siteName = _config$siteName2 === void 0 ? "Wapplr" : _config$siteName2;
         return author ? author : siteName;
       }
     })
@@ -160,12 +140,10 @@ function createDefaultContentManager() {
       value: defaultContentValues
     })
   });
-
   function defaultAdd(obj) {
     if (typeof obj === "object" && !obj.length) {
       Object.keys(obj).forEach(function (contentName) {
         var content = obj[contentName];
-
         if (typeof content == "object" && content.render) {
           var tempContent = contentManager.contents[contentName] || defaultContentValues;
           contentManager.contents[contentName] = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, tempContent), content);
@@ -173,29 +151,23 @@ function createDefaultContentManager() {
       });
     }
   }
-
   function defaultGet(contentName) {
     return contentManager.contents[contentName];
   }
-
   var defaultComponents = Object.create(Object.prototype, {});
-
   function defaultAddComponent(obj) {
     if (typeof obj === "object" && !obj.length) {
       Object.keys(obj).forEach(function (componentName) {
         var component = obj[componentName];
-
         if (typeof component !== "undefined") {
           contentManager.components[componentName] = component;
         }
       });
     }
   }
-
   function defaultGetComponent(componentName) {
     return contentManager.components[componentName];
   }
-
   var contentManager = Object.create(Object.prototype, {
     wapp: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       writable: false,
@@ -231,70 +203,56 @@ function createDefaultContentManager() {
   });
   return contentManager;
 }
-
 function createContents() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp,
-      _p$contentManager = p.contentManager,
-      contentManager = _p$contentManager === void 0 ? createDefaultContentManager(p) : _p$contentManager;
-
+    _p$contentManager = p.contentManager,
+    contentManager = _p$contentManager === void 0 ? createDefaultContentManager(p) : _p$contentManager;
   function defaultHandle(_x, _x2, _x3) {
     return _defaultHandle.apply(this, arguments);
   }
-
   function _defaultHandle() {
     _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(req, res, next) {
       var contentRes;
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (res.wappResponse.content) {
-                _context2.next = 5;
-                break;
-              }
-
-              contentRes = contentsMiddleware.contentManager.resolve;
-              _context2.next = 4;
-              return contentRes({
-                route: res.wappResponse.route,
-                wapp: wapp,
-                req: req,
-                res: res
-              });
-
-            case 4:
-              res.wappResponse.content = _context2.sent;
-
-            case 5:
-              return _context2.abrupt("return", next());
-
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (res.wappResponse.content) {
+              _context2.next = 5;
+              break;
+            }
+            contentRes = contentsMiddleware.contentManager.resolve;
+            _context2.next = 4;
+            return contentRes({
+              route: res.wappResponse.route,
+              wapp: wapp,
+              req: req,
+              res: res
+            });
+          case 4:
+            res.wappResponse.content = _context2.sent;
+          case 5:
+            return _context2.abrupt("return", next());
+          case 6:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
     return _defaultHandle.apply(this, arguments);
   }
-
   function defaultAdd(p) {
     return contentsMiddleware.contentManager.add(p);
   }
-
   function defaultGet(p) {
     return contentsMiddleware.contentManager.get(p);
   }
-
   function defaultAddComponent(p) {
     return contentsMiddleware.contentManager.addComponent(p);
   }
-
   function defaultGetComponent(p) {
     return contentsMiddleware.contentManager.getComponent(p);
   }
-
   var contentsMiddlewareProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -315,41 +273,32 @@ function createContents() {
       value: defaultGetComponent
     })
   });
-
   function contentsMiddleware(_x4, _x5, _x6) {
     return _contentsMiddleware.apply(this, arguments);
   }
-
   function _contentsMiddleware() {
     _contentsMiddleware = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, next) {
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!(typeof contentsMiddleware.handle === "function")) {
-                _context3.next = 4;
-                break;
-              }
-
-              _context3.next = 3;
-              return contentsMiddleware.handle(req, res, next);
-
-            case 3:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 4:
-              return _context3.abrupt("return", contentsMiddleware);
-
-            case 5:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(typeof contentsMiddleware.handle === "function")) {
+              _context3.next = 4;
+              break;
+            }
+            _context3.next = 3;
+            return contentsMiddleware.handle(req, res, next);
+          case 3:
+            return _context3.abrupt("return", _context3.sent);
+          case 4:
+            return _context3.abrupt("return", contentsMiddleware);
+          case 5:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }));
     return _contentsMiddleware.apply(this, arguments);
   }
-
   (0, _utils.mergeProperties)(contentsMiddleware, contentsMiddlewareProperties);
   Object.defineProperty(contentsMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,

package/dist/common/index.js

@@ -1,37 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createWapp;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _utils = require("./utils.js");
-
 var _config = _interopRequireDefault(require("./config"));
-
 var _excluded = ["containerElementId", "appStateName", "siteName", "description", "lang"];
-
 function createWapp() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
   var _getConfig = (0, _config["default"])(p),
-      _getConfig$config = _getConfig.config,
-      config = _getConfig$config === void 0 ? {} : _getConfig$config;
-
+    _getConfig$config = _getConfig.config,
+    config = _getConfig$config === void 0 ? {} : _getConfig$config;
   var commonConfig = config.common;
   var globalConfig = config.globals;
   var containerElementId = commonConfig.containerElementId,
-      appStateName = commonConfig.appStateName,
-      siteName = commonConfig.siteName,
-      description = commonConfig.description,
-      lang = commonConfig.lang,
-      rest = (0, _objectWithoutProperties2["default"])(commonConfig, _excluded);
+    appStateName = commonConfig.appStateName,
+    siteName = commonConfig.siteName,
+    description = commonConfig.description,
+    lang = commonConfig.lang,
+    rest = (0, _objectWithoutProperties2["default"])(commonConfig, _excluded);
   var defaultConfig = Object.create(Object.prototype, {
     containerElementId: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: containerElementId
@@ -71,12 +62,10 @@ function createWapp() {
     })
   });
   var defaultTarget = "undefined" == typeof window ? "node" : "web";
-
   var defaultGetTargetObject = function defaultGetTargetObject() {
     var target = wapp.target === "node" ? "server" : "client";
     return wapp[target];
   };
-
   var wapp = Object.create(Object.prototype, {
     config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       writable: false,

package/dist/common/log/index.js

@@ -1,71 +1,58 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createLog;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _utils = require("../utils");
-
 var _logo = _interopRequireDefault(require("../logo"));
-
 var _renderedContent = _interopRequireDefault(require("./renderedContent"));
-
 var _template = _interopRequireDefault(require("../template"));
-
 var style = require("./log_css.js")["default"];
-
 function createLog(_ref) {
   var wapp = _ref.wapp;
-
   function defaultRender() {
     var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var wapp = p.wapp,
-        req = p.req,
-        res = p.res,
-        _p$parent = p.parent,
-        parent = _p$parent === void 0 ? _template["default"] : _p$parent,
-        _p$logo = p.logo,
-        logo = _p$logo === void 0 ? _logo["default"] : _p$logo;
+      req = p.req,
+      res = p.res,
+      _p$parent = p.parent,
+      parent = _p$parent === void 0 ? _template["default"] : _p$parent,
+      _p$logo = p.logo,
+      logo = _p$logo === void 0 ? _logo["default"] : _p$logo;
     var styles = wapp.styles;
     var _req$wappRequest = req.wappRequest,
-        remoteAddress = _req$wappRequest.remoteAddress,
-        httpVersion = _req$wappRequest.httpVersion,
-        method = _req$wappRequest.method,
-        url = _req$wappRequest.url,
-        timestamp = _req$wappRequest.timestamp;
+      remoteAddress = _req$wappRequest.remoteAddress,
+      httpVersion = _req$wappRequest.httpVersion,
+      method = _req$wappRequest.method,
+      url = _req$wappRequest.url,
+      timestamp = _req$wappRequest.timestamp;
     var _res$wappResponse = res.wappResponse,
-        _res$wappResponse$sta = _res$wappResponse.statusCode,
-        statusCode = _res$wappResponse$sta === void 0 ? 200 : _res$wappResponse$sta,
-        _res$wappResponse$sta2 = _res$wappResponse.statusMessage,
-        statusMessage = _res$wappResponse$sta2 === void 0 ? "" : _res$wappResponse$sta2,
-        _res$wappResponse$err = _res$wappResponse.errorMessage,
-        errorMessage = _res$wappResponse$err === void 0 ? "" : _res$wappResponse$err;
+      _res$wappResponse$sta = _res$wappResponse.statusCode,
+      statusCode = _res$wappResponse$sta === void 0 ? 200 : _res$wappResponse$sta,
+      _res$wappResponse$sta2 = _res$wappResponse.statusMessage,
+      statusMessage = _res$wappResponse$sta2 === void 0 ? "" : _res$wappResponse$sta2,
+      _res$wappResponse$err = _res$wappResponse.errorMessage,
+      errorMessage = _res$wappResponse$err === void 0 ? "" : _res$wappResponse$err;
     var text = p.text || "[LOG] [".concat(timestamp, " - ").concat(remoteAddress, "] HTTP:").concat(httpVersion, " ").concat(method, " ").concat(url || "/", " -> [").concat(statusCode, "] ").concat(errorMessage || statusMessage);
     styles.use(style);
     var renderedLog = "\n            <div class=\"".concat(style.log, "\">\n                <div class=\"").concat(style.logo, "\">\n                    ").concat(logo ? logo({
       wapp: wapp
     }) : "", "\n                </div>\n                <div>").concat(text, "</div>\n            </div>");
-
     if (parent) {
       return parent((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, p), {}, {
         children: renderedLog
       }));
     }
-
     return renderedLog;
   }
-
   function defaultHandle(a, b, c, d) {
     var error = null;
     var req = a;
     var res = b;
     var next = null;
-
     if (arguments.length === 3) {
       if (typeof c === "function") {
         next = c;
@@ -80,22 +67,20 @@ function createLog(_ref) {
       res = c;
       next = d;
     }
-
     var _req$wappRequest2 = req.wappRequest,
-        httpVersion = _req$wappRequest2.httpVersion,
-        method = _req$wappRequest2.method,
-        url = _req$wappRequest2.url,
-        remoteAddress = _req$wappRequest2.remoteAddress,
-        _req$wappRequest2$tim = _req$wappRequest2.timestamp,
-        timestamp = _req$wappRequest2$tim === void 0 ? Date.now() : _req$wappRequest2$tim;
+      httpVersion = _req$wappRequest2.httpVersion,
+      method = _req$wappRequest2.method,
+      url = _req$wappRequest2.url,
+      remoteAddress = _req$wappRequest2.remoteAddress,
+      _req$wappRequest2$tim = _req$wappRequest2.timestamp,
+      timestamp = _req$wappRequest2$tim === void 0 ? Date.now() : _req$wappRequest2$tim;
     var _res$wappResponse2 = res.wappResponse,
-        _res$wappResponse2$st = _res$wappResponse2.statusCode,
-        statusCode = _res$wappResponse2$st === void 0 ? "" : _res$wappResponse2$st,
-        _res$wappResponse2$st2 = _res$wappResponse2.statusMessage,
-        statusMessage = _res$wappResponse2$st2 === void 0 ? "" : _res$wappResponse2$st2;
+      _res$wappResponse2$st = _res$wappResponse2.statusCode,
+      statusCode = _res$wappResponse2$st === void 0 ? "" : _res$wappResponse2$st,
+      _res$wappResponse2$st2 = _res$wappResponse2.statusMessage,
+      statusMessage = _res$wappResponse2$st2 === void 0 ? "" : _res$wappResponse2$st2;
     var errorMessage = error && error.stack ? error.stack : error && error.message ? error.message : typeof error == "string" ? error : "";
     var text = "[LOG] [".concat(timestamp, " - ").concat(remoteAddress, "] HTTP:").concat(httpVersion, " ").concat(method, " ").concat(url || "/", " -> [").concat(statusCode, "] ").concat(errorMessage || statusMessage);
-
     if (res._consoledResponse !== text) {
       Object.defineProperty(res, "_consoledResponse", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
         enumerable: false,
@@ -103,14 +88,11 @@ function createLog(_ref) {
       }));
       console.log(text);
     }
-
     if (next) {
       return next(error);
     }
-
     return text;
   }
-
   var logProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -122,15 +104,12 @@ function createLog(_ref) {
       value: _renderedContent["default"]
     })
   });
-
   function logMiddleware(err, req, res, next) {
     if (typeof logMiddleware.handle === "function") {
       return logMiddleware.handle.apply(logMiddleware, arguments);
     }
-
     return logMiddleware;
   }
-
   (0, _utils.mergeProperties)(logMiddleware, logProperties);
   Object.defineProperty(logMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,