reactive-route 0.0.1-alpha.33 → 0.0.1-alpha.35

package/adapters/mobx-preact.cjs

@@ -41,3 +41,4 @@ var adapters = {
   },
   makeObservable: import_mobx.observable
 };
+/* v8 ignore if -- @preserve */

package/adapters/mobx-preact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobx-preact.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-preact.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAetB,CAAC"}
+{"version":3,"file":"mobx-preact.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-preact.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAgBtB,CAAC"}

package/adapters/mobx-preact.mjs

@@ -20,3 +20,4 @@ var adapters = {
 export {
   adapters
 };
+/* v8 ignore if -- @preserve */

package/adapters/mobx-react.cjs

@@ -41,3 +41,4 @@ var adapters = {
   },
   makeObservable: import_mobx.observable
 };
+/* v8 ignore if -- @preserve */

package/adapters/mobx-react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobx-react.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-react.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAetB,CAAC"}
+{"version":3,"file":"mobx-react.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-react.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAgBtB,CAAC"}

package/adapters/mobx-react.mjs

@@ -20,3 +20,4 @@ var adapters = {
 export {
   adapters
 };
+/* v8 ignore if -- @preserve */

package/adapters/mobx-solid.cjs

@@ -40,3 +40,4 @@ var adapters = {
   makeObservable: import_mobx.observable,
   immediateSetComponent: true
 };
+/* v8 ignore if -- @preserve */

package/adapters/mobx-solid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobx-solid.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-solid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAetB,CAAC"}
+{"version":3,"file":"mobx-solid.d.ts","sourceRoot":"","sources":["../../packages/adapters/mobx-solid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAgBtB,CAAC"}

package/adapters/mobx-solid.mjs

@@ -19,3 +19,4 @@ var adapters = {
 export {
   adapters
 };
+/* v8 ignore if -- @preserve */

package/adapters/solid.cjs

@@ -43,3 +43,4 @@ var adapters = {
   },
   makeObservable: import_store.createMutable
 };
+/* v8 ignore next -- @preserve */

package/adapters/solid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solid.d.ts","sourceRoot":"","sources":["../../packages/adapters/solid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,eAAO,MAAM,QAAQ,EAAE,YAmBtB,CAAC"}
+{"version":3,"file":"solid.d.ts","sourceRoot":"","sources":["../../packages/adapters/solid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,eAAO,MAAM,QAAQ,EAAE,YAoBtB,CAAC"}

package/adapters/solid.mjs

@@ -22,3 +22,4 @@ var adapters = {
 export {
   adapters
 };
+/* v8 ignore next -- @preserve */

package/adapters/vue.cjs

@@ -38,3 +38,4 @@ var adapters = {
   makeObservable: import_vue.reactive,
   immediateSetComponent: true
 };
+/* v8 ignore if -- @preserve */

package/adapters/vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../packages/adapters/vue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,QAAQ,EAAE,YAatB,CAAC"}
+{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../packages/adapters/vue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,QAAQ,EAAE,YActB,CAAC"}

package/adapters/vue.mjs

@@ -17,3 +17,4 @@ var adapters = {
 export {
   adapters
 };
+/* v8 ignore if -- @preserve */

package/core/createRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAuPtB"}
+{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAgRtB"}

package/core/createRoutes.d.ts

@@ -1,12 +1,10 @@
 import { TypeRouteRaw } from './types/TypeRouteRaw';
 export declare function createRoutes<TConfig extends {
     [Key in keyof TConfig | 'notFound' | 'internalError']: TypeRouteRaw;
-}>(config: TConfig): {
-    [Key in keyof TConfig]: TConfig[Key] & {
-        name: Key;
-        pageId?: string;
-        component?: any;
-        otherExports?: Record<string, any>;
-    };
-};
+}>(config: TConfig): { [Key in keyof TConfig]: TConfig[Key] & {
+    name: Key;
+    pageId?: string;
+    component?: any;
+    otherExports?: Record<string, any>;
+}; };
 //# sourceMappingURL=createRoutes.d.ts.map

package/core/createRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../../packages/core/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,YAAY,CAC1B,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY;CAAE,EAEvF,MAAM,EAAE,OAAO,GACd;KACA,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;QACrC,IAAI,EAAE,GAAG,CAAC;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../../packages/core/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,wBAAgB,YAAY,CAC1B,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY;CAAE,EACvF,MAAM,EAAE,OAAO,GAKE,GACd,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;IACrC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,GACF,CACF"}

package/core/types/TypeCurrentRoute.d.ts

@@ -6,5 +6,6 @@ export type TypeCurrentRoute<TRoute extends TypeRoute> = {
     query: Partial<Record<keyof TRoute['query'], string>>;
     params: Record<keyof TRoute['params'], string>;
     pageId: TRoute['pageId'];
+    isActive: boolean;
 };
 //# sourceMappingURL=TypeCurrentRoute.d.ts.map

package/core/types/TypeCurrentRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeCurrentRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeCurrentRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,SAAS,IAAI;IACvD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC1B,CAAC"}
+{"version":3,"file":"TypeCurrentRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeCurrentRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,SAAS,IAAI;IACvD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC"}

package/core/types/TypeRouter.d.ts

@@ -5,15 +5,19 @@ import { TypeRoute } from './TypeRoute';
 export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
     routes: TRoutes;
     adapters: TypeAdapters;
-    currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+    currentRoute: {
+        [TRouteName in keyof TRoutes | 'notFound' | 'internalError']: TypeCurrentRoute<TRoutes[TRouteName]> | undefined;
+    };
     isRedirecting: boolean;
-    redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<void>;
+    redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<string>;
     restoreFromURL(params: {
         pathname: string;
         replace?: boolean;
-    }): Promise<void>;
+    }): Promise<string>;
     restoreFromServer(obj: {
-        currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+        currentRoute: {
+            [TRouteName in keyof TRoutes]: TypeCurrentRoute<TRoutes[TRouteName]> | undefined;
+        };
     }): Promise<void>;
     lifecycleParams?: Array<any>;
     destroy(): void;

package/core/types/TypeRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IAAI;IACjG,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,SAAS,MAAM,OAAO,EACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,iBAAiB,CAAC,GAAG,EAAE;QAAE,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC"}
+{"version":3,"file":"TypeRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IAAI;IACjG,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE;SACX,UAAU,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GACvD,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GACrC,SAAS;KACd,CAAC;IACF,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,SAAS,MAAM,OAAO,EACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC9C,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjF,iBAAiB,CAAC,GAAG,EAAE;QACrB,YAAY,EAAE;aACX,UAAU,IAAI,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS;SACjF,CAAC;KACH,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC"}

package/core/utils/constants.d.ts

@@ -1,6 +1,4 @@
 export declare const constants: {
-    dynamicSeparator: string;
-    pathPartSeparator: string;
     isClient: boolean;
 };
 //# sourceMappingURL=constants.d.ts.map

package/core/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;CAIrB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;CAErB,CAAC"}

package/core/utils/dynamic.d.ts

@@ -1,8 +1,8 @@
 import { TypeRoute } from '../types/TypeRoute';
 import { TypeValidator } from '../types/TypeValidator';
 export declare function isDynamic(param: string): boolean;
-export declare function clearDynamic(param: string): string;
 export declare function isDynamicRoute<TRoute extends TypeRoute>(route: TRoute): route is TRoute & {
     params: Record<keyof TRoute, TypeValidator>;
 };
+export declare function clearDynamic(param: string): string;
 //# sourceMappingURL=dynamic.d.ts.map

package/core/utils/dynamic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/dynamic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,cAAc,CAAC,MAAM,SAAS,SAAS,EACrD,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,EAAE,aAAa,CAAC,CAAA;CAAE,CAEnE"}
+{"version":3,"file":"dynamic.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/dynamic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,cAAc,CAAC,MAAM,SAAS,SAAS,EACrD,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,EAAE,aAAa,CAAC,CAAA;CAAE,CAEnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD"}

package/core/utils/findRouteByPathname.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findRouteByPathname.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/findRouteByPathname.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAW/C,wBAAgB,mBAAmB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC7E,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS,CAuDrC"}
+{"version":3,"file":"findRouteByPathname.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/findRouteByPathname.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAO/C,wBAAgB,mBAAmB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC7E,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS,CAkDrC"}

package/core/utils/getDynamicValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,wBAAgB,gBAAgB,CAAC,MAAM,SAAS,SAAS,EAAE,MAAM,EAAE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAqBzC"}
+{"version":3,"file":"getDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,wBAAgB,gBAAgB,CAAC,MAAM,SAAS,SAAS,EAAE,MAAM,EAAE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAqBzC"}

package/core/utils/getQueryValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getQueryValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getQueryValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,wBAAgB,cAAc,CAAC,MAAM,SAAS,SAAS,EAAE,MAAM,EAAE;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAkBjD"}
+{"version":3,"file":"getQueryValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getQueryValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,wBAAgB,cAAc,CAAC,MAAM,SAAS,SAAS,EAAE,MAAM,EAAE;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAoBjD"}

package/core/utils/replaceDynamicValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/replaceDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM/C,wBAAgB,oBAAoB,CAAC,UAAU,SAAS,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAC/F,KAAK,EACL,MAAkB,GACnB,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,MAAM,CAcT"}
+{"version":3,"file":"replaceDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/replaceDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,oBAAoB,CAAC,UAAU,SAAS,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAC/F,KAAK,EACL,MAAkB,GACnB,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,MAAM,CAcT"}

package/core/utils/routerSetLoadedComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerSetLoadedComponent.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/routerSetLoadedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAC3B,MAAM,EAAE;IACN,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,QA8BF"}
+{"version":3,"file":"routerSetLoadedComponent.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/routerSetLoadedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAC3B,MAAM,EAAE;IACN,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,QAoCF"}

package/index.cjs

@@ -31,24 +31,22 @@ module.exports = __toCommonJS(core_exports);
 
 // packages/core/utils/constants.ts
 var constants = {
-  dynamicSeparator: ":",
-  pathPartSeparator: "/",
   isClient: typeof window !== "undefined"
 };
 
 // packages/core/utils/dynamic.ts
 function isDynamic(param) {
-  return param[0] === constants.dynamicSeparator;
+  return param[0] === ":";
 }
 function clearDynamic(param) {
-  return param.replace(new RegExp(`^${constants.dynamicSeparator}`), "");
+  return param.replace(/^:/, "");
 }
 
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
   const { route, pathname } = params;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean).map((str) => decodeURIComponent(str));
-  const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+  const pathnameArray = pathname.replace(/\?.+$/, "").split("/").filter(Boolean).map((str) => decodeURIComponent(str));
+  const routePathnameArray = route.path.split("/").filter(Boolean);
   const dynamicParams = {};
   for (let i = 0; i < routePathnameArray.length; i++) {
     const paramName = routePathnameArray[i];
@@ -59,20 +57,20 @@ function getDynamicValues(params) {
 
 // packages/core/utils/findRouteByPathname.ts
 function completeStaticMatch(pathname, path) {
-  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
+  return !path.includes(":") && (pathname === path || pathname === `${path}/`);
 }
 function findRouteByPathname({
   pathname,
   routes
 }) {
   let dynamicRouteMatch;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
+  const pathnameArray = pathname.replace(/\?.+$/, "").split("/").filter(Boolean);
   for (const routeName in routes) {
     if (!Object.hasOwn(routes, routeName)) continue;
     const route = routes[routeName];
     if (completeStaticMatch(pathname, route.path)) return route;
     if (dynamicRouteMatch) continue;
-    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+    const routePathnameArray = route.path.split("/").filter(Boolean);
     if (routePathnameArray.length !== pathnameArray.length) continue;
     const someParamInvalid = routePathnameArray.some((paramName, i) => {
       const paramFromUrl = pathnameArray[i];
@@ -113,8 +111,9 @@ var queryString = {
 // packages/core/utils/getQueryValues.ts
 function getQueryValues(params) {
   const { route, pathname } = params;
+  if (!route.query) return {};
   const qs = queryString.extract(pathname);
-  if (!qs || !route.query) return {};
+  if (!qs) return {};
   const query = queryString.parse(qs);
   getTypedEntries(query).forEach(([key, value]) => {
     const validator = route.query[key];
@@ -166,7 +165,7 @@ var RedirectError = class extends Error {
 };
 
 // packages/core/utils/replaceDynamicValues.ts
-var re = new RegExp(`[^${constants.pathPartSeparator}]+`, "g");
+var re = new RegExp(`[^/]+`, "g");
 function replaceDynamicValues({
   route,
   params = {}
@@ -206,8 +205,11 @@ function createRouter(config) {
     router.adapters.batch(() => {
       Object.assign(router.currentRoute, obj.currentRoute);
     });
+    const activeRoute = Object.values(
+      router.currentRoute
+    ).find((currentRoute) => currentRoute?.isActive);
     const preloadedRouteName = Object.keys(router.routes).find(
-      (routeName) => router.currentRoute.name === routeName
+      (routeName) => activeRoute?.name === routeName
     );
     return loadComponentToConfig({ route: router.routes[preloadedRouteName] });
   };
@@ -221,14 +223,14 @@ function createRouter(config) {
     let currentUrl;
     let currentSearch;
     let currentQuery;
-    if (router.currentRoute?.name) {
-      currentRoute = router.routes[router.currentRoute.name];
-      currentPathname = replaceDynamicValues({
-        route: currentRoute,
-        params: router.currentRoute.params
-      });
-      currentQuery = router.currentRoute.query;
-      currentSearch = queryString.stringify(router.currentRoute.query);
+    const activeRoute = Object.values(
+      router.currentRoute
+    ).find((currentRoute2) => currentRoute2?.isActive);
+    if (activeRoute) {
+      currentRoute = router.routes[activeRoute.name];
+      currentPathname = replaceDynamicValues({ route: currentRoute, params: activeRoute.params });
+      currentQuery = activeRoute.query;
+      currentSearch = queryString.stringify(activeRoute.query);
       currentUrl = `${currentPathname}${currentSearch ? `?${currentSearch}` : ""}`;
     }
     const nextRoute = router.routes[routeName];
@@ -250,12 +252,12 @@ function createRouter(config) {
         nextUrl = `${nextPathname}?${nextSearch}`;
       }
     }
-    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentUrl === nextUrl) return nextUrl;
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         router.adapters.batch(() => {
-          router.adapters.replaceObject(router.currentRoute, {
-            ...router.currentRoute,
+          router.adapters.replaceObject(router.currentRoute[routeName], {
+            ...router.currentRoute[routeName],
             query: nextQuery || {}
           });
         });
@@ -263,7 +265,7 @@ function createRouter(config) {
           window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.isRedirecting = true;
@@ -309,7 +311,7 @@ function createRouter(config) {
       await loadComponentToConfig({ route: router.routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
-        return Promise.resolve();
+        return currentUrl;
       }
       if (error instanceof RedirectError) {
         throw error;
@@ -317,33 +319,48 @@ function createRouter(config) {
       console.error(error);
       await loadComponentToConfig({ route: router.routes.internalError });
       router.adapters.batch(() => {
-        router.adapters.replaceObject(router.currentRoute, {
+        const newObj = {
           name: router.routes.internalError.name,
           path: router.routes.internalError.path,
           props: router.routes[router.routes.internalError.name].props,
           query: router.adapters.makeObservable({}),
           params: router.adapters.makeObservable({}),
-          pageId: router.routes[router.routes.internalError.name].pageId
+          pageId: router.routes[router.routes.internalError.name].pageId,
+          isActive: true
+        };
+        if (!router.currentRoute.internalError) router.currentRoute.internalError = newObj;
+        else router.adapters.replaceObject(router.currentRoute.internalError, newObj);
+        Object.values(router.currentRoute).forEach((r) => {
+          if (r && r.name !== "internalError") r.isActive = false;
         });
         router.isRedirecting = false;
       });
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
-      router.adapters.replaceObject(router.currentRoute, {
+      const newObj = {
         name: nextRoute.name,
         path: nextRoute.path,
         props: router.routes[nextRoute.name].props,
         query: getQueryValues({ route: nextRoute, pathname: nextUrl }),
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
-        pageId: router.routes[nextRoute.name].pageId
+        pageId: router.routes[nextRoute.name].pageId,
+        isActive: true
+      };
+      if (!router.currentRoute[routeName]) {
+        router.currentRoute[routeName] = newObj;
+      } else {
+        router.adapters.replaceObject(router.currentRoute[routeName], newObj);
+      }
+      Object.values(router.currentRoute).forEach((r) => {
+        if (r && r.name !== routeName) r.isActive = false;
       });
       if (constants.isClient) {
         window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
-    return Promise.resolve();
+    return nextUrl;
   };
   function popHandler() {
     const currentUrl = `${location.pathname}${location.search}`;
@@ -360,23 +377,21 @@ function createRouter(config) {
   return router;
 }
 
-// packages/core/utils/addNames.ts
-function addNames(obj) {
-  Object.entries(obj).forEach(([key, value]) => {
-    value.name = key;
-  });
-  return obj;
-}
-
 // packages/core/createRoutes.ts
 function createRoutes(config) {
-  return addNames(config);
+  Object.entries(config).forEach(([key, value]) => {
+    value.name = key;
+  });
+  return config;
 }
 
 // packages/core/utils/routerSetLoadedComponent.ts
 function routerSetLoadedComponent(props, config) {
-  const currentRouteName = props.router.currentRoute.name;
-  const currentRoutePage = props.router.currentRoute.pageId;
+  const activeRoute = Object.values(props.router.currentRoute).find(
+    (currentRoute) => currentRoute?.isActive
+  );
+  const currentRouteName = activeRoute?.name;
+  const currentRoutePage = activeRoute?.pageId;
   const componentConfig = props.router.routes[currentRouteName];
   let preventRedirect = false;
   if (props.router.isRedirecting) preventRedirect = true;

package/index.mjs

@@ -1,23 +1,21 @@
 // packages/core/utils/constants.ts
 var constants = {
-  dynamicSeparator: ":",
-  pathPartSeparator: "/",
   isClient: typeof window !== "undefined"
 };
 
 // packages/core/utils/dynamic.ts
 function isDynamic(param) {
-  return param[0] === constants.dynamicSeparator;
+  return param[0] === ":";
 }
 function clearDynamic(param) {
-  return param.replace(new RegExp(`^${constants.dynamicSeparator}`), "");
+  return param.replace(/^:/, "");
 }
 
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
   const { route, pathname } = params;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean).map((str) => decodeURIComponent(str));
-  const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+  const pathnameArray = pathname.replace(/\?.+$/, "").split("/").filter(Boolean).map((str) => decodeURIComponent(str));
+  const routePathnameArray = route.path.split("/").filter(Boolean);
   const dynamicParams = {};
   for (let i = 0; i < routePathnameArray.length; i++) {
     const paramName = routePathnameArray[i];
@@ -28,20 +26,20 @@ function getDynamicValues(params) {
 
 // packages/core/utils/findRouteByPathname.ts
 function completeStaticMatch(pathname, path) {
-  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
+  return !path.includes(":") && (pathname === path || pathname === `${path}/`);
 }
 function findRouteByPathname({
   pathname,
   routes
 }) {
   let dynamicRouteMatch;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
+  const pathnameArray = pathname.replace(/\?.+$/, "").split("/").filter(Boolean);
   for (const routeName in routes) {
     if (!Object.hasOwn(routes, routeName)) continue;
     const route = routes[routeName];
     if (completeStaticMatch(pathname, route.path)) return route;
     if (dynamicRouteMatch) continue;
-    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+    const routePathnameArray = route.path.split("/").filter(Boolean);
     if (routePathnameArray.length !== pathnameArray.length) continue;
     const someParamInvalid = routePathnameArray.some((paramName, i) => {
       const paramFromUrl = pathnameArray[i];
@@ -82,8 +80,9 @@ var queryString = {
 // packages/core/utils/getQueryValues.ts
 function getQueryValues(params) {
   const { route, pathname } = params;
+  if (!route.query) return {};
   const qs = queryString.extract(pathname);
-  if (!qs || !route.query) return {};
+  if (!qs) return {};
   const query = queryString.parse(qs);
   getTypedEntries(query).forEach(([key, value]) => {
     const validator = route.query[key];
@@ -135,7 +134,7 @@ var RedirectError = class extends Error {
 };
 
 // packages/core/utils/replaceDynamicValues.ts
-var re = new RegExp(`[^${constants.pathPartSeparator}]+`, "g");
+var re = new RegExp(`[^/]+`, "g");
 function replaceDynamicValues({
   route,
   params = {}
@@ -175,8 +174,11 @@ function createRouter(config) {
     router.adapters.batch(() => {
       Object.assign(router.currentRoute, obj.currentRoute);
     });
+    const activeRoute = Object.values(
+      router.currentRoute
+    ).find((currentRoute) => currentRoute?.isActive);
     const preloadedRouteName = Object.keys(router.routes).find(
-      (routeName) => router.currentRoute.name === routeName
+      (routeName) => activeRoute?.name === routeName
     );
     return loadComponentToConfig({ route: router.routes[preloadedRouteName] });
   };
@@ -190,14 +192,14 @@ function createRouter(config) {
     let currentUrl;
     let currentSearch;
     let currentQuery;
-    if (router.currentRoute?.name) {
-      currentRoute = router.routes[router.currentRoute.name];
-      currentPathname = replaceDynamicValues({
-        route: currentRoute,
-        params: router.currentRoute.params
-      });
-      currentQuery = router.currentRoute.query;
-      currentSearch = queryString.stringify(router.currentRoute.query);
+    const activeRoute = Object.values(
+      router.currentRoute
+    ).find((currentRoute2) => currentRoute2?.isActive);
+    if (activeRoute) {
+      currentRoute = router.routes[activeRoute.name];
+      currentPathname = replaceDynamicValues({ route: currentRoute, params: activeRoute.params });
+      currentQuery = activeRoute.query;
+      currentSearch = queryString.stringify(activeRoute.query);
       currentUrl = `${currentPathname}${currentSearch ? `?${currentSearch}` : ""}`;
     }
     const nextRoute = router.routes[routeName];
@@ -219,12 +221,12 @@ function createRouter(config) {
         nextUrl = `${nextPathname}?${nextSearch}`;
       }
     }
-    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentUrl === nextUrl) return nextUrl;
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         router.adapters.batch(() => {
-          router.adapters.replaceObject(router.currentRoute, {
-            ...router.currentRoute,
+          router.adapters.replaceObject(router.currentRoute[routeName], {
+            ...router.currentRoute[routeName],
             query: nextQuery || {}
           });
         });
@@ -232,7 +234,7 @@ function createRouter(config) {
           window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.isRedirecting = true;
@@ -278,7 +280,7 @@ function createRouter(config) {
       await loadComponentToConfig({ route: router.routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
-        return Promise.resolve();
+        return currentUrl;
       }
       if (error instanceof RedirectError) {
         throw error;
@@ -286,33 +288,48 @@ function createRouter(config) {
       console.error(error);
       await loadComponentToConfig({ route: router.routes.internalError });
       router.adapters.batch(() => {
-        router.adapters.replaceObject(router.currentRoute, {
+        const newObj = {
           name: router.routes.internalError.name,
           path: router.routes.internalError.path,
           props: router.routes[router.routes.internalError.name].props,
           query: router.adapters.makeObservable({}),
           params: router.adapters.makeObservable({}),
-          pageId: router.routes[router.routes.internalError.name].pageId
+          pageId: router.routes[router.routes.internalError.name].pageId,
+          isActive: true
+        };
+        if (!router.currentRoute.internalError) router.currentRoute.internalError = newObj;
+        else router.adapters.replaceObject(router.currentRoute.internalError, newObj);
+        Object.values(router.currentRoute).forEach((r) => {
+          if (r && r.name !== "internalError") r.isActive = false;
         });
         router.isRedirecting = false;
       });
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
-      router.adapters.replaceObject(router.currentRoute, {
+      const newObj = {
         name: nextRoute.name,
         path: nextRoute.path,
         props: router.routes[nextRoute.name].props,
         query: getQueryValues({ route: nextRoute, pathname: nextUrl }),
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
-        pageId: router.routes[nextRoute.name].pageId
+        pageId: router.routes[nextRoute.name].pageId,
+        isActive: true
+      };
+      if (!router.currentRoute[routeName]) {
+        router.currentRoute[routeName] = newObj;
+      } else {
+        router.adapters.replaceObject(router.currentRoute[routeName], newObj);
+      }
+      Object.values(router.currentRoute).forEach((r) => {
+        if (r && r.name !== routeName) r.isActive = false;
       });
       if (constants.isClient) {
         window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
-    return Promise.resolve();
+    return nextUrl;
   };
   function popHandler() {
     const currentUrl = `${location.pathname}${location.search}`;
@@ -329,23 +346,21 @@ function createRouter(config) {
   return router;
 }
 
-// packages/core/utils/addNames.ts
-function addNames(obj) {
-  Object.entries(obj).forEach(([key, value]) => {
-    value.name = key;
-  });
-  return obj;
-}
-
 // packages/core/createRoutes.ts
 function createRoutes(config) {
-  return addNames(config);
+  Object.entries(config).forEach(([key, value]) => {
+    value.name = key;
+  });
+  return config;
 }
 
 // packages/core/utils/routerSetLoadedComponent.ts
 function routerSetLoadedComponent(props, config) {
-  const currentRouteName = props.router.currentRoute.name;
-  const currentRoutePage = props.router.currentRoute.pageId;
+  const activeRoute = Object.values(props.router.currentRoute).find(
+    (currentRoute) => currentRoute?.isActive
+  );
+  const currentRouteName = activeRoute?.name;
+  const currentRoutePage = activeRoute?.pageId;
   const componentConfig = props.router.routes[currentRouteName];
   let preventRedirect = false;
   if (props.router.isRedirecting) preventRedirect = true;

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.33",
+  "version": "0.0.1-alpha.35",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",

package/preact/Router.d.ts

@@ -1,3 +1,3 @@
 import { TypePropsRouter, TypeRoute } from 'reactive-route';
-export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): any;
+export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=Router.d.ts.map

package/preact/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA6CtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA0CtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,2CAIhG"}

package/preact/index.cjs

@@ -52,14 +52,10 @@ function RouterInner(props) {
     };
   }, []);
   if (!config.loadedComponentName) return null;
-  const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
-  return null;
+  const LoadedComponent = props.router.routes[config.loadedComponentName].component;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
 }
 function Router(props) {
-  const [Component] = (0, import_hooks.useState)(
-    () => props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner
-  );
+  const [Component] = (0, import_hooks.useState)(() => props.router.adapters.observer(RouterInner));
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
 }

package/preact/index.mjs

@@ -26,15 +26,11 @@ function RouterInner(props) {
     };
   }, []);
   if (!config.loadedComponentName) return null;
-  const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent)
-    return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
-  return null;
+  const LoadedComponent = props.router.routes[config.loadedComponentName].component;
+  return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
 }
 function Router(props) {
-  const [Component] = useState(
-    () => props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner
-  );
+  const [Component] = useState(() => props.router.adapters.observer(RouterInner));
   return /* @__PURE__ */ jsx(Component, { ...props });
 }
 export {

package/react/Router.d.ts

@@ -1,5 +1,3 @@
 import { TypePropsRouter, TypeRoute } from 'reactive-route';
-declare function RouterWrapper<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): any;
-export declare const Router: typeof RouterWrapper;
-export {};
+export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=Router.d.ts.map

package/react/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA6CtF,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA0CtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,2CAIhG"}

package/react/index.cjs

@@ -52,13 +52,10 @@ function RouterInner(props) {
     };
   }, []);
   if (!config.loadedComponentName) return null;
-  const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
-  return null;
+  const LoadedComponent = props.router.routes[config.loadedComponentName].component;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
 }
-function RouterWrapper(props) {
-  const Component = props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner;
+function Router(props) {
+  const [Component] = (0, import_react.useState)(() => props.router.adapters.observer(RouterInner));
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
 }
-var Router = (0, import_react.memo)(RouterWrapper);

package/react/index.mjs

@@ -1,5 +1,5 @@
 // packages/react/Router.tsx
-import { memo, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { routerSetLoadedComponent } from "reactive-route";
 import { jsx } from "react/jsx-runtime";
 function RouterInner(props) {
@@ -26,16 +26,13 @@ function RouterInner(props) {
     };
   }, []);
   if (!config.loadedComponentName) return null;
-  const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent)
-    return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
-  return null;
+  const LoadedComponent = props.router.routes[config.loadedComponentName].component;
+  return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
 }
-function RouterWrapper(props) {
-  const Component = props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner;
+function Router(props) {
+  const [Component] = useState(() => props.router.adapters.observer(RouterInner));
   return /* @__PURE__ */ jsx(Component, { ...props });
 }
-var Router = memo(RouterWrapper);
 export {
   Router
 };

package/solid/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAItF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAsChG"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAItF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAoChG"}

package/solid/index.cjs

@@ -55,7 +55,7 @@ function Router(props) {
       get children() {
         return (0, import_web.createComponent)(import_web3.Dynamic, (0, import_web2.mergeProps)({
           get component() {
-            return props.router.routes[config.loadedComponentName]?.component || void 0;
+            return props.router.routes[config.loadedComponentName].component;
           }
         }, () => config.currentProps, {
           get router() {

package/solid/index.mjs

@@ -29,7 +29,7 @@ function Router(props) {
       get children() {
         return _$createComponent(Dynamic, _$mergeProps({
           get component() {
-            return props.router.routes[config.loadedComponentName]?.component || void 0;
+            return props.router.routes[config.loadedComponentName].component;
           }
         }, () => config.currentProps, {
           get router() {

package/core/utils/addNames.d.ts

@@ -1,8 +0,0 @@
-type TypeObjectWithNames<T> = {
-    [Key in keyof T]: T[Key] & {
-        name: Key;
-    };
-};
-export declare function addNames<T extends Record<string, any>>(obj: T): TypeObjectWithNames<T>;
-export {};
-//# sourceMappingURL=addNames.d.ts.map

package/core/utils/addNames.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"addNames.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/addNames.ts"],"names":[],"mappings":"AAAA,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG;QAAE,IAAI,EAAE,GAAG,CAAA;KAAE;CAAE,CAAC;AAE3E,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAMtF"}