wapplr 1.0.40 → 1.0.44

package/package.json

@@ -22,11 +22,11 @@
     "files": [
         "dist/*"
     ],
-    "version": "1.0.40",
+    "version": "1.0.44",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {
         "type": "git",
         "url": "https://github.com/wapplr/wapplr.git"
     }
-}
+}

package/dist/client/app.js

@@ -1,350 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = createApp;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _utils = require("../common/utils");
-
-function createApp() {
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var wapp = p.wapp;
-  var defaultConfig = Object.create(Object.prototype, {});
-  var defaultMiddlewares = [function next(req, res, next) {
-    if (next) {
-      return next();
-    }
-
-    return null;
-  }];
-
-  function defaultErrorHandler(err, req, res, next) {
-    var _app$wapp$log = app.wapp.log,
-        log = _app$wapp$log === void 0 ? function () {
-      return "";
-    } : _app$wapp$log;
-    res.status(500);
-    var text = log(err, req, res);
-
-    if (res.headersSent) {
-      if (next) {
-        return next(err);
-      }
-
-      return;
-    }
-
-    var config = wapp.client.config;
-    var _config$siteName = config.siteName,
-        siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName;
-    var renderedContent = wapp.log.renderedContent({
-      title: err.message + " | " + siteName,
-      text: text.split("\n")[0],
-      type: "content"
-    });
-    res.send(renderedContent);
-  }
-
-  function defaultHandle(_x, _x2, _x3) {
-    return _defaultHandle.apply(this, arguments);
-  }
-
-  function _defaultHandle() {
-    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(req, res, out) {
-      var middlewares, index, next, _next;
-
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _next = function _next3() {
-                _next = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(err) {
-                  var func, defaultArgs, args, requestMethod, requestUrl;
-                  return _regenerator["default"].wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                          if (!middlewares[index]) {
-                            _context2.next = 19;
-                            break;
-                          }
-
-                          func = middlewares[index];
-                          index = index + 1;
-                          defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                            return _regenerator["default"].wrap(function _callee$(_context) {
-                              while (1) {
-                                switch (_context.prev = _context.next) {
-                                  case 0:
-                                    _context.next = 2;
-                                    return next(err);
-
-                                  case 2:
-                                  case "end":
-                                    return _context.stop();
-                                }
-                              }
-                            }, _callee);
-                          })) : next];
-                          args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
-                          _context2.prev = 5;
-                          _context2.next = 8;
-                          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:
-                          if (!(typeof out === "function")) {
-                            _context2.next = 24;
-                            break;
-                          }
-
-                          index = 0;
-                          return _context2.abrupt("return", out(err));
-
-                        case 24:
-                          if (err) {
-                            index = 0;
-                            app.errorHandler(err, req, res, out);
-                          } else if (!res.headersSent) {
-                            index = 0;
-                            res.status(404);
-                            requestMethod = req.method;
-                            requestUrl = req.url;
-                            res.send(requestMethod + " " + requestUrl);
-                          }
-
-                        case 25:
-                          return _context2.abrupt("return", null);
-
-                        case 26:
-                        case "end":
-                          return _context2.stop();
-                      }
-                    }
-                  }, _callee2, null, [[5, 11]]);
-                }));
-                return _next.apply(this, arguments);
-              };
-
-              next = function _next2(_x4) {
-                return _next.apply(this, arguments);
-              };
-
-              middlewares = app.middlewares;
-              index = 0;
-              _context3.next = 6;
-              return next();
-
-            case 6:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 7:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }));
-    return _defaultHandle.apply(this, arguments);
-  }
-
-  function defaultUse(fn) {
-    var fns = typeof fn === "function" ? [fn] : typeof fn === "object" && fn.length ? fn : [];
-
-    if (fns.length === 0) {
-      throw new TypeError("app.use() requires a middleware function");
-    }
-
-    var middlewares = app.middlewares;
-    fns.forEach(function (fn, i) {
-      middlewares.push(fn);
-    });
-    return this;
-  }
-
-  var appProperties = Object.create(Object.prototype, {
-    config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      writable: false,
-      value: defaultConfig
-    }),
-    middlewares: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      writable: false,
-      value: defaultMiddlewares
-    }),
-    errorHandler: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultErrorHandler
-    }),
-    handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultHandle
-    }),
-    use: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultUse
-    })
-  });
-
-  function app() {
-    return _app.apply(this, arguments);
-  }
-
-  function _app() {
-    _app = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-      var req,
-          res,
-          next,
-          pathname,
-          search,
-          hash,
-          port,
-          fullUrl,
-          defaultOut,
-          _args4 = arguments;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            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 = 24;
-                break;
-              }
-
-              // these properties what usually there are in req and res
-              // req: path, url, hostname, protocol, secure, method, httpVersion,
-              // res: statusCode
-              // and a functions in res: status, send, end
-              pathname = window.location.pathname || "/";
-              search = window.location.search;
-              hash = window.location.hash;
-              port = window.location.port && !isNaN(Number(window.location.port)) ? Number(window.location.port) : window.location.port;
-              req.path = req.path || window.location.pathname || "/";
-              req.url = req.url || pathname + hash + search;
-              req.hostname = req.hostname || port ? window.location.hostname + ":" + port : window.location.hostname;
-              req.protocol = req.protocol || window.location.protocol.slice(0, window.location.protocol.length - 1);
-              req.secure = req.secure || req.protocol === "https";
-              req.method = req.method || "GET";
-              req.httpVersion = req.httpVersion || "1.1";
-
-              if (!req.query) {
-                try {
-                  fullUrl = req.protocol + "://" + req.hostname + req.url;
-                  req.query = Object.fromEntries(new URL(fullUrl).searchParams);
-                } catch (e) {}
-              }
-
-              res.statusCode = res.statusCode ? res.statusCode : 200;
-
-              res.status = res.status || function (sc) {
-                res.statusCode = sc;
-                return res;
-              };
-
-              res.send = res.send || function (html) {
-                res.end(html);
-              };
-
-              res.end = res.end || function (html) {
-                if (!res.headersSent) {
-                  Object.defineProperty(res, "headersSent", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-                    enumerable: false,
-                    writable: false,
-                    value: true
-                  }));
-                  res.container.innerHTML = html;
-                  var scripts = res.container.getElementsByTagName("script");
-
-                  var _iterator = (0, _createForOfIteratorHelper2["default"])(scripts),
-                      _step;
-
-                  try {
-                    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                      var script = _step.value;
-                      var parent = script.parentElement;
-                      var innerHTML = script.innerHTML;
-                      parent.removeChild(script);
-                      var newScript = document.createElement("script");
-                      newScript.type = "text/javascript";
-                      newScript.innerHTML = innerHTML;
-                      parent.append(newScript);
-                    }
-                  } catch (err) {
-                    _iterator.e(err);
-                  } finally {
-                    _iterator.f();
-                  }
-                } else {//throw Error
-                }
-              }; // res.container (Html element) property are plus thing, usually there is not in the response
-              // but is necessary for end render
-
-
-              res.container = res.container || document.body;
-
-              defaultOut = function defaultOut(err) {
-                if (err) {
-                  return app.errorHandler(err, req, res);
-                }
-
-                var requestMethod = req.method;
-                var requestUrl = req.url;
-
-                if (!res.headersSent) {
-                  res.send(requestMethod + " " + requestUrl);
-                }
-              };
-
-              _context4.next = 24;
-              return app.handle(req, res, next || defaultOut);
-
-            case 24:
-              return _context4.abrupt("return", app);
-
-            case 25:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4);
-    }));
-    return _app.apply(this, arguments);
-  }
-
-  (0, _utils.mergeProperties)(app, appProperties);
-  Object.defineProperty(app, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-    writable: false,
-    enumerable: false,
-    value: wapp
-  }));
-  return app;
-}

package/dist/client/config.js

@@ -1,30 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = getConfig;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _config = _interopRequireDefault(require("../common/config"));
-
-function getConfig() {
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _p$config = p.config,
-      config = _p$config === void 0 ? {} : _p$config;
-  var clientConfig = config.client || {};
-  var commonConfig = (0, _config["default"])(p).config;
-  var globals = (0, _objectSpread2["default"])({}, commonConfig.globals);
-  var common = (0, _objectSpread2["default"])({}, commonConfig.common);
-  var client = (0, _objectSpread2["default"])({}, clientConfig);
-  return {
-    config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, config), {}, {
-      globals: globals,
-      common: common,
-      client: client
-    })
-  };
-}

package/dist/client/createClient.js

@@ -1,245 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = createClient;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _common = _interopRequireDefault(require("../common"));
-
-var _app = _interopRequireDefault(require("./app"));
-
-var _history = _interopRequireDefault(require("./history"));
-
-var _middlewares = _interopRequireDefault(require("./middlewares"));
-
-var _config = _interopRequireDefault(require("./config"));
-
-var _utils = require("../common/utils");
-
-var _excluded = ["disableUseDefaultMiddlewares"];
-
-function createClient() {
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var wapp = p.wapp || (0, _common["default"])(p);
-
-  var _createConfig = (0, _config["default"])(p),
-      config = _createConfig.config;
-
-  var clientConfig = config.client || {};
-  var _clientConfig$disable = clientConfig.disableUseDefaultMiddlewares,
-      disableUseDefaultMiddlewares = _clientConfig$disable === void 0 ? false : _clientConfig$disable,
-      rest = (0, _objectWithoutProperties2["default"])(clientConfig, _excluded);
-  var defaultConfig = Object.create(Object.prototype, {
-    disableUseDefaultMiddlewares: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: disableUseDefaultMiddlewares
-    })
-  });
-  (0, _utils.mergeProperties)(defaultConfig, wapp.config);
-  (0, _utils.mergeProperties)(defaultConfig, rest);
-  var app = (0, _app["default"])({
-    wapp: wapp
-  });
-  var history = (0, _history["default"])({
-    wapp: wapp
-  });
-
-  function defaultListen() {
-    wapplrClient.close();
-    wapplrClient.history.listen(function (_ref) {
-      var action = _ref.action,
-          location = _ref.location;
-      wapplrClient.app({
-        history: {
-          action: action,
-          location: location
-        }
-      });
-    });
-    wapplrClient.app({
-      history: {
-        action: "POP",
-        location: history.location
-      }
-    }, {}, function out() {
-      var globals = wapp.globals;
-      var WAPP = globals.WAPP;
-      setTimeout(function () {
-        var elem = document.getElementById("css_" + WAPP);
-
-        if (elem) {
-          elem.parentNode.removeChild(elem);
-        }
-      }, 2000);
-    });
-  }
-
-  function defaultClose() {
-    wapplrClient.history.close();
-  }
-
-  var defaultMiddlewares = (0, _middlewares["default"])((0, _objectSpread2["default"])({
-    wapp: wapp
-  }, p));
-  var wapplrClient = Object.create(Object.prototype, {
-    config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      writable: false,
-      value: defaultConfig
-    }),
-    listen: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultListen
-    }),
-    close: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultClose
-    }),
-    history: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: history
-    }),
-    app: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: app
-    }),
-    middlewares: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultMiddlewares
-    })
-  });
-  Object.defineProperty(wapplrClient, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-    writable: false,
-    enumerable: false,
-    value: wapp
-  }));
-  Object.defineProperty(wapp, "client", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-    value: wapplrClient
-  }));
-  app.use( /*#__PURE__*/function () {
-    var _defaultMiddlewaresWrapper = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(req, res, out) {
-      var next, middlewares, index;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (wapplrClient.config.disableUseDefaultMiddlewares) {
-                _context3.next = 7;
-                break;
-              }
-
-              next = /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(err) {
-                  var func, defaultArgs, args;
-                  return _regenerator["default"].wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                          if (!middlewares[index]) {
-                            _context2.next = 19;
-                            break;
-                          }
-
-                          func = middlewares[index];
-                          index = index + 1;
-                          defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                            return _regenerator["default"].wrap(function _callee$(_context) {
-                              while (1) {
-                                switch (_context.prev = _context.next) {
-                                  case 0:
-                                    _context.next = 2;
-                                    return next(err);
-
-                                  case 2:
-                                  case "end":
-                                    return _context.stop();
-                                }
-                              }
-                            }, _callee);
-                          })) : next];
-                          args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
-                          _context2.prev = 5;
-                          _context2.next = 8;
-                          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.wappResponse.status(500, _context2.t0);
-                          _context2.next = 16;
-                          return next(_context2.t0);
-
-                        case 16:
-                          return _context2.abrupt("return", _context2.sent);
-
-                        case 17:
-                          _context2.next = 22;
-                          break;
-
-                        case 19:
-                          if (!(typeof out === "function")) {
-                            _context2.next = 22;
-                            break;
-                          }
-
-                          index = 0;
-                          return _context2.abrupt("return", out(err));
-
-                        case 22:
-                          return _context2.abrupt("return", null);
-
-                        case 23:
-                        case "end":
-                          return _context2.stop();
-                      }
-                    }
-                  }, _callee2, null, [[5, 11]]);
-                }));
-
-                return function next(_x4) {
-                  return _ref2.apply(this, arguments);
-                };
-              }();
-
-              middlewares = Object.keys(wapplrClient.middlewares).map(function (key) {
-                return wapplrClient.middlewares[key];
-              });
-              index = 0;
-              _context3.next = 6;
-              return next();
-
-            case 6:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 7:
-              _context3.next = 9;
-              return out();
-
-            case 9:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 10:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }));
-
-    function defaultMiddlewaresWrapper(_x, _x2, _x3) {
-      return _defaultMiddlewaresWrapper.apply(this, arguments);
-    }
-
-    return defaultMiddlewaresWrapper;
-  }());
-  return wapp;
-}