sample-piral 1.3.0-beta.6050 → 1.3.0-beta.6062

package/app/index.d.ts

@@ -363,7 +363,7 @@ export interface PageComponentProps<T extends {
 /**
  * The meta data registered for a page.
  */
-export interface PiralPageMeta extends PiralCustomPageMeta, PiralCustomPageMeta {}
+export interface PiralPageMeta extends PiralCustomPageMeta {}
 
 /**
  * The shape of an implicit unregister function.

package/app/{index.85630c.js → index.da2dcb.js}

@@ -1104,11 +1104,23 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "PiralRoutes": () => (/* binding */ PiralRoutes)
 /* harmony export */ });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! tslib */ "../../../node_modules/tslib/tslib.es6.js");
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! tslib */ "../../../node_modules/tslib/tslib.es6.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "../../../node_modules/react/index.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _hooks__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../hooks */ "../../framework/piral-core/esm/hooks/globalState.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils */ "../../framework/piral-core/esm/utils/routes.js");
 /* harmony import */ var _app_codegen__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../app.codegen */ "../../framework/piral-core/app.codegen");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
 
 
 
@@ -1120,20 +1132,27 @@ function useRoutes() {
   var pages = (0,_hooks__WEBPACK_IMPORTED_MODULE_1__.useGlobalState)(function (s) {
     return s.registry.pages;
   });
-  var paths = [];
-  Object.keys(routes).map(function (path) {
-    return paths.push({
+  return (0,_app_codegen__WEBPACK_IMPORTED_MODULE_2__.useRouteFilter)([].concat(_toConsumableArray(Object.entries(routes).map(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      path = _ref2[0],
+      Component = _ref2[1];
+    return {
       path: path,
-      Component: routes[path]
-    });
-  });
-  Object.keys(pages).map(function (path) {
-    return paths.push({
+      Component: Component,
+      meta: {},
+      matcher: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.createRouteMatcher)(path)
+    };
+  })), _toConsumableArray(Object.entries(pages).map(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+      path = _ref4[0],
+      entry = _ref4[1];
+    return {
       path: path,
-      Component: pages[path].component
-    });
-  });
-  return (0,_app_codegen__WEBPACK_IMPORTED_MODULE_2__.useRouteFilter)(paths);
+      Component: entry.component,
+      meta: entry.meta,
+      matcher: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.createRouteMatcher)(path)
+    };
+  }))));
 }
 /**
  * The component for defining the exclusive routes to be used.
@@ -1141,7 +1160,7 @@ function useRoutes() {
 var PiralRoutes = function PiralRoutes(_a) {
   var NotFound = _a.NotFound,
     RouteSwitch = _a.RouteSwitch,
-    props = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__rest)(_a, ["NotFound", "RouteSwitch"]);
+    props = (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__rest)(_a, ["NotFound", "RouteSwitch"]);
   var paths = useRoutes();
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(RouteSwitch, Object.assign({
     NotFound: NotFound,
@@ -3277,6 +3296,26 @@ function defaultRender(children, key) {
 
 /***/ }),
 
+/***/ "../../framework/piral-core/esm/utils/routes.js":
+/*!******************************************************!*\
+  !*** ../../framework/piral-core/esm/utils/routes.js ***!
+  \******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "createRouteMatcher": () => (/* binding */ createRouteMatcher)
+/* harmony export */ });
+// Unfortunately `require`d:
+// * exports are otherwise potentially converted by, e.g., Parcel (see #385)
+var ptr = __webpack_require__(/*! path-to-regexp */ "../../../node_modules/path-to-regexp/index.js");
+function createRouteMatcher(path) {
+  return ptr(path);
+}
+
+/***/ }),
+
 /***/ "../../framework/piral-core/esm/utils/state.js":
 /*!*****************************************************!*\
   !*** ../../framework/piral-core/esm/utils/state.js ***!
@@ -6374,12 +6413,12 @@ function installPiralDebug(options) {
     debug: debugApiVersion,
     instance: {
       name: "sample-piral",
-      version: "1.3.0-beta.6050",
+      version: "1.3.0-beta.6062",
       dependencies: "reactstrap,tslib,react,react-dom,react-router,react-router-dom"
     },
     build: {
-      date: "2023-10-02T12:06:58.026Z",
-      cli: "1.3.0-beta.6050",
+      date: "2023-10-09T00:01:40.769Z",
+      cli: "1.3.0-beta.6062",
       compat: "1"
     }
   };
@@ -65245,4 +65284,4 @@ root.render( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(piral
 
 /******/ })()
 ;
-//# sourceMappingURL=index.85630c.js.map
+//# sourceMappingURL=index.da2dcb.js.map