@furystack/shades 13.2.2 → 15.0.0

package/esm/components/nested-hooks.spec.js

@@ -0,0 +1,211 @@
+import { createInjector } from '@furystack/inject';
+import { usingAsync } from '@furystack/utils';
+import { describe, expect, expectTypeOf, it } from 'vitest';
+import { LocationService } from '../services/location-service.js';
+import { createNestedHooks, walkRoute } from './nested-hooks.js';
+const makeComponent = () => null;
+describe('walkRoute', () => {
+    it('Should return the route when the pattern matches the path exactly', () => {
+        const leaf = { component: () => makeComponent() };
+        const routes = { '/users': leaf };
+        expect(walkRoute(routes, '/users')).toBe(leaf);
+    });
+    it('Should return undefined when no pattern matches', () => {
+        const routes = { '/users': { component: () => makeComponent() } };
+        expect(walkRoute(routes, '/nonexistent')).toBeUndefined();
+    });
+    it('Should descend through a `/` root pattern transparently', () => {
+        const leaf = { component: () => makeComponent() };
+        const routes = {
+            '/': {
+                component: () => makeComponent(),
+                children: {
+                    '/home': leaf,
+                },
+            },
+        };
+        expect(walkRoute(routes, '/home')).toBe(leaf);
+    });
+    it('Should resolve a deeply nested path by walking children', () => {
+        const leaf = { component: () => makeComponent() };
+        const routes = {
+            '/navigation': {
+                component: () => makeComponent(),
+                children: {
+                    '/tabs': leaf,
+                },
+            },
+        };
+        expect(walkRoute(routes, '/navigation/tabs')).toBe(leaf);
+    });
+    it('Should resolve through two levels of `/` roots', () => {
+        const leaf = { component: () => makeComponent() };
+        const routes = {
+            '/': {
+                component: () => makeComponent(),
+                children: {
+                    '/navigation': {
+                        component: () => makeComponent(),
+                        children: {
+                            '/tabs': leaf,
+                        },
+                    },
+                },
+            },
+        };
+        expect(walkRoute(routes, '/navigation/tabs')).toBe(leaf);
+    });
+    it('Should match a parent prefix when the path is exactly the parent pattern', () => {
+        const parent = {
+            component: () => makeComponent(),
+            children: {
+                '/child': { component: () => makeComponent() },
+            },
+        };
+        const routes = { '/parent': parent };
+        expect(walkRoute(routes, '/parent')).toBe(parent);
+    });
+    it('Should not confuse a prefix pattern that is not followed by a `/`', () => {
+        const routes = {
+            '/users': {
+                component: () => makeComponent(),
+                children: {
+                    '/:id': { component: () => makeComponent() },
+                },
+            },
+        };
+        expect(walkRoute(routes, '/usersextra')).toBeUndefined();
+    });
+});
+describe('createNestedHooks', () => {
+    describe('getTypedQuery', () => {
+        it('Should return null when the route has no declared query validator', async () => {
+            const routes = {
+                '/bare': { component: () => makeComponent() },
+            };
+            const { getTypedQuery } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                expect(getTypedQuery(injector, '/bare')).toBeNull();
+            });
+        });
+        it('Should return the validated query when the current search matches', async () => {
+            const routes = {
+                '/list': {
+                    component: () => makeComponent(),
+                    query: (raw) => (typeof raw.page === 'number' ? { page: raw.page } : null),
+                },
+            };
+            const { getTypedQuery } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                const locationService = injector.get(LocationService);
+                locationService.onDeserializedLocationSearchChanged.setValue({ page: 3 });
+                expect(getTypedQuery(injector, '/list')).toEqual({ page: 3 });
+            });
+        });
+        it('Should return null when the validator rejects the current search', async () => {
+            const routes = {
+                '/list': {
+                    component: () => makeComponent(),
+                    query: (raw) => (typeof raw.page === 'number' ? { page: raw.page } : null),
+                },
+            };
+            const { getTypedQuery } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                const locationService = injector.get(LocationService);
+                locationService.onDeserializedLocationSearchChanged.setValue({ page: 'not-a-number' });
+                expect(getTypedQuery(injector, '/list')).toBeNull();
+            });
+        });
+    });
+    describe('getTypedHash', () => {
+        it('Should return undefined when the route has no declared hash tuple', async () => {
+            const routes = {
+                '/bare': { component: () => makeComponent() },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                expect(getTypedHash(injector, '/bare')).toBeUndefined();
+            });
+        });
+        it('Should return the current hash when it matches a declared literal', async () => {
+            const routes = {
+                '/tabs': {
+                    component: () => makeComponent(),
+                    hash: ['overview', 'details'],
+                },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                const locationService = injector.get(LocationService);
+                locationService.onLocationHashChanged.setValue('details');
+                expect(getTypedHash(injector, '/tabs')).toBe('details');
+            });
+        });
+        it('Should return undefined when the current hash is not in the declared tuple', async () => {
+            const routes = {
+                '/tabs': {
+                    component: () => makeComponent(),
+                    hash: ['overview', 'details'],
+                },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                const locationService = injector.get(LocationService);
+                locationService.onLocationHashChanged.setValue('something-else');
+                expect(getTypedHash(injector, '/tabs')).toBeUndefined();
+            });
+        });
+        it('Should resolve hashes through nested routes', async () => {
+            const routes = {
+                '/navigation': {
+                    component: () => makeComponent(),
+                    children: {
+                        '/tabs': {
+                            component: () => makeComponent(),
+                            hash: ['ctrl-1', 'ctrl-2'],
+                        },
+                    },
+                },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            await usingAsync(createInjector(), async (injector) => {
+                const locationService = injector.get(LocationService);
+                locationService.onLocationHashChanged.setValue('ctrl-1');
+                expect(getTypedHash(injector, '/navigation/tabs')).toBe('ctrl-1');
+            });
+        });
+    });
+    describe('Type utilities', () => {
+        it('Should narrow getTypedHash against the declared literal tuple', () => {
+            const routes = {
+                '/tabs': {
+                    component: () => makeComponent(),
+                    hash: ['overview', 'details'],
+                },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            expectTypeOf((getTypedHash)).returns.toEqualTypeOf();
+        });
+        it('Should narrow getTypedQuery against the declared validator return type', () => {
+            const routes = {
+                '/list': {
+                    component: () => makeComponent(),
+                    query: (raw) => (typeof raw.page === 'number' ? { page: raw.page } : null),
+                },
+            };
+            const { getTypedQuery } = createNestedHooks(routes);
+            expectTypeOf((getTypedQuery)).returns.toEqualTypeOf();
+        });
+        it('Should reject paths not present in the route tree', () => {
+            const routes = {
+                '/tabs': {
+                    component: () => makeComponent(),
+                },
+            };
+            const { getTypedHash } = createNestedHooks(routes);
+            // @ts-expect-error -- '/nonexistent' is not a valid route path
+            getTypedHash(createInjector(), '/nonexistent');
+        });
+    });
+});
+//# sourceMappingURL=nested-hooks.spec.js.map

package/esm/components/nested-hooks.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nested-hooks.spec.js","sourceRoot":"","sources":["../../src/components/nested-hooks.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGhE,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,IAA8B,CAAA;AAE1D,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAA;QACjD,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAuD,CAAA;QACtF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,EAG9D,CAAA;QACD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAA;QACjD,MAAM,MAAM,GAAG;YACb,GAAG,EAAE;gBACH,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;gBAChC,QAAQ,EAAE;oBACR,OAAO,EAAE,IAAI;iBACd;aACF;SACmD,CAAA;QAEtD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAA;QACjD,MAAM,MAAM,GAAG;YACb,aAAa,EAAE;gBACb,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;gBAChC,QAAQ,EAAE;oBACR,OAAO,EAAE,IAAI;iBACd;aACF;SACmD,CAAA;QAEtD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAA;QACjD,MAAM,MAAM,GAAG;YACb,GAAG,EAAE;gBACH,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;gBAChC,QAAQ,EAAE;oBACR,aAAa,EAAE;wBACb,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;wBAChC,QAAQ,EAAE;4BACR,OAAO,EAAE,IAAI;yBACd;qBACF;iBACF;aACF;SACmD,CAAA;QAEtD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;YAChC,QAAQ,EAAE;gBACR,QAAQ,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;aAC/C;SACF,CAAA;QACD,MAAM,MAAM,GAAG,EAAE,SAAS,EAAE,MAAM,EAAuD,CAAA;QAEzF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,MAAM,GAAG;YACb,QAAQ,EAAE;gBACR,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;gBAChC,QAAQ,EAAE;oBACR,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;iBAC7C;aACF;SACmD,CAAA;QAEtD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;IAC1D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;aACO,CAAA;YAEtD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAEnD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;YACrD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,KAAK,EAAE,CAAC,GAAG,EAA2B,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBACpG;aACmD,CAAA;YAEtD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAEnD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACrD,eAAe,CAAC,mCAAmC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;gBACzE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;YAC/D,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;YAChF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,KAAK,EAAE,CAAC,GAAG,EAA2B,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBACpG;aACmD,CAAA;YAEtD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAEnD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACrD,eAAe,CAAC,mCAAmC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;gBACtF,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;YACrD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;aACO,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAElD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;YACzD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,IAAI,EAAE,CAAC,UAAU,EAAE,SAAS,CAAU;iBACvC;aACmD,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAElD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACrD,eAAe,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACzD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACzD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,IAAI,EAAE,CAAC,UAAU,EAAE,SAAS,CAAU;iBACvC;aACmD,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAElD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACrD,eAAe,CAAC,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAA;gBAChE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;YACzD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,MAAM,GAAG;gBACb,aAAa,EAAE;oBACb,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,QAAQ,EAAE;wBACR,OAAO,EAAE;4BACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;4BAChC,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAU;yBACpC;qBACF;iBACF;aACmD,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAElD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACrD,eAAe,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBACxD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACvE,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,IAAI,EAAE,CAAC,UAAU,EAAE,SAAS,CAAU;iBACvC;aACmD,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAClD,YAAY,CAAC,CAAA,YAAqB,CAAA,CAAC,CAAC,OAAO,CAAC,aAAa,EAAsC,CAAA;QACjG,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;YAChF,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;oBAChC,KAAK,EAAE,CAAC,GAAG,EAA2B,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBACpG;aACmD,CAAA;YAEtD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YACnD,YAAY,CAAC,CAAA,aAAsB,CAAA,CAAC,CAAC,OAAO,CAAC,aAAa,EAA2B,CAAA;QACvF,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;iBACjC;aACmD,CAAA;YAEtD,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;YAClD,+DAA+D;YAC/D,YAAY,CAAC,cAAc,EAAE,EAAE,cAAc,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/components/nested-navigate.d.ts

@@ -1,26 +1,57 @@
 import type { Injector } from '@furystack/inject';
-import type { ExtractRouteParams, ExtractRoutePaths } from './nested-route-types.js';
+import type { ExtractRouteHash, ExtractRouteQuery, ExtractRoutePaths, RouteAt, TypedHashArg, TypedParamsArg, TypedQueryArg } from './nested-route-types.js';
 import type { NestedRoute } from './nested-router.js';
 /**
- * Arguments for a type-safe nested navigate call.
- * When the path contains parameters (e.g. `:id`), the `params` argument becomes required.
- * @typeParam TPath - A specific route path string
+ * Untyped runtime arguments for a nested navigate call.
+ * Used by the base {@link nestedNavigate} implementation; the typed variants
+ * returned by {@link createNestedNavigate} narrow each field against the route
+ * tree at compile time.
  */
-export type TypedNavigateArgs<TPath extends string> = string extends keyof ExtractRouteParams<TPath> ? [path: TPath, params?: Record<string, string>] : [path: TPath, params: ExtractRouteParams<TPath>];
+export type NestedNavigateArgs = {
+    path: string;
+    params?: Record<string, string>;
+    query?: Record<string, unknown>;
+    hash?: string;
+};
 /**
- * Navigates to a route path using the LocationService from the given injector.
- * Compiles parameterized routes (e.g. `/users/:id`) when `params` is provided.
+ * Typed arguments for a nested navigate call, derived from the route tree and
+ * the specific target path.
+ *
+ * - `params` is required when the path contains `:param` segments.
+ * - `query` is required when the route's declared query shape has any required
+ *   key, optional when all keys are optional, and forbidden when the route
+ *   declares no `query` validator.
+ * - `hash` is always optional and restricted to the route's declared literal
+ *   tuple; forbidden when the route declares no `hash`.
+ *
+ * @typeParam TRoutes - The route tree
+ * @typeParam TPath - A composed route path within `TRoutes`
+ */
+export type TypedNestedNavigateArgs<TRoutes extends Record<string, NestedRoute<any, any, any>>, TPath extends string> = {
+    path: TPath;
+} & TypedParamsArg<TPath> & TypedQueryArg<ExtractRouteQuery<RouteAt<TRoutes, TPath>>> & TypedHashArg<ExtractRouteHash<RouteAt<TRoutes, TPath>>>;
+/**
+ * Builds the resolved URL for a nested navigate call, including path parameters,
+ * serialized query string and hash segment. Exported for callers that need the
+ * URL without side effects (e.g. link rendering helpers).
+ */
+export declare const buildNestedNavigateUrl: (args: NestedNavigateArgs) => string;
+/**
+ * Navigates to a route using the LocationService resolved from the given injector.
+ * Compiles parameterized routes (e.g. `/users/:id`), serializes the optional
+ * `query` record with the default `@furystack/rest` serializer, and appends the
+ * optional `hash` segment.
  *
  * @param injector - The injector instance to resolve LocationService from
- * @param path - The route path to navigate to
- * @param params - Optional route parameters to compile into the path
+ * @param args - The navigation arguments
  */
-export declare const nestedNavigate: (injector: Injector, path: string, params?: Record<string, string>) => void;
+export declare const nestedNavigate: (injector: Injector, args: NestedNavigateArgs) => void;
 /**
  * Creates a type-safe navigate function constrained to a specific route tree.
  * The returned function has the same runtime behavior as {@link nestedNavigate}
- * but narrows `path` to only accept valid route paths, and requires `params`
- * when the route has parameters.
+ * but narrows `path` to only accept valid route paths, requires `params` when
+ * the route has parameters, and enforces the route's declared `query` and
+ * `hash` schemas.
  *
  * Unlike {@link createNestedRouteLink}, the injector is passed at call time,
  * not at creation time.
@@ -32,15 +63,15 @@ export declare const nestedNavigate: (injector: Injector, path: string, params?:
  * ```typescript
  * const appNavigate = createNestedNavigate<typeof appRoutes>()
  *
- * // Type-safe: only valid paths accepted
- * appNavigate(injector, '/buttons')
- *
- * // TypeScript error: invalid path
- * appNavigate(injector, '/nonexistent')
- *
- * // Params required for parameterized routes
- * appNavigate(injector, '/users/:id', { id: '123' })
+ * appNavigate(injector, { path: '/buttons' })
+ * appNavigate(injector, { path: '/users/:id', params: { id: '123' } })
+ * appNavigate(injector, {
+ *   path: '/users/:id',
+ *   params: { id: '123' },
+ *   query: { tab: 'profile' },
+ *   hash: 'settings',
+ * })
  * ```
  */
-export declare const createNestedNavigate: <TRoutes extends Record<string, NestedRoute<any>>>() => <TPath extends ExtractRoutePaths<TRoutes>>(injector: Injector, ...args: TypedNavigateArgs<TPath>) => void;
+export declare const createNestedNavigate: <TRoutes extends Record<string, NestedRoute<any, any, any>>>() => <TPath extends ExtractRoutePaths<TRoutes>>(injector: Injector, args: TypedNestedNavigateArgs<TRoutes, TPath>) => void;
 //# sourceMappingURL=nested-navigate.d.ts.map

package/esm/components/nested-navigate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested-navigate.d.ts","sourceRoot":"","sources":["../../src/components/nested-navigate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,MAAM,IAAI,MAAM,SAAS,MAAM,kBAAkB,CAAC,KAAK,CAAC,GAChG,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC9C,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAA;AAEpD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU,QAAQ,EAAE,MAAM,MAAM,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG,IAGlG,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,OAC1D,CAAC,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,EAChE,QAAQ,EAAE,QAAQ,EAClB,GAAG,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,KAC9B,IACN,CAAA"}
+{"version":3,"file":"nested-navigate.d.ts","sourceRoot":"","sources":["../../src/components/nested-navigate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,OAAO,EACP,YAAY,EACZ,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAC1D,KAAK,SAAS,MAAM,IAClB;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG,cAAc,CAAC,KAAK,CAAC,GACzC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,GACzD,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;AAEzD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,MAAM,kBAAkB,KAAG,MAOjE,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU,QAAQ,EAAE,MAAM,kBAAkB,KAAG,IAE7E,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,OACpE,CAAC,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,EAChE,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,KAC1C,IACN,CAAA"}

package/esm/components/nested-navigate.js

@@ -1,22 +1,37 @@
+import { serializeToQueryString } from '@furystack/rest';
 import { compileRoute } from '../compile-route.js';
 import { LocationService } from '../services/location-service.js';
 /**
- * Navigates to a route path using the LocationService from the given injector.
- * Compiles parameterized routes (e.g. `/users/:id`) when `params` is provided.
+ * Builds the resolved URL for a nested navigate call, including path parameters,
+ * serialized query string and hash segment. Exported for callers that need the
+ * URL without side effects (e.g. link rendering helpers).
+ */
+export const buildNestedNavigateUrl = (args) => {
+    const { path, params, query, hash } = args;
+    const resolvedPath = params && Object.keys(params).length > 0 ? compileRoute(path, params) : path;
+    const hasQuery = query && Object.keys(query).length > 0;
+    const search = hasQuery ? `?${serializeToQueryString(query)}` : '';
+    const hashPart = hash ? `#${hash}` : '';
+    return `${resolvedPath}${search}${hashPart}`;
+};
+/**
+ * Navigates to a route using the LocationService resolved from the given injector.
+ * Compiles parameterized routes (e.g. `/users/:id`), serializes the optional
+ * `query` record with the default `@furystack/rest` serializer, and appends the
+ * optional `hash` segment.
  *
  * @param injector - The injector instance to resolve LocationService from
- * @param path - The route path to navigate to
- * @param params - Optional route parameters to compile into the path
+ * @param args - The navigation arguments
  */
-export const nestedNavigate = (injector, path, params) => {
-    const resolvedUrl = params ? compileRoute(path, params) : path;
-    injector.getInstance(LocationService).navigate(resolvedUrl);
+export const nestedNavigate = (injector, args) => {
+    injector.get(LocationService).navigate(buildNestedNavigateUrl(args));
 };
 /**
  * Creates a type-safe navigate function constrained to a specific route tree.
  * The returned function has the same runtime behavior as {@link nestedNavigate}
- * but narrows `path` to only accept valid route paths, and requires `params`
- * when the route has parameters.
+ * but narrows `path` to only accept valid route paths, requires `params` when
+ * the route has parameters, and enforces the route's declared `query` and
+ * `hash` schemas.
  *
  * Unlike {@link createNestedRouteLink}, the injector is passed at call time,
  * not at creation time.
@@ -28,14 +43,14 @@ export const nestedNavigate = (injector, path, params) => {
  * ```typescript
  * const appNavigate = createNestedNavigate<typeof appRoutes>()
  *
- * // Type-safe: only valid paths accepted
- * appNavigate(injector, '/buttons')
- *
- * // TypeScript error: invalid path
- * appNavigate(injector, '/nonexistent')
- *
- * // Params required for parameterized routes
- * appNavigate(injector, '/users/:id', { id: '123' })
+ * appNavigate(injector, { path: '/buttons' })
+ * appNavigate(injector, { path: '/users/:id', params: { id: '123' } })
+ * appNavigate(injector, {
+ *   path: '/users/:id',
+ *   params: { id: '123' },
+ *   query: { tab: 'profile' },
+ *   hash: 'settings',
+ * })
  * ```
  */
 export const createNestedNavigate = () => {

package/esm/components/nested-navigate.js.map

@@ -1 +1 @@
-{"version":3,"file":"nested-navigate.js","sourceRoot":"","sources":["../../src/components/nested-navigate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAajE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,IAAY,EAAE,MAA+B,EAAQ,EAAE;IACxG,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC9D,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAqD,EAAE;IACzF,OAAO,cAGE,CAAA;AACX,CAAC,CAAA"}
+{"version":3,"file":"nested-navigate.js","sourceRoot":"","sources":["../../src/components/nested-navigate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AA8CjE;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAU,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACjG,MAAM,QAAQ,GAAG,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACvC,OAAO,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,EAAE,CAAA;AAC9C,CAAC,CAAA;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,IAAwB,EAAQ,EAAE;IACnF,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAA;AACtE,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAA+D,EAAE;IACnG,OAAO,cAGE,CAAA;AACX,CAAC,CAAA"}

package/esm/components/nested-navigate.spec.js

@@ -1,44 +1,104 @@
-import { Injector } from '@furystack/inject';
+import { createInjector } from '@furystack/inject';
 import { usingAsync } from '@furystack/utils';
 import { describe, expect, expectTypeOf, it, vi } from 'vitest';
 import { LocationService } from '../services/location-service.js';
-import { createNestedNavigate, nestedNavigate } from './nested-navigate.js';
+import { buildNestedNavigateUrl, createNestedNavigate, nestedNavigate } from './nested-navigate.js';
 describe('nestedNavigate', () => {
     it('Should navigate to a simple path', async () => {
-        await usingAsync(new Injector(), async (injector) => {
-            const locationService = injector.getInstance(LocationService);
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
             const spy = vi.spyOn(locationService, 'navigate');
-            nestedNavigate(injector, '/buttons');
+            nestedNavigate(injector, { path: '/buttons' });
             expect(spy).toHaveBeenCalledWith('/buttons');
         });
     });
     it('Should compile params into the path', async () => {
-        await usingAsync(new Injector(), async (injector) => {
-            const locationService = injector.getInstance(LocationService);
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
             const spy = vi.spyOn(locationService, 'navigate');
-            nestedNavigate(injector, '/users/:id', { id: '42' });
+            nestedNavigate(injector, { path: '/users/:id', params: { id: '42' } });
             expect(spy).toHaveBeenCalledWith('/users/42');
         });
     });
     it('Should compile multiple params into the path', async () => {
-        await usingAsync(new Injector(), async (injector) => {
-            const locationService = injector.getInstance(LocationService);
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
             const spy = vi.spyOn(locationService, 'navigate');
-            nestedNavigate(injector, '/users/:userId/posts/:postId', { userId: '1', postId: '99' });
+            nestedNavigate(injector, {
+                path: '/users/:userId/posts/:postId',
+                params: { userId: '1', postId: '99' },
+            });
             expect(spy).toHaveBeenCalledWith('/users/1/posts/99');
         });
     });
+    it('Should append serialized query string when provided', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
+            const spy = vi.spyOn(locationService, 'navigate');
+            nestedNavigate(injector, { path: '/buttons', query: { page: 2 } });
+            expect(spy).toHaveBeenCalledTimes(1);
+            const navigatedUrl = spy.mock.calls[0][0];
+            expect(navigatedUrl.startsWith('/buttons?')).toBe(true);
+            const { deserializeQueryString } = locationService;
+            const search = navigatedUrl.slice(navigatedUrl.indexOf('?') + 1);
+            expect(deserializeQueryString(search)).toEqual({ page: 2 });
+        });
+    });
+    it('Should omit the query string when no keys are provided', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
+            const spy = vi.spyOn(locationService, 'navigate');
+            nestedNavigate(injector, { path: '/buttons', query: {} });
+            expect(spy).toHaveBeenCalledWith('/buttons');
+        });
+    });
+    it('Should append the hash segment when provided', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
+            const spy = vi.spyOn(locationService, 'navigate');
+            nestedNavigate(injector, { path: '/buttons', hash: 'overview' });
+            expect(spy).toHaveBeenCalledWith('/buttons#overview');
+        });
+    });
+    it('Should combine params, query and hash in the correct order', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const locationService = injector.get(LocationService);
+            const spy = vi.spyOn(locationService, 'navigate');
+            nestedNavigate(injector, {
+                path: '/users/:id',
+                params: { id: '7' },
+                query: { tab: 'profile' },
+                hash: 'notes',
+            });
+            expect(spy).toHaveBeenCalledTimes(1);
+            const navigatedUrl = spy.mock.calls[0][0];
+            expect(navigatedUrl.startsWith('/users/7?')).toBe(true);
+            expect(navigatedUrl.endsWith('#notes')).toBe(true);
+        });
+    });
+});
+describe('buildNestedNavigateUrl', () => {
+    it('Should build a bare path URL', () => {
+        expect(buildNestedNavigateUrl({ path: '/buttons' })).toBe('/buttons');
+    });
+    it('Should build a URL with compiled params', () => {
+        expect(buildNestedNavigateUrl({ path: '/users/:id', params: { id: '42' } })).toBe('/users/42');
+    });
+    it('Should append a hash segment', () => {
+        expect(buildNestedNavigateUrl({ path: '/buttons', hash: 'top' })).toBe('/buttons#top');
+    });
 });
 describe('Type utilities', () => {
-    describe('TypedNavigateArgs', () => {
+    describe('TypedNestedNavigateArgs', () => {
         it('Should make params optional for paths without parameters', () => {
-            expectTypeOf().toEqualTypeOf();
+            expectTypeOf().toExtend();
+            expectTypeOf().toExtend();
         });
         it('Should require params for parameterized paths', () => {
-            expectTypeOf().toEqualTypeOf();
+            expectTypeOf().toExtend();
         });
         it('Should require all params for multi-param paths', () => {
-            expectTypeOf().toEqualTypeOf();
+            expectTypeOf().toExtend();
         });
     });
     describe('createNestedNavigate', () => {
@@ -50,16 +110,20 @@ describe('Type utilities', () => {
         });
         it('Should require params for parameterized routes in the tree', () => {
             const appNavigate = createNestedNavigate();
-            expectTypeOf((appNavigate)).parameters.toEqualTypeOf();
+            expectTypeOf((appNavigate))
+                .parameter(1)
+                .toExtend();
         });
         it('Should make params optional for non-parameterized routes', () => {
             const appNavigate = createNestedNavigate();
-            expectTypeOf((appNavigate)).parameters.toEqualTypeOf();
+            expectTypeOf((appNavigate))
+                .parameter(1)
+                .toExtend();
         });
         it('Should reject invalid paths', () => {
             const appNavigate = createNestedNavigate();
             // @ts-expect-error -- '/nonexistent' is not a valid route path
-            appNavigate(new Injector(), '/nonexistent');
+            appNavigate(createInjector(), { path: '/nonexistent' });
         });
         it('Should accept routes with typed match parameters (NestedRoute<T>)', () => {
             const typedRoute = {
@@ -69,7 +133,33 @@ describe('Type utilities', () => {
                 '/stacks/:stackName': typedRoute,
             };
             const appNavigate = createNestedNavigate();
-            expectTypeOf((appNavigate)).parameters.toEqualTypeOf();
+            expectTypeOf((appNavigate))
+                .parameter(1)
+                .toExtend();
+        });
+        it('Should enforce a route-declared required query shape', () => {
+            const routes = {
+                '/list': {
+                    component: () => null,
+                    query: (raw) => (typeof raw.page === 'number' ? { page: raw.page } : null),
+                },
+            };
+            const appNavigate = createNestedNavigate();
+            expectTypeOf((appNavigate))
+                .parameter(1)
+                .toExtend();
+        });
+        it('Should narrow hash to the declared literal tuple', () => {
+            const routes = {
+                '/tabs': {
+                    component: () => null,
+                    hash: ['overview', 'details'],
+                },
+            };
+            const appNavigate = createNestedNavigate();
+            expectTypeOf((appNavigate))
+                .parameter(1)
+                .toExtend();
         });
     });
 });

package/esm/components/nested-navigate.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"nested-navigate.spec.js","sourceRoot":"","sources":["../../src/components/nested-navigate.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nested-navigate.spec.js","sourceRoot":"","sources":["../../src/components/nested-navigate.spec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAEjE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAKnG,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;YAE9C,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAEtE,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE;gBACvB,IAAI,EAAE,8BAA8B;gBACpC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;aACtC,CAAC,CAAA;YAEF,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;YAElE,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YACpC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACvD,MAAM,EAAE,sBAAsB,EAAE,GAAG,eAAe,CAAA;YAClD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;YAChE,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;YAEzD,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;YAEhE,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;YAEjD,cAAc,CAAC,QAAQ,EAAE;gBACvB,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE;gBACnB,KAAK,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE;gBACzB,IAAI,EAAE,OAAO;aACd,CAAC,CAAA;YAEF,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YACpC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACvD,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAChG,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACxF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAElE,YAAY,EAA+C,CAAC,QAAQ,EAAwB,CAAA;YAC5F,YAAY,EAA+C,CAAC,QAAQ,EAAuC,CAAA;QAC7G,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YAEvD,YAAY,EAAiD,CAAC,QAAQ,EAA8B,CAAA;QACtG,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YAEzD,YAAY,EAAmE,CAAC,QAAQ,EAEpF,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YAUpD,MAAM,WAAW,GAAG,oBAAoB,EAAU,CAAA;YAClD,YAAY,CAAC,CAAA,WAAuB,CAAA,CAAC;iBAClC,SAAS,CAAC,CAAC,CAAC;iBACZ,aAAa,EAAY,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YASpE,MAAM,WAAW,GAAG,oBAAoB,EAAU,CAAA;YAClD,YAAY,CAAC,CAAA,WAA6B,CAAA,CAAC;iBACxC,SAAS,CAAC,CAAC,CAAC;iBACZ,QAAQ,EAAkC,CAAA;QAC/C,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YASlE,MAAM,WAAW,GAAG,oBAAoB,EAAU,CAAA;YAClD,YAAY,CAAC,CAAA,WAAuB,CAAA,CAAC;iBAClC,SAAS,CAAC,CAAC,CAAC;iBACZ,QAAQ,EAAuC,CAAA;QACpD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YAUrC,MAAM,WAAW,GAAG,oBAAoB,EAAU,CAAA;YAClD,+DAA+D;YAC/D,WAAW,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;QACzD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;YAC3E,MAAM,UAAU,GAAuC;gBACrD,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,SAAmC;aAC3E,CAAA;YAED,MAAM,MAAM,GAAG;gBACb,oBAAoB,EAAE,UAAU;aACjC,CAAA;YAED,MAAM,WAAW,GAAG,oBAAoB,EAAiB,CAAA;YACzD,YAAY,CAAC,CAAA,WAAiC,CAAA,CAAC;iBAC5C,SAAS,CAAC,CAAC,CAAC;iBACZ,QAAQ,EAAqC,CAAA;QAClD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAC9D,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,IAA8B;oBAC/C,KAAK,EAAE,CAAC,GAAG,EAA2B,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBACpG;aACmD,CAAA;YAEtD,MAAM,WAAW,GAAG,oBAAoB,EAAiB,CAAA;YACzD,YAAY,CAAC,CAAA,WAAoB,CAAA,CAAC;iBAC/B,SAAS,CAAC,CAAC,CAAC;iBACZ,QAAQ,EAA+B,CAAA;QAC5C,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE;oBACP,SAAS,EAAE,GAAG,EAAE,CAAC,IAA8B;oBAC/C,IAAI,EAAE,CAAC,UAAU,EAAE,SAAS,CAAU;iBACvC;aACmD,CAAA;YAEtD,MAAM,WAAW,GAAG,oBAAoB,EAAiB,CAAA;YACzD,YAAY,CAAC,CAAA,WAAoB,CAAA,CAAC;iBAC/B,SAAS,CAAC,CAAC,CAAC;iBACZ,QAAQ,EAAqC,CAAA;QAClD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}