wapplr 1.0.82 → 1.0.84

package/dist/common/log/log_css.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-const tokens = {"log":"log_3MWuJ","logo":"log_36siB"};
-tokens._getCss = function () {return `/* imported from log.css */ .log_3MWuJ { display: -ms-flexbox; display: flex; -ms-flex-direction: column; flex-direction: column; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; -webkit-box-sizing: border-box; box-sizing: border-box; padding: 16px; width: 100%; height: 100%; position: absolute; } .log_36siB { height: 128px; max-width: 100%; } .log_3MWuJ > div { width: 100%; text-align: center; } `;};
+const tokens = {"log":"log_3Wi9h","logo":"log_VkVt7"};
+tokens._getCss = function () {return `/* imported from log.css */ .log_3Wi9h { display: -ms-flexbox; display: flex; -ms-flex-direction: column; flex-direction: column; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; -webkit-box-sizing: border-box; box-sizing: border-box; padding: 16px; width: 100%; height: 100%; position: absolute; } .log_VkVt7 { height: 128px; max-width: 100%; } .log_3Wi9h > div { width: 100%; text-align: center; } `;};
 tokens._module = (typeof module !== "undefined") ? module : {id:"./common/log/log_css.js"};
 exports["default"] = tokens;

package/dist/common/logo/logo_css.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-const tokens = {"logo":"logo_d_fdf","icon":"logo_1Trfm","svg":"logo_X5kuq"};
-tokens._getCss = function () {return `/* imported from logo.css */ .logo_d_fdf { height: 100%; width: auto; display: -ms-inline-flexbox; display: inline-flex; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; } .logo_1Trfm { height: 90%; width: auto; } .logo_X5kuq { height: 100%; width: auto; display: -ms-flexbox; display: flex; max-width: 100%; } .logo_X5kuq path{ fill: currentColor; } `;};
+const tokens = {"logo":"logo_3qwrk","icon":"logo_34umO","svg":"logo_2_1PA"};
+tokens._getCss = function () {return `/* imported from logo.css */ .logo_3qwrk { height: 100%; width: auto; display: -ms-inline-flexbox; display: inline-flex; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; } .logo_34umO { height: 90%; width: auto; } .logo_2_1PA { height: 100%; width: auto; display: -ms-flexbox; display: flex; max-width: 100%; } .logo_2_1PA path{ fill: currentColor; } `;};
 tokens._module = (typeof module !== "undefined") ? module : {id:"./common/logo/logo_css.js"};
 exports["default"] = tokens;

package/dist/common/middlewares.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = createMiddlewares;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _arrayLikeToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/arrayLikeToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _log = _interopRequireDefault(require("./log"));
 var _states = _interopRequireDefault(require("./states"));
@@ -177,7 +178,7 @@ function createWappMiddleware() {
           attributes[_key] = arguments[_key];
         }
         var html = attributes[0],
-          restAttr = attributes.slice(1);
+          restAttr = (0, _arrayLikeToArray2["default"])(attributes).slice(1);
         wappResponse.sendData = {
           data: html
         };

package/dist/common/router.js

@@ -17,6 +17,60 @@ function createDefaultRouter() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp,
     routes = p.routes;
+  function matchFlexible(rPath, sPath) {
+    var rpa = rPath.split("/");
+    var pa = sPath.split("/");
+    var prefixEnd = 0;
+    for (var i = 0; i < rpa.length; i++) {
+      var seg = rpa[i];
+      if (seg && seg.slice(0, 1) !== ":" && seg !== "*") {
+        if (i + 1 < rpa.length && rpa[i + 1] && rpa[i + 1].slice(0, 1) === ":") {
+          break;
+        }
+        prefixEnd = i + 1;
+      } else {
+        prefixEnd = i + 1;
+      }
+    }
+    for (var _i = 0; _i < prefixEnd; _i++) {
+      if (typeof pa[_i] !== "string" || pa[_i] !== rpa[_i]) {
+        return null;
+      }
+    }
+    var expectedPairs = {};
+    var expectedCount = 0;
+    for (var _i2 = prefixEnd; _i2 < rpa.length - 1; _i2 += 2) {
+      var key = rpa[_i2];
+      var paramSeg = rpa[_i2 + 1];
+      if (key && paramSeg && paramSeg.slice(0, 1) === ":") {
+        expectedPairs[key] = paramSeg.slice(1);
+        expectedCount++;
+      }
+    }
+    var remaining = pa.slice(prefixEnd);
+    if (remaining.length % 2 !== 0) {
+      return null;
+    }
+    var actualPairs = {};
+    var actualCount = 0;
+    for (var _i3 = 0; _i3 < remaining.length; _i3 += 2) {
+      actualPairs[remaining[_i3]] = remaining[_i3 + 1];
+      actualCount++;
+    }
+    if (actualCount !== expectedCount) {
+      return null;
+    }
+    var thisParams = {};
+    var expectedKeys = Object.keys(expectedPairs);
+    for (var k = 0; k < expectedKeys.length; k++) {
+      var ek = expectedKeys[k];
+      if (typeof actualPairs[ek] === "undefined") {
+        return null;
+      }
+      thisParams[expectedPairs[ek]] = actualPairs[ek];
+    }
+    return thisParams;
+  }
   function match() {
     var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var path = p.path;
@@ -30,30 +84,38 @@ function createDefaultRouter() {
         try {
           var rPath = r.path.slice(-1) === "/" ? r.path.slice(0, -1) : r.path;
           var sPath = path.slice(-1) === "/" ? path.slice(0, -1) : path;
-          var rpa = rPath.split("/");
-          var pa = sPath.split("/");
-          var allPartIsMatch = true;
-          var wasAllowChar = false;
-          rpa.forEach(function (rpas, i) {
-            var param = rpas && rpas.slice(0, 1) === ":";
-            var allow = rpas === "*";
-            if (allow) {
-              wasAllowChar = true;
+          if (r.flexibleParams) {
+            var flexResult = matchFlexible(rPath, sPath);
+            if (flexResult) {
+              thisParams = flexResult;
+              _match = true;
             }
-            if (typeof pa[i] == "string") {
-              if (pa[i] === rpas || param || allow) {} else {
-                allPartIsMatch = false;
+          } else {
+            var rpa = rPath.split("/");
+            var pa = sPath.split("/");
+            var allPartIsMatch = true;
+            var wasAllowChar = false;
+            rpa.forEach(function (rpas, i) {
+              var param = rpas && rpas.slice(0, 1) === ":";
+              var allow = rpas === "*";
+              if (allow) {
+                wasAllowChar = true;
               }
-              if (param) {
-                thisParams[rpas.slice(1)] = pa[i];
+              if (typeof pa[i] == "string") {
+                if (pa[i] === rpas || param || allow) {} else {
+                  allPartIsMatch = false;
+                }
+                if (param) {
+                  thisParams[rpas.slice(1)] = pa[i];
+                }
               }
+            });
+            if (pa.length > rpa.length && !wasAllowChar) {
+              allPartIsMatch = false;
+            }
+            if (allPartIsMatch) {
+              _match = true;
             }
-          });
-          if (pa.length > rpa.length && !wasAllowChar) {
-            allPartIsMatch = false;
-          }
-          if (allPartIsMatch) {
-            _match = true;
           }
         } catch (e) {}
         if (_match && !route) {

package/dist/common/template/app_css.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-const tokens = {"app":"app_TgHI7"};
-tokens._getCss = function () {return `/* imported from app.css */ body { margin: 0; padding: 0; max-width: 100vw; overflow-x: hidden; } * { -webkit-box-sizing: border-box; box-sizing: border-box; } .app_TgHI7 { font-size: 14px; color: rgba(0,0,0,0.87); display: block; position: relative; overflow-x: hidden; } div.app_TgHI7 > * { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } @media (orientation: portrait) { .app_TgHI7 { max-width: 100vh; } } `;};
+const tokens = {"app":"app_2f0Nm"};
+tokens._getCss = function () {return `/* imported from app.css */ body { margin: 0; padding: 0; max-width: 100vw; overflow-x: hidden; } * { -webkit-box-sizing: border-box; box-sizing: border-box; } .app_2f0Nm { font-size: 14px; color: rgba(0,0,0,0.87); display: block; position: relative; overflow-x: hidden; } div.app_2f0Nm > * { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } @media (orientation: portrait) { .app_2f0Nm { max-width: 100vh; } } `;};
 tokens._module = (typeof module !== "undefined") ? module : {id:"./common/template/app_css.js"};
 exports["default"] = tokens;

package/dist/common/template/template_css.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-const tokens = {"page":"template_3HXPB","header":"template_3ck2q","sticky":"template_2Nz4A","innerHeader":"template_3nJPj","logo":"template_rKBgA","content":"template_1zK-k","footer":"template_3Rlwa","menu":"template_1r1_q","button":"template_1iINl","copyright":"template_3y44t"};
-tokens._getCss = function () {return `/* imported from template.css */ .template_3HXPB { display: block; position: relative; overflow-x: hidden; overflow-y: hidden; min-height: 100vh; max-width: 100vw; } .template_3ck2q { display: block; position: fixed; width: 100%; height: 64px; padding: 6px; background: white; z-index: 1; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; } .template_3ck2q.template_2Nz4A { -webkit-box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); } .template_3nJPj { display: block; width: 100%; height: 100%; position: relative; overflow: hidden; } .template_3ck2q .template_rKBgA { height: 52px; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; margin-top: 100%; } .template_3ck2q.template_2Nz4A .template_rKBgA { margin-top: 0; } .template_1zK-k { min-height: 100vh; position: relative; padding-top: 64px; } .template_3Rlwa { display: -ms-flexbox; display: flex; min-height: 128px; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; } .template_1r1_q { } .template_1r1_q > div { } .template_3Rlwa .template_1r1_q { -ms-flex-pack: center; justify-content: center; display: -ms-flexbox; display: flex; } .template_3Rlwa .template_1r1_q > div { display: inline-block; } .template_1iINl { color: rgba(0, 0, 0, 0.87); padding: 6px 16px; font-size: 14px; font-size: 0.875rem; min-width: 64px; -webkit-box-sizing: border-box; box-sizing: border-box; -webkit-transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; line-height: 1.75; border-radius: 4px; letter-spacing: 0.02857em; text-transform: uppercase; font-weight: bold; border: 0; cursor: pointer; margin: 0; display: -ms-inline-flexbox; display: inline-flex; outline: 0; position: relative; -ms-flex-align: center; align-items: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; vertical-align: middle; -ms-flex-pack: center; justify-content: center; text-decoration: none; background-color: transparent; text-align: center; } a.template_1iINl { text-decoration: none; } .template_3y44t { font-size: 12px; margin: 24px; text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } `;};
+const tokens = {"page":"template_2pYWt","header":"template_2eiGu","sticky":"template_3UDsg","innerHeader":"template_3kWDb","logo":"template_qf6kn","content":"template_mZfJ1","footer":"template_3WkoV","menu":"template__Jeh1","button":"template_2AgIs","copyright":"template_1_9QV"};
+tokens._getCss = function () {return `/* imported from template.css */ .template_2pYWt { display: block; position: relative; overflow-x: hidden; overflow-y: hidden; min-height: 100vh; max-width: 100vw; } .template_2eiGu { display: block; position: fixed; width: 100%; height: 64px; padding: 6px; background: white; z-index: 1; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; } .template_2eiGu.template_3UDsg { -webkit-box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); } .template_3kWDb { display: block; width: 100%; height: 100%; position: relative; overflow: hidden; } .template_2eiGu .template_qf6kn { height: 52px; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; margin-top: 100%; } .template_2eiGu.template_3UDsg .template_qf6kn { margin-top: 0; } .template_mZfJ1 { min-height: 100vh; position: relative; padding-top: 64px; } .template_3WkoV { display: -ms-flexbox; display: flex; min-height: 128px; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; } .template__Jeh1 { } .template__Jeh1 > div { } .template_3WkoV .template__Jeh1 { -ms-flex-pack: center; justify-content: center; display: -ms-flexbox; display: flex; } .template_3WkoV .template__Jeh1 > div { display: inline-block; } .template_2AgIs { color: rgba(0, 0, 0, 0.87); padding: 6px 16px; font-size: 14px; font-size: 0.875rem; min-width: 64px; -webkit-box-sizing: border-box; box-sizing: border-box; -webkit-transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; line-height: 1.75; border-radius: 4px; letter-spacing: 0.02857em; text-transform: uppercase; font-weight: bold; border: 0; cursor: pointer; margin: 0; display: -ms-inline-flexbox; display: inline-flex; outline: 0; position: relative; -ms-flex-align: center; align-items: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; vertical-align: middle; -ms-flex-pack: center; justify-content: center; text-decoration: none; background-color: transparent; text-align: center; } a.template_2AgIs { text-decoration: none; } .template_1_9QV { font-size: 12px; margin: 24px; text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } `;};
 tokens._module = (typeof module !== "undefined") ? module : {id:"./common/template/template_css.js"};
 exports["default"] = tokens;

package/package.json

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