piral-core 1.3.0-beta.6050 → 1.3.0-beta.6059

package/esm/components/PiralRoutes.js

@@ -1,14 +1,25 @@
 import { __rest } from "tslib";
 import * as React from 'react';
 import { useGlobalState } from '../hooks';
+import { createRouteMatcher } from '../utils';
 import { useRouteFilter } from '../../app.codegen';
 function useRoutes() {
     const routes = useGlobalState((s) => s.routes);
     const pages = useGlobalState((s) => s.registry.pages);
-    const paths = [];
-    Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-    Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-    return useRouteFilter(paths);
+    return useRouteFilter([
+        ...Object.entries(routes).map(([path, Component]) => ({
+            path,
+            Component,
+            meta: {},
+            matcher: createRouteMatcher(path),
+        })),
+        ...Object.entries(pages).map(([path, entry]) => ({
+            path,
+            Component: entry.component,
+            meta: entry.meta,
+            matcher: createRouteMatcher(path),
+        })),
+    ]);
 }
 /**
  * The component for defining the exclusive routes to be used.

package/esm/components/PiralRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"PiralRoutes.js","sourceRoot":"","sources":["../../src/components/PiralRoutes.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,KAAK,GAAmB,EAAE,CAAC;IAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEzF,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAgBD;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAA0B,CAAC,EAAmC,EAAE,EAAE;QAAvC,EAAE,QAAQ,EAAE,WAAW,OAAY,EAAP,KAAK,cAAjC,2BAAmC,CAAF;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,OAAO,oBAAC,WAAW,kBAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AACtE,CAAC,CAAC;AACF,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"PiralRoutes.js","sourceRoot":"","sources":["../../src/components/PiralRoutes.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,cAAc,CAAC;QACpB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI;YACJ,SAAS;YACT,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,IAAI;YACJ,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;KACJ,CAAC,CAAC;AACL,CAAC;AAgBD;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAA0B,CAAC,EAAmC,EAAE,EAAE;QAAvC,EAAE,QAAQ,EAAE,WAAW,OAAY,EAAP,KAAK,cAAjC,2BAAmC,CAAF;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,OAAO,oBAAC,WAAW,kBAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AACtE,CAAC,CAAC;AACF,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC"}

package/esm/types/api.d.ts

@@ -1,8 +1,8 @@
 import type { ReactElement, ReactNode } from 'react';
 import type { RouteComponentProps } from 'react-router';
 import type { PiletApi, Pilet, PiletEntry, PiletEntries, PiletMetadata, EventEmitter, PiletLoader, PiletLoadingStrategy } from 'piral-base';
-import type { PiletCustomApi, PiralCustomPageMeta } from './custom';
-import type { AnyComponent } from './components';
+import type { PiletCustomApi } from './custom';
+import type { AnyComponent, PiralPageMeta } from './components';
 import type { ExtensionParams, ExtensionSlotProps, PiralExtensionSlotMap } from './extension';
 import type { SharedData, DataStoreOptions } from './data';
 import type { Disposable } from './utils';
@@ -38,11 +38,6 @@ export interface ExtensionComponentProps<T> extends BaseComponentProps {
      */
     children?: ReactNode;
 }
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {
-}
 /**
  * The props that every registered page component obtains.
  */
@@ -65,11 +60,6 @@ export interface PageComponentProps<T extends {
      */
     children: ReactNode;
 }
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {
-}
 /**
  * Shorthand for the definition of an extension component.
  */

package/esm/types/components.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentType, ReactNode } from 'react';
 import type { RouteComponentProps, SwitchProps } from 'react-router';
 import type { FirstParametersOf, UnionOf } from './common';
-import type { PiralCustomErrors, PiralCustomComponentConverters } from './custom';
+import type { PiralCustomErrors, PiralCustomComponentConverters, PiralCustomPageMeta } from './custom';
 import type { NavigationApi } from './navigation';
 import type { LayoutType } from './layout';
 /**
@@ -209,6 +209,11 @@ export interface RouterProps {
      */
     publicPath: string;
 }
+/**
+ * The meta data registered for a page.
+ */
+export interface PiralPageMeta extends PiralCustomPageMeta {
+}
 /**
  * Represents a path in the app registration.
  */
@@ -217,6 +222,14 @@ export interface AppPath {
      * The exact path to use.
      */
     path: string;
+    /**
+     * The associated route matcher.
+     */
+    matcher: RegExp;
+    /**
+     * The page metadata.
+     */
+    meta: PiralPageMeta;
     /**
      * The component to register for this path.
      */

package/esm/types/state.d.ts

@@ -6,8 +6,8 @@ import type { Dict, Without } from './common';
 import type { NavigationApi } from './navigation';
 import type { SharedDataItem, DataStoreTarget } from './data';
 import type { PiralCustomActions, PiralCustomState, PiralCustomRegistryState, PiralCustomComponentsState } from './custom';
-import type { EventEmitter, Pilet, BaseComponentProps, PageComponentProps, ExtensionComponentProps, PiletsBag, PiralPageMeta, PiletEntry } from './api';
-import type { ComponentConverters, LoadingIndicatorProps, ErrorInfoProps, RouterProps, LayoutProps, Errors, RouteSwitchProps } from './components';
+import type { EventEmitter, Pilet, BaseComponentProps, PageComponentProps, ExtensionComponentProps, PiletsBag, PiletEntry } from './api';
+import type { PiralPageMeta, ComponentConverters, LoadingIndicatorProps, ErrorInfoProps, RouterProps, LayoutProps, Errors, RouteSwitchProps } from './components';
 export interface StateDispatcher<TState> {
     (state: TState): Partial<TState>;
 }

package/esm/utils/index.d.ts

@@ -7,5 +7,6 @@ export * from './guid';
 export * from './helpers';
 export * from './media';
 export * from './react';
+export * from './routes';
 export * from './state';
 export * from './storage';

package/esm/utils/index.js

@@ -7,6 +7,7 @@ export * from './guid';
 export * from './helpers';
 export * from './media';
 export * from './react';
+export * from './routes';
 export * from './state';
 export * from './storage';
 //# sourceMappingURL=index.js.map

package/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEnD,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEnD,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/esm/utils/routes.d.ts

@@ -0,0 +1 @@
+export declare function createRouteMatcher(path: string): RegExp;

package/esm/utils/routes.js

@@ -0,0 +1,7 @@
+// Unfortunately `require`d:
+// * exports are otherwise potentially converted by, e.g., Parcel (see #385)
+const ptr = require('path-to-regexp');
+export function createRouteMatcher(path) {
+    return ptr(path);
+}
+//# sourceMappingURL=routes.js.map

package/esm/utils/routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,4EAA4E;AAC5E,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEtC,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC"}

package/lib/components/PiralRoutes.js

@@ -4,14 +4,25 @@ exports.PiralRoutes = void 0;
 const tslib_1 = require("tslib");
 const React = require("react");
 const hooks_1 = require("../hooks");
+const utils_1 = require("../utils");
 const app_codegen_1 = require("../../app.codegen");
 function useRoutes() {
     const routes = (0, hooks_1.useGlobalState)((s) => s.routes);
     const pages = (0, hooks_1.useGlobalState)((s) => s.registry.pages);
-    const paths = [];
-    Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-    Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-    return (0, app_codegen_1.useRouteFilter)(paths);
+    return (0, app_codegen_1.useRouteFilter)([
+        ...Object.entries(routes).map(([path, Component]) => ({
+            path,
+            Component,
+            meta: {},
+            matcher: (0, utils_1.createRouteMatcher)(path),
+        })),
+        ...Object.entries(pages).map(([path, entry]) => ({
+            path,
+            Component: entry.component,
+            meta: entry.meta,
+            matcher: (0, utils_1.createRouteMatcher)(path),
+        })),
+    ]);
 }
 /**
  * The component for defining the exclusive routes to be used.

package/lib/components/PiralRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"PiralRoutes.js","sourceRoot":"","sources":["../../src/components/PiralRoutes.tsx"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAE/B,oCAA0C;AAE1C,mDAAmD;AAEnD,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,IAAA,sBAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAA,sBAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,KAAK,GAAmB,EAAE,CAAC;IAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEzF,OAAO,IAAA,4BAAc,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAgBD;;GAEG;AACI,MAAM,WAAW,GAA0B,CAAC,EAAmC,EAAE,EAAE;QAAvC,EAAE,QAAQ,EAAE,WAAW,OAAY,EAAP,KAAK,sBAAjC,2BAAmC,CAAF;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,OAAO,oBAAC,WAAW,kBAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AACtE,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AACF,mBAAW,CAAC,WAAW,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"PiralRoutes.js","sourceRoot":"","sources":["../../src/components/PiralRoutes.tsx"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAE/B,oCAA0C;AAC1C,oCAA8C;AAE9C,mDAAmD;AAEnD,SAAS,SAAS;IAChB,MAAM,MAAM,GAAG,IAAA,sBAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAA,sBAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,IAAA,4BAAc,EAAC;QACpB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI;YACJ,SAAS;YACT,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,IAAA,0BAAkB,EAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,IAAI;YACJ,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,IAAA,0BAAkB,EAAC,IAAI,CAAC;SAClC,CAAC,CAAC;KACJ,CAAC,CAAC;AACL,CAAC;AAgBD;;GAEG;AACI,MAAM,WAAW,GAA0B,CAAC,EAAmC,EAAE,EAAE;QAAvC,EAAE,QAAQ,EAAE,WAAW,OAAY,EAAP,KAAK,sBAAjC,2BAAmC,CAAF;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,OAAO,oBAAC,WAAW,kBAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AACtE,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AACF,mBAAW,CAAC,WAAW,GAAG,QAAQ,CAAC"}

package/lib/types/api.d.ts

@@ -1,8 +1,8 @@
 import type { ReactElement, ReactNode } from 'react';
 import type { RouteComponentProps } from 'react-router';
 import type { PiletApi, Pilet, PiletEntry, PiletEntries, PiletMetadata, EventEmitter, PiletLoader, PiletLoadingStrategy } from 'piral-base';
-import type { PiletCustomApi, PiralCustomPageMeta } from './custom';
-import type { AnyComponent } from './components';
+import type { PiletCustomApi } from './custom';
+import type { AnyComponent, PiralPageMeta } from './components';
 import type { ExtensionParams, ExtensionSlotProps, PiralExtensionSlotMap } from './extension';
 import type { SharedData, DataStoreOptions } from './data';
 import type { Disposable } from './utils';
@@ -38,11 +38,6 @@ export interface ExtensionComponentProps<T> extends BaseComponentProps {
      */
     children?: ReactNode;
 }
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {
-}
 /**
  * The props that every registered page component obtains.
  */
@@ -65,11 +60,6 @@ export interface PageComponentProps<T extends {
      */
     children: ReactNode;
 }
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {
-}
 /**
  * Shorthand for the definition of an extension component.
  */

package/lib/types/components.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentType, ReactNode } from 'react';
 import type { RouteComponentProps, SwitchProps } from 'react-router';
 import type { FirstParametersOf, UnionOf } from './common';
-import type { PiralCustomErrors, PiralCustomComponentConverters } from './custom';
+import type { PiralCustomErrors, PiralCustomComponentConverters, PiralCustomPageMeta } from './custom';
 import type { NavigationApi } from './navigation';
 import type { LayoutType } from './layout';
 /**
@@ -209,6 +209,11 @@ export interface RouterProps {
      */
     publicPath: string;
 }
+/**
+ * The meta data registered for a page.
+ */
+export interface PiralPageMeta extends PiralCustomPageMeta {
+}
 /**
  * Represents a path in the app registration.
  */
@@ -217,6 +222,14 @@ export interface AppPath {
      * The exact path to use.
      */
     path: string;
+    /**
+     * The associated route matcher.
+     */
+    matcher: RegExp;
+    /**
+     * The page metadata.
+     */
+    meta: PiralPageMeta;
     /**
      * The component to register for this path.
      */

package/lib/types/state.d.ts

@@ -6,8 +6,8 @@ import type { Dict, Without } from './common';
 import type { NavigationApi } from './navigation';
 import type { SharedDataItem, DataStoreTarget } from './data';
 import type { PiralCustomActions, PiralCustomState, PiralCustomRegistryState, PiralCustomComponentsState } from './custom';
-import type { EventEmitter, Pilet, BaseComponentProps, PageComponentProps, ExtensionComponentProps, PiletsBag, PiralPageMeta, PiletEntry } from './api';
-import type { ComponentConverters, LoadingIndicatorProps, ErrorInfoProps, RouterProps, LayoutProps, Errors, RouteSwitchProps } from './components';
+import type { EventEmitter, Pilet, BaseComponentProps, PageComponentProps, ExtensionComponentProps, PiletsBag, PiletEntry } from './api';
+import type { PiralPageMeta, ComponentConverters, LoadingIndicatorProps, ErrorInfoProps, RouterProps, LayoutProps, Errors, RouteSwitchProps } from './components';
 export interface StateDispatcher<TState> {
     (state: TState): Partial<TState>;
 }

package/lib/utils/index.d.ts

@@ -7,5 +7,6 @@ export * from './guid';
 export * from './helpers';
 export * from './media';
 export * from './react';
+export * from './routes';
 export * from './state';
 export * from './storage';

package/lib/utils/index.js

@@ -13,6 +13,7 @@ tslib_1.__exportStar(require("./guid"), exports);
 tslib_1.__exportStar(require("./helpers"), exports);
 tslib_1.__exportStar(require("./media"), exports);
 tslib_1.__exportStar(require("./react"), exports);
+tslib_1.__exportStar(require("./routes"), exports);
 tslib_1.__exportStar(require("./state"), exports);
 tslib_1.__exportStar(require("./storage"), exports);
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AAA1C,oGAAA,MAAM,OAAA;AAAE,2GAAA,aAAa,OAAA;AAE9B,oDAA0B;AAC1B,iDAAuB;AACvB,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,kDAAwB;AACxB,kDAAwB;AACxB,oDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AAA1C,oGAAA,MAAM,OAAA;AAAE,2GAAA,aAAa,OAAA;AAE9B,oDAA0B;AAC1B,iDAAuB;AACvB,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,kDAAwB;AACxB,mDAAyB;AACzB,kDAAwB;AACxB,oDAA0B"}

package/lib/utils/routes.d.ts

@@ -0,0 +1 @@
+export declare function createRouteMatcher(path: string): RegExp;

package/lib/utils/routes.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRouteMatcher = void 0;
+// Unfortunately `require`d:
+// * exports are otherwise potentially converted by, e.g., Parcel (see #385)
+const ptr = require('path-to-regexp');
+function createRouteMatcher(path) {
+    return ptr(path);
+}
+exports.createRouteMatcher = createRouteMatcher;
+//# sourceMappingURL=routes.js.map

package/lib/utils/routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,4EAA4E;AAC5E,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEtC,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC;AAFD,gDAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "1.3.0-beta.6050",
+  "version": "1.3.0-beta.6059",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -72,8 +72,9 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "piral-base": "1.3.0-beta.6050",
-    "piral-debug-utils": "1.3.0-beta.6050",
+    "path-to-regexp": "^1.8.0",
+    "piral-base": "1.3.0-beta.6059",
+    "piral-debug-utils": "1.3.0-beta.6059",
     "zustand": "^3.0.0"
   },
   "devDependencies": {
@@ -93,5 +94,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "e146a30bb1c871b86706e2f88d7bc14ee80f6d1d"
+  "gitHead": "ad05f392cd349ca6f6ac5b8cea1a8934ee3d202e"
 }

package/src/components/PiralRoutes.tsx

@@ -1,18 +1,28 @@
 import * as React from 'react';
 import { RouteComponentProps, SwitchProps } from 'react-router';
 import { useGlobalState } from '../hooks';
-import { RouteSwitchProps, AppPath } from '../types';
+import { createRouteMatcher } from '../utils';
+import { RouteSwitchProps } from '../types';
 import { useRouteFilter } from '../../app.codegen';
 
 function useRoutes() {
   const routes = useGlobalState((s) => s.routes);
   const pages = useGlobalState((s) => s.registry.pages);
-  const paths: Array<AppPath> = [];
 
-  Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-  Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-
-  return useRouteFilter(paths);
+  return useRouteFilter([
+    ...Object.entries(routes).map(([path, Component]) => ({
+      path,
+      Component,
+      meta: {},
+      matcher: createRouteMatcher(path),
+    })),
+    ...Object.entries(pages).map(([path, entry]) => ({
+      path,
+      Component: entry.component,
+      meta: entry.meta,
+      matcher: createRouteMatcher(path),
+    })),
+  ]);
 }
 
 /**

package/src/types/api.ts

@@ -12,7 +12,7 @@ import type {
 } from 'piral-base';
 import type {} from 'piral-debug-utils';
 import type { PiletCustomApi, PiralCustomPageMeta } from './custom';
-import type { AnyComponent } from './components';
+import type { AnyComponent, PiralPageMeta } from './components';
 import type { ExtensionParams, ExtensionSlotProps, PiralExtensionSlotMap } from './extension';
 import type { SharedData, DataStoreOptions } from './data';
 import type { Disposable } from './utils';
@@ -53,11 +53,6 @@ export interface ExtensionComponentProps<T> extends BaseComponentProps {
   children?: ReactNode;
 }
 
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {}
-
 /**
  * The props that every registered page component obtains.
  */
@@ -79,11 +74,6 @@ export interface PageComponentProps<T extends { [K in keyof T]?: string } = {},
   children: ReactNode;
 }
 
-/**
- * The meta data registered for a page.
- */
-export interface PiralPageMeta extends PiralCustomPageMeta {}
-
 /**
  * Shorthand for the definition of an extension component.
  */

package/src/types/components.ts

@@ -1,7 +1,7 @@
 import type { ComponentType, ReactNode } from 'react';
 import type { RouteComponentProps, SwitchProps } from 'react-router';
 import type { FirstParametersOf, UnionOf } from './common';
-import type { PiralCustomErrors, PiralCustomComponentConverters } from './custom';
+import type { PiralCustomErrors, PiralCustomComponentConverters, PiralCustomPageMeta } from './custom';
 import type { NavigationApi } from './navigation';
 import type { LayoutType } from './layout';
 
@@ -224,6 +224,11 @@ export interface RouterProps {
   publicPath: string;
 }
 
+/**
+ * The meta data registered for a page.
+ */
+export interface PiralPageMeta extends PiralCustomPageMeta {}
+
 /**
  * Represents a path in the app registration.
  */
@@ -232,6 +237,14 @@ export interface RouterProps {
    * The exact path to use.
    */
   path: string;
+  /**
+   * The associated route matcher.
+   */
+  matcher: RegExp;
+  /**
+   * The page metadata.
+   */
+  meta: PiralPageMeta;
   /**
    * The component to register for this path.
    */

package/src/types/state.ts

@@ -18,10 +18,10 @@ import type {
   PageComponentProps,
   ExtensionComponentProps,
   PiletsBag,
-  PiralPageMeta,
   PiletEntry,
 } from './api';
 import type {
+  PiralPageMeta,
   ComponentConverters,
   LoadingIndicatorProps,
   ErrorInfoProps,

package/src/utils/index.ts

@@ -8,5 +8,6 @@ export * from './guid';
 export * from './helpers';
 export * from './media';
 export * from './react';
+export * from './routes';
 export * from './state';
 export * from './storage';

package/src/utils/routes.test.ts

@@ -0,0 +1,48 @@
+import { createRouteMatcher } from './routes';
+
+describe('Routes Utilities', () => {
+  it('creates an exact matcher that does not match', () => {
+    const matcher = createRouteMatcher('/foo');
+    expect(matcher.test('/bar')).toBeFalsy();
+  });
+
+  it('creates an exact matcher that does match exactly', () => {
+    const matcher = createRouteMatcher('/foo');
+    expect(matcher.test('/foo')).toBeTruthy();
+  });
+
+  it('creates an exact matcher that does match with trailing slash', () => {
+    const matcher = createRouteMatcher('/foo');
+    expect(matcher.test('/foo/')).toBeTruthy();
+  });
+
+  it('creates an exact parameter matcher that does not match', () => {
+    const matcher = createRouteMatcher('/foo/:id');
+    expect(matcher.test('/bar')).toBeFalsy();
+  });
+
+  it('creates an exact matcher that does not match exactly', () => {
+    const matcher = createRouteMatcher('/foo/:id');
+    expect(matcher.test('/foo')).toBeFalsy();
+  });
+
+  it('creates an exact matcher that does match exactly', () => {
+    const matcher = createRouteMatcher('/foo/:id');
+    expect(matcher.test('/foo/bar')).toBeTruthy();
+  });
+
+  it('creates an inexact matcher that does not match', () => {
+    const matcher = createRouteMatcher('/foo/*');
+    expect(matcher.test('/bar')).toBeFalsy();
+  });
+
+  it('creates an inexact matcher that does not match exactly', () => {
+    const matcher = createRouteMatcher('/foo/:id/*');
+    expect(matcher.test('/foo/')).toBeFalsy();
+  });
+
+  it('creates an inexact matcher that does match exactly', () => {
+    const matcher = createRouteMatcher('/foo/*');
+    expect(matcher.test('/foo/bar')).toBeTruthy();
+  });
+});

package/src/utils/routes.ts

@@ -0,0 +1,7 @@
+// Unfortunately `require`d:
+// * exports are otherwise potentially converted by, e.g., Parcel (see #385)
+const ptr = require('path-to-regexp');
+
+export function createRouteMatcher(path: string): RegExp {
+  return ptr(path);
+}