reactive-route 0.0.1-alpha.23 → 0.0.1-alpha.24

package/dist/cjs/index.js

@@ -142,9 +142,8 @@ var history = constants.isClient ? (0, import_history.createBrowserHistory)() :
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
-  if (!route.component && route.loader) {
-    const loadingFn = route.loader;
-    return loadingFn().then((module2) => {
+  if (!route.component) {
+    return route.loader().then((module2) => {
       const { default: component, ...rest } = module2;
       route.component = component;
       route.otherExports = rest;
@@ -202,10 +201,13 @@ function createRouter({
     restoreFromServer: void 0,
     get adapters() {
       return adapters;
+    },
+    get routes() {
+      return routes;
     }
   });
   router.restoreFromServer = function restoreFromServer(obj) {
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
@@ -256,8 +258,8 @@ function createRouter({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        adapters.batch(() => {
-          adapters.replaceObject(router.currentRoute, {
+        router.adapters.batch(() => {
+          router.adapters.replaceObject(router.currentRoute, {
             ...router.currentRoute,
             query: nextQuery || {}
           });
@@ -273,7 +275,7 @@ function createRouter({
       }
       return Promise.resolve();
     }
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.isRedirecting = true;
     });
     try {
@@ -324,21 +326,21 @@ function createRouter({
       }
       console.error(error);
       await loadComponentToConfig({ route: routes.internalError });
-      adapters.batch(() => {
-        adapters.replaceObject(router.currentRoute, {
+      router.adapters.batch(() => {
+        router.adapters.replaceObject(router.currentRoute, {
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: adapters.makeObservable({}),
-          params: adapters.makeObservable({}),
+          query: router.adapters.makeObservable({}),
+          params: router.adapters.makeObservable({}),
           pageId: routes[routes.internalError.name].pageId
         });
         router.isRedirecting = false;
       });
       return Promise.resolve();
     }
-    adapters.batch(() => {
-      adapters.replaceObject(router.currentRoute, {
+    router.adapters.batch(() => {
+      router.adapters.replaceObject(router.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,

package/dist/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;AAYhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,MAAM,EACN,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAiPtB"}
+{"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;AAYhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,MAAM,EACN,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAoPtB"}

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

@@ -3,6 +3,7 @@ import { TypeCurrentRoute } from './TypeCurrentRoute';
 import { TypeRedirectParams } from './TypeRedirectParams';
 import { TypeRoute } from './TypeRoute';
 export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
+    routes: TRoutes;
     adapters: TypeAdapters;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
     routesHistory: Array<string>;
@@ -12,6 +13,9 @@ export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalErr
         pathname: string;
         noHistoryPush?: boolean;
     }): Promise<void>;
-    restoreFromServer(obj: TypeRouter<TRoutes>): Promise<void>;
+    restoreFromServer(obj: {
+        routesHistory: Array<string>;
+        currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+    }): Promise<void>;
 };
 //# sourceMappingURL=TypeRouter.d.ts.map

package/dist/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,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,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,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D,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,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,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,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,iBAAiB,CAAC,GAAG,EAAE;QACrB,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;KACxD,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"loadComponentToConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/loadComponentToConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAejF"}
+{"version":3,"file":"loadComponentToConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/loadComponentToConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAajF"}

package/dist/esm/index.js

@@ -111,9 +111,8 @@ var history = constants.isClient ? createBrowserHistory() : null;
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
-  if (!route.component && route.loader) {
-    const loadingFn = route.loader;
-    return loadingFn().then((module) => {
+  if (!route.component) {
+    return route.loader().then((module) => {
       const { default: component, ...rest } = module;
       route.component = component;
       route.otherExports = rest;
@@ -171,10 +170,13 @@ function createRouter({
     restoreFromServer: void 0,
     get adapters() {
       return adapters;
+    },
+    get routes() {
+      return routes;
     }
   });
   router.restoreFromServer = function restoreFromServer(obj) {
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
@@ -225,8 +227,8 @@ function createRouter({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        adapters.batch(() => {
-          adapters.replaceObject(router.currentRoute, {
+        router.adapters.batch(() => {
+          router.adapters.replaceObject(router.currentRoute, {
             ...router.currentRoute,
             query: nextQuery || {}
           });
@@ -242,7 +244,7 @@ function createRouter({
       }
       return Promise.resolve();
     }
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.isRedirecting = true;
     });
     try {
@@ -293,21 +295,21 @@ function createRouter({
       }
       console.error(error);
       await loadComponentToConfig({ route: routes.internalError });
-      adapters.batch(() => {
-        adapters.replaceObject(router.currentRoute, {
+      router.adapters.batch(() => {
+        router.adapters.replaceObject(router.currentRoute, {
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: adapters.makeObservable({}),
-          params: adapters.makeObservable({}),
+          query: router.adapters.makeObservable({}),
+          params: router.adapters.makeObservable({}),
           pageId: routes[routes.internalError.name].pageId
         });
         router.isRedirecting = false;
       });
       return Promise.resolve();
     }
-    adapters.batch(() => {
-      adapters.replaceObject(router.currentRoute, {
+    router.adapters.batch(() => {
+      router.adapters.replaceObject(router.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.23",
+  "version": "0.0.1-alpha.24",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -47,6 +47,7 @@
     "@types/lodash": "4.17.16",
     "@types/node": "22.14.1",
     "@vitest/coverage-istanbul": "3.2.4",
+    "vite-tsconfig-paths": "5.1.4",
     "@preact/preset-vite": "2.10.2",
     "badge-maker": "5.0.2",
     "esbuild": "0.25.10",
@@ -63,7 +64,7 @@
     "solid-js": "1.9.9",
     "tsx": "4.20.5",
     "typescript": "5.9.2",
-    "vitepress": "1.6.4",
+    "vitepress": "2.0.0-alpha.12",
     "vitepress-plugin-group-icons": "1.6.3",
     "vitest": "3.2.4",
     "xml-splitter": "1.2.1"

package/pnpm-workspace.yaml

@@ -1,5 +0,0 @@
-ignoredBuiltDependencies:
-  - esbuild
-
-onlyBuiltDependencies:
-  - '@mongodb-js/zstd'