mobx-route 0.0.18 → 0.0.20

package/README.md

@@ -18,77 +18,16 @@
 
 Uses [`path-to-regexp` power](https://www.npmjs.com/package/path-to-regexp)  
 
-```ts
-import { Route } from "mobx-route";
-
-
-const userDetails = new Route("/users/:id");
-
-userDetails.navigate({ id: 1 }); // path params are required
-
-const userMatrix = userDetails.extend('/matrix{/:matrixId}');
-
-userMatrix.navigate({
-  id: 1, // still required
-  matrixId: '1', // optional because wrapped into {}
-})
-
-if (userMatrix.match) {
-  console.log(userMatrix.match) // { path: string; params: { id: string; matrixId?: string } }
-}
-
-console.log(userMatrix.isMatches) // true
-
-
-userMatrix.queryParams.update({
-  bar: 1,
-})
-
-userMatrix.queryParams.data; // { bar: "1" }
-
-```
-
-## Integration with React   
-
-```tsx
-import { RouteView } from "mobx-route/react";
-
-...
-<RouteView route={userMatrix} view={YourComponent} />
-```
-
-## Integration with [`mobx-view-model`](https://js2me.github.io/mobx-view-model/)  
-
-```tsx
-import { RouteViewModel } from "mobx-route/view-model";
-import { withViewModel } from "mobx-view-model";
 
-...
-class YourVM extends RouteViewModel<typeof userMatrix> {
-  route = userMatrix;
-}
-
-export const YourComponent = withViewModel(YourVM)(YourComponentView);
-```
+### Documentation: [js2me.github.io/mobx-route](https://js2me.github.io/mobx-route)  
 
 
-# Examples   
-
 ```ts
-const routes = {
-  home: new Route('/'),
-  apps: new RouteGroup({
-    index: new Route('/apps', { index: true }),
-    new: new Route('/apps/new'),
-    details: new Route('/apps/:appId'),
-  }),
-}
-
-history.pushState(null, '', '/apps');
+import { Route } from "mobx-route";
 
-routes.apps.index.isOpened; // true
+const userDetails = new Route("/users/:id");
 
-routes.apps.details.open({ appId: 1 });
+userDetails.open({ id: 1 }); // path params are required
 
-location.pathname; // /apps/1
-```
+userDetails.isOpened; // true;
+```

package/core/config/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/config/config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,eAAO,MAAM,WAAW;;;;CAqCvB,CAAC"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"config.types.d.ts","sourceRoot":"","sources":["../../../src/core/config/config.types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/core/config/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC"}

package/core/index.d.ts

@@ -0,0 +1,6 @@
+export * from './config/index.js';
+export * from './route/index.js';
+export * from './route-group/index.js';
+export * from './virtual-route/index.js';
+export * from './router/index.js';
+//# sourceMappingURL=index.d.ts.map

package/core/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC"}

package/core/index.js

@@ -0,0 +1,5 @@
+export * from './config/index.js';
+export * from './route/index.js';
+export * from './route-group/index.js';
+export * from './virtual-route/index.js';
+export * from './router/index.js';

package/core/route/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/route/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}

package/{route → core/route}/route.d.ts

@@ -1,7 +1,7 @@
 import { IMobxHistory, IMobxLocation, IQueryParams } from 'mobx-location-history';
 import { ParamData, TokenData } from 'path-to-regexp';
 import { AllPropertiesOptional, AnyObject, Maybe } from 'yummies/utils/types';
-import { AnyRoute, ExtractPathParams, RouteConfiguration, RouteMatchesData, RouteNavigateParams } from './route.types.js';
+import { AnyRoute, ExtractPathParams, ParsedPathParams, RouteConfiguration, RouteMatchesData, RouteNavigateParams } from './route.types.js';
 export declare class Route<TPath extends string, TParentRoute extends Route<any, any> | null = null> {
     path: TPath;
     protected config: RouteConfiguration<TParentRoute>;
@@ -10,15 +10,19 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
     protected baseUrl: string;
     query: IQueryParams;
     private _tokenData;
+    private _matcher?;
+    private _compiler?;
     children: AnyRoute[];
     constructor(path: TPath, config?: RouteConfiguration<TParentRoute>);
-    get data(): RouteMatchesData<TPath> | null;
+    protected get data(): RouteMatchesData<TPath> | null;
+    get currentPath(): string | null;
+    get params(): ParsedPathParams<TPath> | null;
     get isOpened(): boolean;
     get isIndex(): boolean;
     extend<TExtendPath extends string>(path: TExtendPath, config?: Omit<RouteConfiguration<any>, 'parent'>): Route<`${TPath}${TExtendPath}`, this>;
     addChildren(...children: AnyRoute[]): void;
     removeChildren(...childrenToRemove: AnyRoute[]): void;
-    get hasChildrenMatches(): boolean;
+    get hasOpenedChildren(): boolean;
     protected processParams(params?: ExtractPathParams<TPath> | null | undefined): ParamData | undefined;
     createUrl(...args: AllPropertiesOptional<ExtractPathParams<TPath>> extends true ? [params?: Maybe<ExtractPathParams<TPath>>, query?: AnyObject] : [params: ExtractPathParams<TPath>, query?: AnyObject]): string;
     open(...args: AllPropertiesOptional<ExtractPathParams<TPath>> extends true ? [

package/core/route/route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;IAezC,IAAI,EAAE,KAAK;IAClB,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAdpD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,KAAK,EAAE,YAAY,CAAC;IAEpB,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,SAAS,CAAC,CAA6B;IAE/C,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAGjB,IAAI,EAAE,KAAK,EACR,MAAM,GAAE,kBAAkB,CAAC,YAAY,CAAM;IAqBzD,SAAS,KAAK,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CA0BnD;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED,IAAI,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CAE3C;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,OAAO,YAEV;IAED,MAAM,CAAC,WAAW,SAAS,MAAM,EAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAmBlD,WAAW,CAAC,GAAG,QAAQ,EAAE,QAAQ,EAAE;IAInC,cAAc,CAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE;IAM9C,IAAI,iBAAiB,YAEpB;IAED,SAAS,CAAC,aAAa,CACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS,GACnD,SAAS,GAAG,SAAS;IAWxB,SAAS,CACP,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC7D,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAiB3D,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE;QACE,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS;QACpD,cAAc,CAAC,EAAE,mBAAmB;KACrC,GACD,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,EAAE,mBAAmB,CAAC,GAC3E,IAAI;IAEP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAc7D,SAAS,KAAK,SAAS,cAKtB;CACF"}

package/{route → core/route}/route.js

@@ -10,6 +10,8 @@ export class Route {
     baseUrl;
     query;
     _tokenData;
+    _matcher;
+    _compiler;
     children = [];
     constructor(path, config = {}) {
         this.path = path;
@@ -19,9 +21,11 @@ export class Route {
         this.query = config.queryParams ?? routeConfig.get().queryParams;
         const usedBaseUrl = this.config.baseUrl ?? routeConfig.get().baseUrl;
         this.baseUrl = !usedBaseUrl || usedBaseUrl === '/' ? '' : usedBaseUrl;
-        computed.struct(this, 'isMatches');
-        computed.struct(this, 'matchData');
-        computed.struct(this, 'hasChildrenMatches');
+        computed.struct(this, 'isOpened');
+        computed.struct(this, 'data');
+        computed.struct(this, 'params');
+        computed.struct(this, 'currentPath');
+        computed.struct(this, 'hasOpenedChildren');
         observable(this, 'children');
         action(this, 'addChildren');
         action(this, 'removeChildren');
@@ -39,12 +43,19 @@ export class Route {
             (pathname === '/' || pathname === '')) {
             return { params: {}, path: pathname };
         }
-        const parsed = match(this.tokenData)(pathname);
+        const matcher = this._matcher ?? (this._matcher = match(this.tokenData));
+        const parsed = matcher(pathname);
         if (parsed === false) {
             return null;
         }
         return parsed;
     }
+    get currentPath() {
+        return this.data?.path ?? null;
+    }
+    get params() {
+        return this.data?.params ?? null;
+    }
     get isOpened() {
         return this.data !== null;
     }
@@ -66,7 +77,7 @@ export class Route {
     removeChildren(...childrenToRemove) {
         this.children = this.children.filter((child) => !childrenToRemove.includes(child));
     }
-    get hasChildrenMatches() {
+    get hasOpenedChildren() {
         return this.children.some((child) => child.isOpened);
     }
     processParams(params) {
@@ -82,7 +93,8 @@ export class Route {
     createUrl(...args) {
         const pathParams = args[0];
         const queryParams = args[1];
-        const path = compile(this.tokenData)(this.processParams(pathParams));
+        const compiler = this._compiler ?? (this._compiler = compile(this.tokenData));
+        const path = compiler(this.processParams(pathParams));
         return [
             this.baseUrl,
             // type === 'hash' ? '#' : '',

package/core/route/route.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.test.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.test.ts"],"names":[],"mappings":""}

package/{route → core/route}/route.test.js

@@ -86,7 +86,10 @@ describe('route', () => {
         const otherRoute = new Route('/kek/pek');
         expect(otherRoute.isOpened).toBe(false);
         expect(route.isOpened).toBe(true);
-        expect(route.data).toEqual({
+        expect({
+            path: route.currentPath,
+            params: route.params,
+        }).toEqual({
             path: '/posts/true/1/2/3/bar',
             params: {
                 rest: ['1', '2', '3', 'bar'],

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

@@ -0,0 +1 @@
+{"version":3,"file":"route.types.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.types.ts"],"names":[],"mappings":"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"}

package/core/route-group/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC"}

package/core/route-group/route-group.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAM5C,IAAI,QAAQ,IAAI,OAAO,CAGtB;IAED,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAqBpB"}

package/{route-group → core/route-group}/route-group.js

@@ -26,5 +26,8 @@ export class RouteGroup {
         if (lastGroupRoute) {
             lastGroupRoute.open();
         }
+        else if (process.env.NODE_ENV !== 'production') {
+            console.warn("RouteGroup doesn't have index route. open() method doesn't work.");
+        }
     }
 }

package/core/route-group/route-group.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-group.types.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAEzD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,aAAa,GAAG,YAAY,CAAC;AAE1E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC"}

package/core/router/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}

package/core/router/router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/core/router/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBAAa,MAAM,CAAC,iBAAiB,SAAS,gBAAgB;IAC5D,MAAM,EAAE,iBAAiB,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,KAAK,EAAE,YAAY,CAAC;gBAER,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;IAO1D,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;CAWtD"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"router.types.d.ts","sourceRoot":"","sources":["../../../src/core/router/router.types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,WAAW,mBAAmB,CAAC,aAAa,SAAS,gBAAgB;IACzE,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}

package/core/virtual-route/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC"}

package/core/virtual-route/virtual-route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-route.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAkB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,qBAAa,YAAY,CACvB,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB;IALvD,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,WAAW,CAAoD;gBAEjD,MAAM,GAAE,yBAA8B;IAa5D,IAAI,QAAQ,YAKX;IAED,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC;IAIzC,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC5C,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GACvC,IAAI;IAgBP,KAAK;CAQN"}

package/core/virtual-route/virtual-route.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-route.types.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,yBAAyB,CACxC,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAErD,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAI9D,IAAI,CAAC,EAAE,CACL,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC5C,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,KACrC,OAAO,CAAC;IAGb,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;CACvC"}

package/index.d.ts

@@ -1,7 +1,3 @@
 export * from 'mobx-location-history';
-export * from './config/index.js';
-export * from './route/index.js';
-export * from './route-group/index.js';
-export * from './virtual-route/index.js';
-export * from './router/index.js';
+export * from './core/index.js';
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}

package/index.js

@@ -1,6 +1,2 @@
 export * from 'mobx-location-history';
-export * from './config/index.js';
-export * from './route/index.js';
-export * from './route-group/index.js';
-export * from './virtual-route/index.js';
-export * from './router/index.js';
+export * from './core/index.js';

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "mobx-route",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "keywords": [
     "mobx",
     "react",
     "router",
+    "router",
+    "mobx-router",
     "react-router-dom"
   ],
   "author": "js2me",
   "license": "MIT",
-  "description": "",
+  "description": "simple and lightweight typed router",
   "type": "module",
   "bugs": {
     "url": "https://github.com/js2me/mobx-route/issues"
@@ -23,7 +25,7 @@
     "mobx-location-history": "^2.1.0",
     "path-to-regexp": "^8.2.0",
     "react-simple-loadable": "^2.1.0",
-    "yummies": "^3.1.8"
+    "yummies": "^3.1.9"
   },
   "peerDependencies": {
     "mobx": "^6.12.4",
@@ -52,22 +54,72 @@
     "eslint": "^8.57.1",
     "js2me-eslint-config": "^1.0.7",
     "js2me-exports-post-build-script": "^2.0.18",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.1.0",
     "nodemon": "^3.1.9",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^2.1.9"
+    "vitest": "^3.1.2"
   },
   "exports": {
-    "./config/config": {
-      "import": "./config/config.js",
-      "default": "./config/config.js",
-      "types": "./config/config.d.ts"
-    },
-    "./config": {
-      "import": "./config/index.js",
-      "default": "./config/index.js",
-      "types": "./config/index.d.ts"
+    "./core/config/config": {
+      "import": "./core/config/config.js",
+      "default": "./core/config/config.js",
+      "types": "./core/config/config.d.ts"
+    },
+    "./core/config": {
+      "import": "./core/config/index.js",
+      "default": "./core/config/index.js",
+      "types": "./core/config/index.d.ts"
+    },
+    "./core": {
+      "import": "./core/index.js",
+      "default": "./core/index.js",
+      "types": "./core/index.d.ts"
+    },
+    "./core/route": {
+      "import": "./core/route/index.js",
+      "default": "./core/route/index.js",
+      "types": "./core/route/index.d.ts"
+    },
+    "./core/route/route.test": {
+      "import": "./core/route/route.test.js",
+      "default": "./core/route/route.test.js",
+      "types": "./core/route/route.test.d.ts"
+    },
+    "./core/route/route": {
+      "import": "./core/route/route.js",
+      "default": "./core/route/route.js",
+      "types": "./core/route/route.d.ts"
+    },
+    "./core/route-group": {
+      "import": "./core/route-group/index.js",
+      "default": "./core/route-group/index.js",
+      "types": "./core/route-group/index.d.ts"
+    },
+    "./core/route-group/route-group": {
+      "import": "./core/route-group/route-group.js",
+      "default": "./core/route-group/route-group.js",
+      "types": "./core/route-group/route-group.d.ts"
+    },
+    "./core/router": {
+      "import": "./core/router/index.js",
+      "default": "./core/router/index.js",
+      "types": "./core/router/index.d.ts"
+    },
+    "./core/router/router": {
+      "import": "./core/router/router.js",
+      "default": "./core/router/router.js",
+      "types": "./core/router/router.d.ts"
+    },
+    "./core/virtual-route": {
+      "import": "./core/virtual-route/index.js",
+      "default": "./core/virtual-route/index.js",
+      "types": "./core/virtual-route/index.d.ts"
+    },
+    "./core/virtual-route/virtual-route": {
+      "import": "./core/virtual-route/virtual-route.js",
+      "default": "./core/virtual-route/virtual-route.js",
+      "types": "./core/virtual-route/virtual-route.d.ts"
     },
     ".": {
       "import": "./index.js",
@@ -94,41 +146,6 @@
       "default": "./react/index.js",
       "types": "./react/index.d.ts"
     },
-    "./route": {
-      "import": "./route/index.js",
-      "default": "./route/index.js",
-      "types": "./route/index.d.ts"
-    },
-    "./route/route.test": {
-      "import": "./route/route.test.js",
-      "default": "./route/route.test.js",
-      "types": "./route/route.test.d.ts"
-    },
-    "./route/route": {
-      "import": "./route/route.js",
-      "default": "./route/route.js",
-      "types": "./route/route.d.ts"
-    },
-    "./route-group": {
-      "import": "./route-group/index.js",
-      "default": "./route-group/index.js",
-      "types": "./route-group/index.d.ts"
-    },
-    "./route-group/route-group": {
-      "import": "./route-group/route-group.js",
-      "default": "./route-group/route-group.js",
-      "types": "./route-group/route-group.d.ts"
-    },
-    "./router": {
-      "import": "./router/index.js",
-      "default": "./router/index.js",
-      "types": "./router/index.d.ts"
-    },
-    "./router/router": {
-      "import": "./router/router.js",
-      "default": "./router/router.js",
-      "types": "./router/router.d.ts"
-    },
     "./view-model": {
       "import": "./view-model/index.js",
       "default": "./view-model/index.js",
@@ -139,16 +156,6 @@
       "default": "./view-model/route-view-model.js",
       "types": "./view-model/route-view-model.d.ts"
     },
-    "./virtual-route": {
-      "import": "./virtual-route/index.js",
-      "default": "./virtual-route/index.js",
-      "types": "./virtual-route/index.d.ts"
-    },
-    "./virtual-route/virtual-route": {
-      "import": "./virtual-route/virtual-route.js",
-      "default": "./virtual-route/virtual-route.js",
-      "types": "./virtual-route/virtual-route.d.ts"
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -171,6 +178,9 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
+    "docs": "pnpm build && cd docs && pnpm dev",
+    "docs:build": "pnpm build && cd docs && pnpm build",
+    "docs:serve": "cd docs && pnpm preview",
     "dev": "pnpm test:watch"
   }
 }

package/react/components/link.d.ts

@@ -1,14 +1,16 @@
 import { AnchorHTMLAttributes, ReactNode } from 'react';
 import { AllPropertiesOptional } from 'yummies/utils/types';
-import { AnyRoute, ExtractPathParams, RouteNavigateParams } from '../../route/index.js';
+import { AnyRoute, ExtractPathParams, RouteNavigateParams } from '../../core/index.js';
 export type LinkProps<TRoute extends AnyRoute> = Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'> & {
     asChild?: boolean;
-} & RouteNavigateParams & {
-    route: TRoute;
+} & RouteNavigateParams & (({
+    to: TRoute;
 } & (AllPropertiesOptional<ExtractPathParams<TRoute['path']>> extends true ? {
     params?: ExtractPathParams<TRoute['path']> | null | undefined;
 } : {
     params: ExtractPathParams<TRoute['path']>;
+})) | {
+    to: string;
 });
 type LinkComponentType = <TRoute extends AnyRoute>(props: LinkProps<TRoute>) => ReactNode;
 export declare const Link: LinkComponentType;

package/react/components/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/react/components/link.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAKpB,SAAS,EACV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAa,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS,QAAQ,IAAI,IAAI,CACnD,oBAAoB,CAAC,iBAAiB,CAAC,EACvC,MAAM,CACP,GAAG;IACF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,mBAAmB,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GACtE;IAEE,MAAM,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,GACD;IAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC;AAErD,KAAK,iBAAiB,GAAG,CAAC,MAAM,SAAS,QAAQ,EAC/C,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KACrB,SAAS,CAAC;AAEf,eAAO,MAAM,IAAI,EA6CD,iBAAiB,CAAC"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/react/components/link.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAKpB,SAAS,EACV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAa,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS,QAAQ,IAAI,IAAI,CACnD,oBAAoB,CAAC,iBAAiB,CAAC,EACvC,MAAM,CACP,GAAG;IACF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,mBAAmB,GACrB,CACI,CAAC;IACC,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GACtE;IAEE,MAAM,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,GACD;IAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC,GACnD;IACE,EAAE,EAAE,MAAM,CAAC;CACZ,CACJ,CAAC;AAEJ,KAAK,iBAAiB,GAAG,CAAC,MAAM,SAAS,QAAQ,EAC/C,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KACrB,SAAS,CAAC;AAEf,eAAO,MAAM,IAAI,EA8CD,iBAAiB,CAAC"}

package/react/components/link.js

@@ -2,8 +2,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { observer } from 'mobx-react-lite';
 import { cloneElement, forwardRef, isValidElement, } from 'react';
-export const Link = observer(forwardRef(({ route, asChild, query, replace, children, params, ...anchorProps }, ref) => {
-    const href = route.createUrl(params, query);
+export const Link = observer(forwardRef(({ to, asChild, query, replace, children, params, ...anchorProps }, ref) => {
+    const href = typeof to === 'string' ? to : to.createUrl(params, query);
     const handleClick = (event) => {
         if (event.ctrlKey ||
             event.metaKey ||
@@ -12,9 +12,9 @@ export const Link = observer(forwardRef(({ route, asChild, query, replace, child
             event.button !== 0)
             return;
         anchorProps.onClick?.(event);
-        if (!event.defaultPrevented) {
+        if (!event.defaultPrevented && typeof to !== 'string') {
             event.preventDefault();
-            route.open(href, { replace, query });
+            to.open(href, { replace, query });
         }
     };
     return asChild && isValidElement(children) ? (

package/react/components/route-view.d.ts

@@ -1,15 +1,19 @@
-import { ComponentType } from 'react';
-import type { AnyRoute } from '../../route/index.js';
-import type { AnyRouteGroup } from '../../route-group/index.js';
-import type { VirtualRoute } from '../../virtual-route/index.js';
+import { ComponentType, ReactNode } from 'react';
+import type { AnyRoute, AnyRouteGroup, VirtualRoute } from '../../core/index.js';
 type RouteKind = AnyRouteGroup | AnyRoute | VirtualRoute;
 export interface RouteViewProps<TRouteKind extends RouteKind> {
     route: TRouteKind;
-    view?: ComponentType<any>;
-    lazyView?: () => Promise<ComponentType<any>>;
+    view?: ComponentType<{
+        children?: ReactNode;
+    }>;
+    lazyView?: () => Promise<ComponentType<{
+        children?: ReactNode;
+    }>>;
     loader?: ComponentType;
+    notOpenedContent?: ReactNode;
+    children?: ReactNode;
 }
-declare function RouteViewBase<TRouteKind extends RouteKind>(props: RouteViewProps<TRouteKind>): import("react/jsx-runtime").JSX.Element | null | undefined;
+declare function RouteViewBase<TRouteKind extends RouteKind>(props: RouteViewProps<TRouteKind>): string | number | boolean | Iterable<ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 export declare const RouteView: typeof RouteViewBase & {
     displayName: string;
 };

package/react/components/route-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-view.d.ts","sourceRoot":"","sources":["../../../src/react/components/route-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAU,MAAM,OAAO,CAAC;AAG9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,KAAK,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,CAAC;AAEzD,MAAM,WAAW,cAAc,CAAC,UAAU,SAAS,SAAS;IAC1D,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,iBAAS,aAAa,CAAC,UAAU,SAAS,SAAS,EACjD,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC,8DAoBlC;AAED,eAAO,MAAM,SAAS;;CAA0B,CAAC"}
+{"version":3,"file":"route-view.d.ts","sourceRoot":"","sources":["../../../src/react/components/route-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAU,MAAM,OAAO,CAAC;AAGzD,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,YAAY,EACb,MAAM,qBAAqB,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,CAAC;AAEzD,MAAM,WAAW,cAAc,CAAC,UAAU,SAAS,SAAS;IAC1D,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,iBAAS,aAAa,CAAC,UAAU,SAAS,SAAS,EACjD,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC,gHAoBlC;AAED,eAAO,MAAM,SAAS;;CAA0B,CAAC"}

package/react/components/route-view.js

@@ -6,7 +6,7 @@ function RouteViewBase(props) {
     const lazyViewComponentRef = useRef();
     let Component;
     if (!props.route.isOpened) {
-        return null;
+        return props.notOpenedContent ?? null;
     }
     if (props.lazyView) {
         lazyViewComponentRef.current = loadable(props.lazyView, {
@@ -17,6 +17,6 @@ function RouteViewBase(props) {
     else {
         Component = props.view;
     }
-    return Component && _jsx(Component, {});
+    return Component && _jsx(Component, { children: props.children });
 }
 export const RouteView = observer(RouteViewBase);

package/view-model/route-view-model.d.ts

@@ -1,8 +1,6 @@
 import { ViewModelBase, ViewModelParams } from 'mobx-view-model';
 import { AnyObject, EmptyObject } from 'yummies/utils/types';
-import { Route, ParsedPathParams } from '../route/index.js';
-import { RouteCollectionItem } from '../route-group/index.js';
-import { VirtualRoute } from '../virtual-route/index.js';
+import { Route, ParsedPathParams, RouteCollectionItem, VirtualRoute } from '../core/index.js';
 export declare abstract class RouteViewModel<TRoute extends RouteCollectionItem = RouteCollectionItem> extends ViewModelBase<AnyObject> {
     abstract readonly route: TRoute;
     constructor(params: ViewModelParams<any, any>);

package/view-model/route-view-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-view-model.d.ts","sourceRoot":"","sources":["../../src/view-model/route-view-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,8BAAsB,cAAc,CAClC,MAAM,SAAS,mBAAmB,GAAG,mBAAmB,CACxD,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAEpB,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;IAS7C,IAAa,OAAO,IAAI,MAAM,SAAS,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,GACrD,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAChC,MAAM,SAAS,YAAY,CAAC,MAAM,MAAM,CAAC,GACvC,MAAM,GACN,WAAW,CAUhB;IAED,IAAI,KAAK,iDAMR;IAED,IAAI,UAAU,6GAtBwB,MAAM,yDAwB3C;CACF"}
+{"version":3,"file":"route-view-model.d.ts","sourceRoot":"","sources":["../../src/view-model/route-view-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAEL,KAAK,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,8BAAsB,cAAc,CAClC,MAAM,SAAS,mBAAmB,GAAG,mBAAmB,CACxD,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAEpB,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;IAS7C,IAAa,OAAO,IAAI,MAAM,SAAS,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,GACrD,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAChC,MAAM,SAAS,YAAY,CAAC,MAAM,MAAM,CAAC,GACvC,MAAM,GACN,WAAW,CAUhB;IAED,IAAI,KAAK,iDAMR;IAED,IAAI,UAAU,6GAtBwB,MAAM,yDAwB3C;CACF"}

package/view-model/route-view-model.js

@@ -1,8 +1,6 @@
 import { computed, makeObservable } from 'mobx';
 import { ViewModelBase } from 'mobx-view-model';
-import { routeConfig } from '../config/index.js';
-import { Route } from '../route/index.js';
-import { VirtualRoute } from '../virtual-route/index.js';
+import { routeConfig, Route, VirtualRoute, } from '../core/index.js';
 export class RouteViewModel extends ViewModelBase {
     constructor(params) {
         super(params);
@@ -12,7 +10,7 @@ export class RouteViewModel extends ViewModelBase {
     }
     get payload() {
         if (this.route instanceof Route) {
-            return this.route.data?.params || {};
+            return this.route.params || {};
         }
         if (this.route instanceof VirtualRoute) {
             return this.route.params;

package/config/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,eAAO,MAAM,WAAW;;;;CAqCvB,CAAC"}

package/config/config.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.types.d.ts","sourceRoot":"","sources":["../../src/config/config.types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/config/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC"}

package/route/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}

package/route/route.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;IAazC,IAAI,EAAE,KAAK;IAClB,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAZpD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,KAAK,EAAE,YAAY,CAAC;IAEpB,OAAO,CAAC,UAAU,CAAwB;IAE1C,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAGjB,IAAI,EAAE,KAAK,EACR,MAAM,GAAE,kBAAkB,CAAC,YAAY,CAAM;IAkBzD,IAAI,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CAyBzC;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,OAAO,YAEV;IAED,MAAM,CAAC,WAAW,SAAS,MAAM,EAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAmBlD,WAAW,CAAC,GAAG,QAAQ,EAAE,QAAQ,EAAE;IAInC,cAAc,CAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE;IAM9C,IAAI,kBAAkB,YAErB;IAED,SAAS,CAAC,aAAa,CACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS,GACnD,SAAS,GAAG,SAAS;IAWxB,SAAS,CACP,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC7D,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAe3D,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE;QACE,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS;QACpD,cAAc,CAAC,EAAE,mBAAmB;KACrC,GACD,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,EAAE,mBAAmB,CAAC,GAC3E,IAAI;IAEP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAc7D,SAAS,KAAK,SAAS,cAKtB;CACF"}

package/route/route.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route.test.d.ts","sourceRoot":"","sources":["../../src/route/route.test.ts"],"names":[],"mappings":""}

package/route/route.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route.types.d.ts","sourceRoot":"","sources":["../../src/route/route.types.ts"],"names":[],"mappings":"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"}

package/route-group/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route-group/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC"}

package/route-group/route-group.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../src/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAM5C,IAAI,QAAQ,IAAI,OAAO,CAGtB;IAED,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAiBpB"}

package/route-group/route-group.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-group.types.d.ts","sourceRoot":"","sources":["../../src/route-group/route-group.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAEzD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,aAAa,GAAG,YAAY,CAAC;AAE1E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC"}

package/router/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}

package/router/router.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBAAa,MAAM,CAAC,iBAAiB,SAAS,gBAAgB;IAC5D,MAAM,EAAE,iBAAiB,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,KAAK,EAAE,YAAY,CAAC;gBAER,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;IAO1D,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;CAWtD"}

package/router/router.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"router.types.d.ts","sourceRoot":"","sources":["../../src/router/router.types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,WAAW,mBAAmB,CAAC,aAAa,SAAS,gBAAgB;IACzE,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}

package/virtual-route/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/virtual-route/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC"}

package/virtual-route/virtual-route.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"virtual-route.d.ts","sourceRoot":"","sources":["../../src/virtual-route/virtual-route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAkB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,qBAAa,YAAY,CACvB,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB;IALvD,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,WAAW,CAAoD;gBAEjD,MAAM,GAAE,yBAA8B;IAa5D,IAAI,QAAQ,YAKX;IAED,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC;IAIzC,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC5C,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GACvC,IAAI;IAgBP,KAAK;CAQN"}

package/virtual-route/virtual-route.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"virtual-route.types.d.ts","sourceRoot":"","sources":["../../src/virtual-route/virtual-route.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,yBAAyB,CACxC,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAErD,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAI9D,IAAI,CAAC,EAAE,CACL,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC5C,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,KACrC,OAAO,CAAC;IAGb,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;CACvC"}