reactive-route 0.0.1-alpha.14 → 0.0.1-alpha.16

package/dist/adapters/kr-observable.d.ts.map

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

package/dist/adapters/mobx.d.ts.map

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

package/dist/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,YAoBtB,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,YAmBtB,CAAC"}

package/dist/cjs/adapters/kr-observable/index.js

@@ -35,6 +35,5 @@ var adapters = {
     Object.assign(obj, newObj);
   },
   makeObservable: import_kr_observable.makeObservable,
-  makeAutoObservable: import_kr_observable.makeObservable,
   observer: import_react.observer
 };

package/dist/cjs/adapters/mobx/index.js

@@ -39,6 +39,5 @@ var adapters = {
       Object.assign(obj, newObj);
     });
   },
-  makeObservable: import_mobx.observable,
-  makeAutoObservable: import_mobx.makeAutoObservable
+  makeObservable: import_mobx.observable
 };

package/dist/cjs/adapters/solid/index.js

@@ -41,6 +41,5 @@ var adapters = {
       })
     );
   },
-  makeObservable: import_store.createMutable,
-  makeAutoObservable: import_store.createMutable
+  makeObservable: import_store.createMutable
 };

package/dist/cjs/index.js

@@ -144,7 +144,7 @@ function getQueryValues(params) {
 
 // packages/core/utils/getInitialRoute.ts
 function getInitialRoute(params) {
-  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
+  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes.notFound;
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
@@ -193,7 +193,6 @@ function replaceDynamicValues({
 function createRouterStore({
   adapters,
   routes,
-  routeError500,
   lifecycleParams
 }) {
   const routerStore = adapters.makeObservable({
@@ -216,7 +215,7 @@ function createRouterStore({
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
   routerStore.restoreFromURL = function restoreFromURL(params) {
-    return routerStore.redirectTo(getInitialRoute({ routes, ...params }));
+    return routerStore.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
   };
   routerStore.redirectTo = async function redirectTo(config) {
     const { route: routeName, noHistoryPush, asClient } = config;
@@ -335,15 +334,15 @@ function createRouterStore({
         throw error;
       }
       console.error(error);
-      await loadComponentToConfig({ route: routeError500 });
+      await loadComponentToConfig({ route: routes.internalError });
       adapters.batch(() => {
         adapters.replaceObject(routerStore.currentRoute, {
-          name: routeError500.name,
-          path: routeError500.path,
-          props: routes[routeError500.name].props,
+          name: routes.internalError.name,
+          path: routes.internalError.path,
+          props: routes[routes.internalError.name].props,
           query: {},
           params: {},
-          pageName: routes[routeError500.name].pageName
+          pageName: routes[routes.internalError.name].pageName
         });
         routerStore.isRedirecting = false;
       });

package/dist/cjs/react/index.js

@@ -42,8 +42,7 @@ function RouterInner(props) {
         noHistoryPush: true,
         ...(0, import_reactive_route.getInitialRoute)({
           routes: props.routes,
-          pathname: import_reactive_route.history.location.pathname,
-          fallback: "error404"
+          pathname: import_reactive_route.history.location.pathname
         })
       });
     });
@@ -66,7 +65,6 @@ function RouterInner(props) {
       if (loadedComponentPage === currentRoute.pageName) {
         props.routerStore.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-          config[Symbol.for("$adm")]?.batch();
         });
         preventRedirect = true;
       }
@@ -78,7 +76,6 @@ function RouterInner(props) {
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
       config.loadedComponentPage = componentConfig.pageName;
-      config[Symbol.for("$adm")]?.batch();
     });
   }, []);
   (0, import_react.useState)(() => {

package/dist/cjs/solid/index.js

@@ -48,8 +48,7 @@ function Router(props) {
         noHistoryPush: true,
         ...(0, import_reactive_route.getInitialRoute)({
           routes: props.routes,
-          pathname: import_reactive_route.history.location.pathname,
-          fallback: "error404"
+          pathname: import_reactive_route.history.location.pathname
         })
       });
     });
@@ -78,23 +77,25 @@ function Router(props) {
         props.routerStore.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
         config.loadedComponentName = currentRouteName;
         config.loadedComponentPage = componentConfig.pageName;
-        config[Symbol.for("$adm")]?.batch();
       });
     });
   }
   props.beforeMount?.();
   redirectOnHistoryPop();
   props.routerStore.adapters.autorun(() => setLoadedComponent());
-  return (0, import_web.createComponent)(import_solid_js.Show, {
-    get when() {
-      return config.loadedComponentName;
-    },
-    get children() {
-      return (0, import_web.createComponent)(import_web3.Dynamic, (0, import_web2.mergeProps)({
-        get component() {
-          return props.routes[config.loadedComponentName]?.component || void 0;
-        }
-      }, () => config.currentProps));
-    }
-  });
+  return (
+    // @ts-ignore
+    (0, import_web.createComponent)(import_solid_js.Show, {
+      get when() {
+        return config.loadedComponentName;
+      },
+      get children() {
+        return (0, import_web.createComponent)(import_web3.Dynamic, (0, import_web2.mergeProps)({
+          get component() {
+            return props.routes[config.loadedComponentName]?.component || void 0;
+          }
+        }, () => config.currentProps));
+      }
+    })
+  );
 }

package/dist/core/createRouterConfig.d.ts

@@ -1,6 +1,6 @@
 import { TypeRouteRaw } from './types/TypeRouteRaw';
 export declare function createRouterConfig<TConfig extends {
-    [Key in keyof TConfig]: TypeRouteRaw;
+    [Key in keyof TConfig | 'notFound' | 'internalError']: TypeRouteRaw;
 }>(config: TConfig): {
     [Key in keyof TConfig]: TConfig[Key] & {
         name: Key;

package/dist/core/createRouterConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouterConfig.d.ts","sourceRoot":"","sources":["../../packages/core/createRouterConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,kBAAkB,CAAC,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,YAAY;CAAE,EACzF,MAAM,EAAE,OAAO,GACd;KACA,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;QACrC,IAAI,EAAE,GAAG,CAAC;QACV,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}
+{"version":3,"file":"createRouterConfig.d.ts","sourceRoot":"","sources":["../../packages/core/createRouterConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,kBAAkB,CAChC,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,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}

package/dist/core/createRouterStore.d.ts

@@ -1,4 +1,4 @@
 import { InterfaceRouterStore, TypeCreateRouterStore } from './types/InterfaceRouterStore';
 import { TypeRoute } from './types/TypeRoute';
-export declare function createRouterStore<TRoutes extends Record<string, TypeRoute>>({ adapters, routes, routeError500, lifecycleParams, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
+export declare function createRouterStore<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>({ adapters, routes, lifecycleParams, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
 //# sourceMappingURL=createRouterStore.d.ts.map

package/dist/core/createRouterStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouterStore.d.ts","sourceRoot":"","sources":["../../packages/core/createRouterStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE3F,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAS9C,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC3E,QAAQ,EACR,MAAM,EACN,aAAa,EACb,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CA0PhE"}
+{"version":3,"file":"createRouterStore.d.ts","sourceRoot":"","sources":["../../packages/core/createRouterStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE3F,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAS9C,wBAAgB,iBAAiB,CAC/B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,QAAQ,EACR,MAAM,EACN,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CA0PhE"}

package/dist/core/types/InterfaceRouterStore.d.ts

@@ -6,17 +6,14 @@ export type TypeAdapters = {
     autorun: (cb: () => void) => any;
     replaceObject: <TObj extends Record<string, any>>(obj: TObj, newObj: TObj) => void;
     makeObservable: <TObj extends Record<string, any>>(obj: TObj) => TObj;
-    makeAutoObservable: (...args: Array<any>) => any;
     observer?: (comp: any) => any;
-    subscribe?: (target: any, cb: () => void, keys: Set<any>) => any;
 };
-export type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = {
+export type TypeCreateRouterStore<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
     routes: TRoutes;
-    routeError500: TRoutes[keyof TRoutes];
     lifecycleParams?: Array<any>;
     adapters: TypeAdapters;
 };
-export type InterfaceRouterStore<TRoutes extends Record<string, TypeRoute>> = {
+export type InterfaceRouterStore<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
     adapters: TypeAdapters;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
     routesHistory: Array<string>;
@@ -24,7 +21,6 @@ export type InterfaceRouterStore<TRoutes extends Record<string, TypeRoute>> = {
     redirectTo<TRouteName extends keyof TRoutes>(config: TypeRedirectToParams<TRoutes, TRouteName>): Promise<void>;
     restoreFromURL(params: {
         pathname: string;
-        fallback: TRoutes[keyof TRoutes]['name'];
     }): Promise<void>;
     restoreFromServer(obj: InterfaceRouterStore<TRoutes>): Promise<void>;
 };

package/dist/core/types/InterfaceRouterStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InterfaceRouterStore.d.ts","sourceRoot":"","sources":["../../../packages/core/types/InterfaceRouterStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;IACnF,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,kBAAkB,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;IACjD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC7E,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC5E,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,UAAU,SAAS,MAAM,OAAO,EACzC,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE,CAAC"}
+{"version":3,"file":"InterfaceRouterStore.d.ts","sourceRoot":"","sources":["../../../packages/core/types/InterfaceRouterStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;IACnF,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IACtE;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IACtE;IACF,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,UAAU,SAAS,MAAM,OAAO,EACzC,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE,CAAC"}

package/dist/core/utils/getInitialRoute.d.ts

@@ -1,8 +1,7 @@
 import { TypeRedirectToParams } from '../types/TypeRedirectToParams';
 import { TypeRoute } from '../types/TypeRoute';
-export declare function getInitialRoute<TRoutes extends Record<string, TypeRoute>>(params: {
+export declare function getInitialRoute<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>(params: {
     routes: TRoutes;
     pathname: string;
-    fallback: TRoutes[keyof TRoutes]['name'];
 }): TypeRedirectToParams<TRoutes, keyof TRoutes>;
 //# sourceMappingURL=getInitialRoute.d.ts.map

package/dist/core/utils/getInitialRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE;IACjF,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;CAC1C,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAU/C"}
+{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAU7F"}

package/dist/esm/adapters/kr-observable/index.js

@@ -11,7 +11,6 @@ var adapters = {
     Object.assign(obj, newObj);
   },
   makeObservable,
-  makeAutoObservable: makeObservable,
   observer
 };
 export {

package/dist/esm/adapters/mobx/index.js

@@ -1,5 +1,5 @@
 // packages/adapters/mobx.ts
-import { autorun, makeAutoObservable, observable, runInAction } from "mobx";
+import { autorun, observable, runInAction } from "mobx";
 import { observer } from "mobx-react-lite";
 var adapters = {
   batch: runInAction,
@@ -15,8 +15,7 @@ var adapters = {
       Object.assign(obj, newObj);
     });
   },
-  makeObservable: observable,
-  makeAutoObservable
+  makeObservable: observable
 };
 export {
   adapters

package/dist/esm/adapters/solid/index.js

@@ -17,8 +17,7 @@ var adapters = {
       })
     );
   },
-  makeObservable: createMutable,
-  makeAutoObservable: createMutable
+  makeObservable: createMutable
 };
 export {
   adapters

package/dist/esm/index.js

@@ -101,7 +101,7 @@ function getQueryValues(params) {
 
 // packages/core/utils/getInitialRoute.ts
 function getInitialRoute(params) {
-  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
+  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes.notFound;
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
@@ -150,7 +150,6 @@ function replaceDynamicValues({
 function createRouterStore({
   adapters,
   routes,
-  routeError500,
   lifecycleParams
 }) {
   const routerStore = adapters.makeObservable({
@@ -173,7 +172,7 @@ function createRouterStore({
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
   routerStore.restoreFromURL = function restoreFromURL(params) {
-    return routerStore.redirectTo(getInitialRoute({ routes, ...params }));
+    return routerStore.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
   };
   routerStore.redirectTo = async function redirectTo(config) {
     const { route: routeName, noHistoryPush, asClient } = config;
@@ -292,15 +291,15 @@ function createRouterStore({
         throw error;
       }
       console.error(error);
-      await loadComponentToConfig({ route: routeError500 });
+      await loadComponentToConfig({ route: routes.internalError });
       adapters.batch(() => {
         adapters.replaceObject(routerStore.currentRoute, {
-          name: routeError500.name,
-          path: routeError500.path,
-          props: routes[routeError500.name].props,
+          name: routes.internalError.name,
+          path: routes.internalError.path,
+          props: routes[routes.internalError.name].props,
           query: {},
           params: {},
-          pageName: routes[routeError500.name].pageName
+          pageName: routes[routes.internalError.name].pageName
         });
         routerStore.isRedirecting = false;
       });

package/dist/esm/react/index.js

@@ -16,8 +16,7 @@ function RouterInner(props) {
         noHistoryPush: true,
         ...getInitialRoute({
           routes: props.routes,
-          pathname: history.location.pathname,
-          fallback: "error404"
+          pathname: history.location.pathname
         })
       });
     });
@@ -40,7 +39,6 @@ function RouterInner(props) {
       if (loadedComponentPage === currentRoute.pageName) {
         props.routerStore.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-          config[Symbol.for("$adm")]?.batch();
         });
         preventRedirect = true;
       }
@@ -52,7 +50,6 @@ function RouterInner(props) {
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
       config.loadedComponentPage = componentConfig.pageName;
-      config[Symbol.for("$adm")]?.batch();
     });
   }, []);
   useState(() => {

package/dist/esm/solid/index.js

@@ -22,8 +22,7 @@ function Router(props) {
         noHistoryPush: true,
         ...getInitialRoute({
           routes: props.routes,
-          pathname: history.location.pathname,
-          fallback: "error404"
+          pathname: history.location.pathname
         })
       });
     });
@@ -52,25 +51,27 @@ function Router(props) {
         props.routerStore.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
         config.loadedComponentName = currentRouteName;
         config.loadedComponentPage = componentConfig.pageName;
-        config[Symbol.for("$adm")]?.batch();
       });
     });
   }
   props.beforeMount?.();
   redirectOnHistoryPop();
   props.routerStore.adapters.autorun(() => setLoadedComponent());
-  return _$createComponent(Show, {
-    get when() {
-      return config.loadedComponentName;
-    },
-    get children() {
-      return _$createComponent(Dynamic, _$mergeProps({
-        get component() {
-          return props.routes[config.loadedComponentName]?.component || void 0;
-        }
-      }, () => config.currentProps));
-    }
-  });
+  return (
+    // @ts-ignore
+    _$createComponent(Show, {
+      get when() {
+        return config.loadedComponentName;
+      },
+      get children() {
+        return _$createComponent(Dynamic, _$mergeProps({
+          get component() {
+            return props.routes[config.loadedComponentName]?.component || void 0;
+          }
+        }, () => config.currentProps));
+      }
+    })
+  );
 }
 export {
   Router

package/dist/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;AAwGtF,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;AAuGtF,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"}

package/dist/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,kCA2FhG"}
+{"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,kCA4FhG"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.14",
+  "version": "0.0.1-alpha.16",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "esbuild": "0.25.9",
     "global-jsdom": "26.0.0",
     "husky": "9.1.7",
-    "kr-observable": "3.0.23",
+    "kr-observable": "3.1.1",
     "lint-staged": "16.1.6",
     "lodash": "4.17.21",
     "mobx": "6.13.7",

package/tsconfig.solid.json

@@ -1,9 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["packages/solid"],
-  "exclude": ["packages/solid/test"],
-  "compilerOptions": {
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js"
-  }
-}

package/tsconfig.types.react.json

@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["packages"],
-  "compilerOptions": {
-    "outDir": "./dist",
-    "noEmit": false,
-    "declaration": true,
-    "declarationMap": true,
-    "emitDeclarationOnly": true
-  }
-}

package/tsconfig.types.solid.json

@@ -1,14 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["packages/solid"],
-  "exclude": ["packages/solid/test"],
-  "compilerOptions": {
-    "outDir": "./dist",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "noEmit": false,
-    "declaration": true,
-    "declarationMap": true,
-    "emitDeclarationOnly": true
-  }
-}