@plumile/router 0.1.19 → 0.1.21

package/lib/esm/routing/index.d.ts

@@ -5,9 +5,9 @@ export { default as RouteComponentWrapper } from './RouteComponentWrapper.js';
 export { default as RouterRenderer } from './RouterRenderer.js';
 export { default as RoutingContext } from './RoutingContext.js';
 export { default as useQuery } from './useQuery.js';
-export { default as useTypedQuery } from './useTypedQuery.js';
 export { default as useNavigate } from './useNavigate.js';
 export { default as useQueryState } from './useQueryState.js';
 export { default as useFilters } from './useFilters.js';
 export { default as useFilterDiagnostics } from './useFilterDiagnostics.js';
+export { default as buildCombinedSearch } from '../tools/buildCombinedSearch.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/esm/routing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/routing/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/routing/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAI5D,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAG5E,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,iCAAiC,CAAC"}

package/lib/esm/routing/index.js

@@ -5,9 +5,9 @@ export { default as RouteComponentWrapper } from './RouteComponentWrapper.js';
 export { default as RouterRenderer } from './RouterRenderer.js';
 export { default as RoutingContext } from './RoutingContext.js';
 export { default as useQuery } from './useQuery.js';
-export { default as useTypedQuery } from './useTypedQuery.js';
 export { default as useNavigate } from './useNavigate.js';
 export { default as useQueryState } from './useQueryState.js';
 export { default as useFilters } from './useFilters.js';
 export { default as useFilterDiagnostics } from './useFilterDiagnostics.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGluZy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxJQUFJLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRzVELE9BQU8sRUFBRSxPQUFPLElBQUksSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRzVDLE9BQU8sRUFBRSxPQUFPLElBQUksY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHaEUsT0FBTyxFQUFFLE9BQU8sSUFBSSxxQkFBcUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRzlFLE9BQU8sRUFBRSxPQUFPLElBQUksY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHaEUsT0FBTyxFQUFFLE9BQU8sSUFBSSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsT0FBTyxJQUFJLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVwRCxPQUFPLEVBQUUsT0FBTyxJQUFJLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxPQUFPLElBQUksV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxFQUFFLE9BQU8sSUFBSSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5RCxPQUFPLEVBQUUsT0FBTyxJQUFJLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLElBQUksb0JBQW9CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIE1haW4gcm91dGVyIGZhY3RvcnkgZnVuY3Rpb25cbmV4cG9ydCB7IGRlZmF1bHQgYXMgY3JlYXRlUm91dGVyIH0gZnJvbSAnLi9jcmVhdGVSb3V0ZXIuanMnO1xuXG4vLyBOYXZpZ2F0aW9uIGNvbXBvbmVudCB3aXRoIHByZWxvYWRpbmcgc3VwcG9ydFxuZXhwb3J0IHsgZGVmYXVsdCBhcyBMaW5rIH0gZnJvbSAnLi9MaW5rLmpzJztcblxuLy8gUm91dGUgY29tcG9uZW50IHdyYXBwZXIgZm9yIGhhbmRsaW5nIGluZGl2aWR1YWwgcm91dGVzXG5leHBvcnQgeyBkZWZhdWx0IGFzIFJvdXRlQ29tcG9uZW50IH0gZnJvbSAnLi9Sb3V0ZUNvbXBvbmVudC5qcyc7XG5cbi8vIEludGVybmFsIHdyYXBwZXIgY29tcG9uZW50IGZvciByb3V0ZSByZW5kZXJpbmdcbmV4cG9ydCB7IGRlZmF1bHQgYXMgUm91dGVDb21wb25lbnRXcmFwcGVyIH0gZnJvbSAnLi9Sb3V0ZUNvbXBvbmVudFdyYXBwZXIuanMnO1xuXG4vLyBNYWluIHJlbmRlcmVyIGNvbXBvbmVudCB0aGF0IGRpc3BsYXlzIGN1cnJlbnQgcm91dGVcbmV4cG9ydCB7IGRlZmF1bHQgYXMgUm91dGVyUmVuZGVyZXIgfSBmcm9tICcuL1JvdXRlclJlbmRlcmVyLmpzJztcblxuLy8gUmVhY3QgY29udGV4dCBmb3Igc2hhcmluZyByb3V0ZXIgc3RhdGVcbmV4cG9ydCB7IGRlZmF1bHQgYXMgUm91dGluZ0NvbnRleHQgfSBmcm9tICcuL1JvdXRpbmdDb250ZXh0LmpzJztcbi8vIEhvb2sgdG8gYWNjZXNzIHJhdyBxdWVyeSBwYXJhbWV0ZXJzXG5leHBvcnQgeyBkZWZhdWx0IGFzIHVzZVF1ZXJ5IH0gZnJvbSAnLi91c2VRdWVyeS5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyB0eXBlZCBxdWVyeSBwYXJhbWV0ZXJzXG5leHBvcnQgeyBkZWZhdWx0IGFzIHVzZVR5cGVkUXVlcnkgfSBmcm9tICcuL3VzZVR5cGVkUXVlcnkuanMnO1xuLy8gSG9vayB0byBuYXZpZ2F0ZSBwcm9ncmFtbWF0aWNhbGx5XG5leHBvcnQgeyBkZWZhdWx0IGFzIHVzZU5hdmlnYXRlIH0gZnJvbSAnLi91c2VOYXZpZ2F0ZS5qcyc7XG4vLyBIb29rIHRvIGJpbmQgYSBzcGVjaWZpYyBxdWVyeSBwYXJhbSB0byBjb21wb25lbnQgc3RhdGVcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlUXVlcnlTdGF0ZSB9IGZyb20gJy4vdXNlUXVlcnlTdGF0ZS5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyBhbmQgbXV0YXRlIGZpbHRlcnNcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlRmlsdGVycyB9IGZyb20gJy4vdXNlRmlsdGVycy5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyBmaWx0ZXIgZGlhZ25vc3RpY3NcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlRmlsdGVyRGlhZ25vc3RpY3MgfSBmcm9tICcuL3VzZUZpbHRlckRpYWdub3N0aWNzLmpzJztcbiJdfQ==
+export { default as buildCombinedSearch } from '../tools/buildCombinedSearch.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGluZy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxJQUFJLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSTVELE9BQU8sRUFBRSxPQUFPLElBQUksSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRzVDLE9BQU8sRUFBRSxPQUFPLElBQUksY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHaEUsT0FBTyxFQUFFLE9BQU8sSUFBSSxxQkFBcUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRzlFLE9BQU8sRUFBRSxPQUFPLElBQUksY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHaEUsT0FBTyxFQUFFLE9BQU8sSUFBSSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsT0FBTyxJQUFJLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUdwRCxPQUFPLEVBQUUsT0FBTyxJQUFJLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFELE9BQU8sRUFBRSxPQUFPLElBQUksYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFOUQsT0FBTyxFQUFFLE9BQU8sSUFBSSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxJQUFJLG9CQUFvQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHNUUsT0FBTyxFQUFFLE9BQU8sSUFBSSxtQkFBbUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gTWFpbiByb3V0ZXIgZmFjdG9yeSBmdW5jdGlvblxuZXhwb3J0IHsgZGVmYXVsdCBhcyBjcmVhdGVSb3V0ZXIgfSBmcm9tICcuL2NyZWF0ZVJvdXRlci5qcyc7XG5cbi8vIE5hdmlnYXRpb24gY29tcG9uZW50IHdpdGggcHJlbG9hZGluZyBzdXBwb3J0XG4vLyBTdGFuZGFyZCAuanMgc3BlY2lmaWVyIChidWlsZCBwaXBlbGluZSByZXdyaXRlcyBmcm9tIFRTIHNvdXJjZSlcbmV4cG9ydCB7IGRlZmF1bHQgYXMgTGluayB9IGZyb20gJy4vTGluay5qcyc7XG5cbi8vIFJvdXRlIGNvbXBvbmVudCB3cmFwcGVyIGZvciBoYW5kbGluZyBpbmRpdmlkdWFsIHJvdXRlc1xuZXhwb3J0IHsgZGVmYXVsdCBhcyBSb3V0ZUNvbXBvbmVudCB9IGZyb20gJy4vUm91dGVDb21wb25lbnQuanMnO1xuXG4vLyBJbnRlcm5hbCB3cmFwcGVyIGNvbXBvbmVudCBmb3Igcm91dGUgcmVuZGVyaW5nXG5leHBvcnQgeyBkZWZhdWx0IGFzIFJvdXRlQ29tcG9uZW50V3JhcHBlciB9IGZyb20gJy4vUm91dGVDb21wb25lbnRXcmFwcGVyLmpzJztcblxuLy8gTWFpbiByZW5kZXJlciBjb21wb25lbnQgdGhhdCBkaXNwbGF5cyBjdXJyZW50IHJvdXRlXG5leHBvcnQgeyBkZWZhdWx0IGFzIFJvdXRlclJlbmRlcmVyIH0gZnJvbSAnLi9Sb3V0ZXJSZW5kZXJlci5qcyc7XG5cbi8vIFJlYWN0IGNvbnRleHQgZm9yIHNoYXJpbmcgcm91dGVyIHN0YXRlXG5leHBvcnQgeyBkZWZhdWx0IGFzIFJvdXRpbmdDb250ZXh0IH0gZnJvbSAnLi9Sb3V0aW5nQ29udGV4dC5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyByYXcgcXVlcnkgcGFyYW1ldGVyc1xuZXhwb3J0IHsgZGVmYXVsdCBhcyB1c2VRdWVyeSB9IGZyb20gJy4vdXNlUXVlcnkuanMnO1xuLy8gSG9vayB0byBhY2Nlc3MgdHlwZWQgcXVlcnkgcGFyYW1ldGVyc1xuLy8gSG9vayB0byBuYXZpZ2F0ZSBwcm9ncmFtbWF0aWNhbGx5XG5leHBvcnQgeyBkZWZhdWx0IGFzIHVzZU5hdmlnYXRlIH0gZnJvbSAnLi91c2VOYXZpZ2F0ZS5qcyc7XG4vLyBIb29rIHRvIGJpbmQgYSBzcGVjaWZpYyBxdWVyeSBwYXJhbSB0byBjb21wb25lbnQgc3RhdGVcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlUXVlcnlTdGF0ZSB9IGZyb20gJy4vdXNlUXVlcnlTdGF0ZS5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyBhbmQgbXV0YXRlIGZpbHRlcnNcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlRmlsdGVycyB9IGZyb20gJy4vdXNlRmlsdGVycy5qcyc7XG4vLyBIb29rIHRvIGFjY2VzcyBmaWx0ZXIgZGlhZ25vc3RpY3NcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdXNlRmlsdGVyRGlhZ25vc3RpY3MgfSBmcm9tICcuL3VzZUZpbHRlckRpYWdub3N0aWNzLmpzJztcblxuLy8gUHVibGljIGhlbHBlciBmb3IgdW5pZmllZCBmaWx0ZXItYmFzZWQgc2VhcmNoIGJ1aWxkaW5nIChQaGFzZSAyKVxuZXhwb3J0IHsgZGVmYXVsdCBhcyBidWlsZENvbWJpbmVkU2VhcmNoIH0gZnJvbSAnLi4vdG9vbHMvYnVpbGRDb21iaW5lZFNlYXJjaC5qcyc7XG4iXX0=

package/lib/esm/routing/useAllQuery.js

@@ -28,4 +28,4 @@ export default function useAllQuery(opts = {}) {
     }, [ctx, opts.replace]);
     return [rawQuery, setValue];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlQWxsUXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGluZy91c2VBbGxRdWVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUNoRCxPQUFPLGNBQWMsTUFBTSxxQkFBcUIsQ0FBQztBQWlCakQsTUFBTSxDQUFDLE9BQU8sVUFBVSxXQUFXLENBQ2pDLE9BQTJCLEVBQUU7SUFFN0IsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztJQUV6QixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBRTlCLE1BQU0sUUFBUSxHQUFHLFdBQVcsQ0FDMUIsQ0FBQyxJQUFPLEVBQUUsT0FBK0IsRUFBRSxFQUFFO1FBQzNDLElBQUksR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU87UUFDVCxDQUFDO1FBQ0QsTUFBTSxPQUFPLEdBQUcsT0FBTyxFQUFFLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ2pELE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUUzQixNQUFNLE1BQU0sR0FBRyxFQUFFLEdBQUcsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3JDLE1BQU0sSUFBSSxHQUE0QixFQUFFLENBQUM7UUFDekMsS0FBSyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDcEMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN0QixDQUFDO1FBQ0QsS0FBSyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDbEMsTUFBTSxDQUFDLEdBQUksSUFBZ0MsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMvQyxJQUFJLENBQUMsS0FBSyxTQUFTLEVBQUUsQ0FBQztnQkFFcEIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDZCxDQUFDO1FBQ0gsQ0FBQztRQUNELEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDekMsQ0FBQyxFQUNELENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FDcEIsQ0FBQztJQUVGLE9BQU8sQ0FBQyxRQUFhLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDbkMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHVzZUNhbGxiYWNrLCB1c2VDb250ZXh0IH0gZnJvbSAncmVhY3QnO1xuaW1wb3J0IFJvdXRpbmdDb250ZXh0IGZyb20gJy4vUm91dGluZ0NvbnRleHQuanMnO1xuXG4vKiogT3B0aW9ucyBmb3IgdXNlQWxsUXVlcnkgKi9cbmV4cG9ydCB0eXBlIFVzZUFsbFF1ZXJ5T3B0aW9ucyA9IHtcbiAgLyoqIFJlcGxhY2UgaW5zdGVhZCBvZiBwdXNoIHdoZW4gdXBkYXRpbmcgKHByZXZlbnRzIG5ldyBoaXN0b3J5IGVudHJ5KSAqL1xuICByZXBsYWNlPzogYm9vbGVhbjtcbn07XG5cbi8qKlxuICogQmlkaXJlY3Rpb25hbCBzdGF0ZSDihpQgVVJMIHN5bmNocm9uaXphdGlvbiBmb3IgYSBzaW5nbGUgcXVlcnkgcGFyYW0uXG4gKlxuICogQmVoYXZpb3VyczpcbiAqIC0gUmVhZHMgZnJvbSB0eXBlZFF1ZXJ5IChpZiBzY2hlbWEgcHJlc2VudCkgZWxzZSByYXcgcXVlcnkgYWdncmVnYXRpb24uXG4gKiAtIFdoZW4gc2V0dGluZyB2YWx1ZSB0byB1bmRlZmluZWQgKG9yIGRlZmF1bHQgd2l0aCBvbWl0SWZEZWZhdWx0KSB0aGUga2V5IGlzIHJlbW92ZWQuXG4gKiAtIFNlcmlhbGl6ZXMgdGhyb3VnaCBleGlzdGluZyBuYXZpZ2F0ZStidWlsZFNlYXJjaCBwaXBlbGluZSAoc2NoZW1hIGF3YXJlIG9yZGVyaW5nICYgb21pc3Npb24pLlxuICogLSBTdGFibGUgaWRlbnRpdHkgZm9yIHNldHRlci5cbiAqL1xuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdXNlQWxsUXVlcnk8VCBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+PihcbiAgb3B0czogVXNlQWxsUXVlcnlPcHRpb25zID0ge30sXG4pOiBbVCB8IHVuZGVmaW5lZCwgKG5leHQ6IFQsIG5hdk9wdHM/OiB7IHJlcGxhY2U/OiBib29sZWFuIH0pID0+IHZvaWRdIHtcbiAgY29uc3QgY3R4ID0gdXNlQ29udGV4dChSb3V0aW5nQ29udGV4dCk7XG4gIGNvbnN0IGVudHJ5ID0gY3R4Py5nZXQoKTtcblxuICBjb25zdCByYXdRdWVyeSA9IGVudHJ5Py5xdWVyeTtcblxuICBjb25zdCBzZXRWYWx1ZSA9IHVzZUNhbGxiYWNrKFxuICAgIChuZXh0OiBULCBuYXZPcHRzPzogeyByZXBsYWNlPzogYm9vbGVhbiB9KSA9PiB7XG4gICAgICBpZiAoY3R4ID09IG51bGwpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgY29uc3QgcmVwbGFjZSA9IG5hdk9wdHM/LnJlcGxhY2UgPz8gb3B0cy5yZXBsYWNlO1xuICAgICAgY29uc3QgZW50cnlOb3cgPSBjdHguZ2V0KCk7XG4gICAgICAvLyBCYXNlIG9iamVjdDogc3RhcnQgZnJvbSBleGlzdGluZyB0eXBlZFF1ZXJ5IGlmIHByZXNlbnQgZWxzZSByYXcgcXVlcnkgY2xvbmVcbiAgICAgIGNvbnN0IHNvdXJjZSA9IHsgLi4uZW50cnlOb3cucXVlcnkgfTtcbiAgICAgIGNvbnN0IGJhc2U6IFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0ge307XG4gICAgICBmb3IgKGNvbnN0IGsgb2YgT2JqZWN0LmtleXMoc291cmNlKSkge1xuICAgICAgICBiYXNlW2tdID0gc291cmNlW2tdO1xuICAgICAgfVxuICAgICAgZm9yIChjb25zdCBrIG9mIE9iamVjdC5rZXlzKG5leHQpKSB7XG4gICAgICAgIGNvbnN0IHYgPSAobmV4dCBhcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPilba107XG4gICAgICAgIGlmICh2ID09PSB1bmRlZmluZWQpIHtcbiAgICAgICAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWR5bmFtaWMtZGVsZXRlXG4gICAgICAgICAgZGVsZXRlIGJhc2Vba107XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgYmFzZVtrXSA9IHY7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIGN0eC5uYXZpZ2F0ZSh7IHF1ZXJ5OiBiYXNlLCByZXBsYWNlIH0pO1xuICAgIH0sXG4gICAgW2N0eCwgb3B0cy5yZXBsYWNlXSxcbiAgKTtcblxuICByZXR1cm4gW3Jhd1F1ZXJ5IGFzIFQsIHNldFZhbHVlXTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlQWxsUXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGluZy91c2VBbGxRdWVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUNoRCxPQUFPLGNBQWMsTUFBTSxxQkFBcUIsQ0FBQztBQWlCakQsTUFBTSxDQUFDLE9BQU8sVUFBVSxXQUFXLENBQ2pDLE9BQTJCLEVBQUU7SUFFN0IsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztJQUV6QixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBRTlCLE1BQU0sUUFBUSxHQUFHLFdBQVcsQ0FDMUIsQ0FBQyxJQUFPLEVBQUUsT0FBK0IsRUFBRSxFQUFFO1FBQzNDLElBQUksR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU87UUFDVCxDQUFDO1FBQ0QsTUFBTSxPQUFPLEdBQUcsT0FBTyxFQUFFLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ2pELE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUUzQixNQUFNLE1BQU0sR0FBRyxFQUFFLEdBQUcsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3JDLE1BQU0sSUFBSSxHQUE0QixFQUFFLENBQUM7UUFDekMsS0FBSyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDcEMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN0QixDQUFDO1FBQ0QsS0FBSyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDbEMsTUFBTSxDQUFDLEdBQUksSUFBZ0MsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMvQyxJQUFJLENBQUMsS0FBSyxTQUFTLEVBQUUsQ0FBQztnQkFFcEIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDZCxDQUFDO1FBQ0gsQ0FBQztRQUNELEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDekMsQ0FBQyxFQUNELENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FDcEIsQ0FBQztJQUVGLE9BQU8sQ0FBQyxRQUFhLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDbkMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHVzZUNhbGxiYWNrLCB1c2VDb250ZXh0IH0gZnJvbSAncmVhY3QnO1xuaW1wb3J0IFJvdXRpbmdDb250ZXh0IGZyb20gJy4vUm91dGluZ0NvbnRleHQuanMnO1xuXG4vKiogT3B0aW9ucyBmb3IgdXNlQWxsUXVlcnkgKi9cbmV4cG9ydCB0eXBlIFVzZUFsbFF1ZXJ5T3B0aW9ucyA9IHtcbiAgLyoqIFJlcGxhY2UgaW5zdGVhZCBvZiBwdXNoIHdoZW4gdXBkYXRpbmcgKHByZXZlbnRzIG5ldyBoaXN0b3J5IGVudHJ5KSAqL1xuICByZXBsYWNlPzogYm9vbGVhbjtcbn07XG5cbi8qKlxuICogQmlkaXJlY3Rpb25hbCBzdGF0ZSDihpQgVVJMIHN5bmNocm9uaXphdGlvbiBmb3IgYSBzaW5nbGUgcXVlcnkgcGFyYW0uXG4gKlxuICogQmVoYXZpb3VyczpcbiAqIC0gUmVhZHMgZnJvbSB0eXBlZFF1ZXJ5IChpZiBzY2hlbWEgcHJlc2VudCkgZWxzZSByYXcgcXVlcnkgYWdncmVnYXRpb24uXG4gKiAtIFdoZW4gc2V0dGluZyB2YWx1ZSB0byB1bmRlZmluZWQgKG9yIGRlZmF1bHQgd2l0aCBvbWl0SWZEZWZhdWx0KSB0aGUga2V5IGlzIHJlbW92ZWQuXG4gKiAtIFNlcmlhbGl6ZXMgdmlhIG5hdmlnYXRlICsgdW5pZmllZCBidWlsZENvbWJpbmVkU2VhcmNoIChzY2hlbWEgb3JkZXJpbmcgJiBvbWlzc2lvbiByZXNwZWN0ZWQpLlxuICogLSBTdGFibGUgaWRlbnRpdHkgZm9yIHNldHRlci5cbiAqL1xuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdXNlQWxsUXVlcnk8VCBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+PihcbiAgb3B0czogVXNlQWxsUXVlcnlPcHRpb25zID0ge30sXG4pOiBbVCB8IHVuZGVmaW5lZCwgKG5leHQ6IFQsIG5hdk9wdHM/OiB7IHJlcGxhY2U/OiBib29sZWFuIH0pID0+IHZvaWRdIHtcbiAgY29uc3QgY3R4ID0gdXNlQ29udGV4dChSb3V0aW5nQ29udGV4dCk7XG4gIGNvbnN0IGVudHJ5ID0gY3R4Py5nZXQoKTtcblxuICBjb25zdCByYXdRdWVyeSA9IGVudHJ5Py5xdWVyeTtcblxuICBjb25zdCBzZXRWYWx1ZSA9IHVzZUNhbGxiYWNrKFxuICAgIChuZXh0OiBULCBuYXZPcHRzPzogeyByZXBsYWNlPzogYm9vbGVhbiB9KSA9PiB7XG4gICAgICBpZiAoY3R4ID09IG51bGwpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgY29uc3QgcmVwbGFjZSA9IG5hdk9wdHM/LnJlcGxhY2UgPz8gb3B0cy5yZXBsYWNlO1xuICAgICAgY29uc3QgZW50cnlOb3cgPSBjdHguZ2V0KCk7XG4gICAgICAvLyBCYXNlIG9iamVjdDogc3RhcnQgZnJvbSBleGlzdGluZyB0eXBlZFF1ZXJ5IGlmIHByZXNlbnQgZWxzZSByYXcgcXVlcnkgY2xvbmVcbiAgICAgIGNvbnN0IHNvdXJjZSA9IHsgLi4uZW50cnlOb3cucXVlcnkgfTtcbiAgICAgIGNvbnN0IGJhc2U6IFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0ge307XG4gICAgICBmb3IgKGNvbnN0IGsgb2YgT2JqZWN0LmtleXMoc291cmNlKSkge1xuICAgICAgICBiYXNlW2tdID0gc291cmNlW2tdO1xuICAgICAgfVxuICAgICAgZm9yIChjb25zdCBrIG9mIE9iamVjdC5rZXlzKG5leHQpKSB7XG4gICAgICAgIGNvbnN0IHYgPSAobmV4dCBhcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPilba107XG4gICAgICAgIGlmICh2ID09PSB1bmRlZmluZWQpIHtcbiAgICAgICAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWR5bmFtaWMtZGVsZXRlXG4gICAgICAgICAgZGVsZXRlIGJhc2Vba107XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgYmFzZVtrXSA9IHY7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIGN0eC5uYXZpZ2F0ZSh7IHF1ZXJ5OiBiYXNlLCByZXBsYWNlIH0pO1xuICAgIH0sXG4gICAgW2N0eCwgb3B0cy5yZXBsYWNlXSxcbiAgKTtcblxuICByZXR1cm4gW3Jhd1F1ZXJ5IGFzIFQsIHNldFZhbHVlXTtcbn1cbiJdfQ==

package/lib/esm/routing/useFilters.js

@@ -24,12 +24,12 @@ export default function useFilters() {
     const ctx = useContext(RoutingContext);
     const entry = ctx?.get();
     const route = entry?.route;
-    const filterSchema = useMemo(() => {
+    const querySchema = useMemo(() => {
         if (route == null)
             return undefined;
         const collected = [];
         for (const r of route.route.routes) {
-            const maybe = r.filterSchema;
+            const maybe = r.querySchema;
             if (maybe != null && typeof maybe === 'object') {
                 collected.push(maybe);
             }
@@ -41,7 +41,7 @@ export default function useFilters() {
     const currentFilters = useMemo(() => {
         return entry?.filters ?? {};
     }, [entry?.filters]);
-    const query = entry?.typedQuery ?? entry?.query;
+    const query = entry?.query;
     const actions = useMemo(() => {
         function navigateWith(nextFilters, replace) {
             if (ctx == null)
@@ -52,32 +52,32 @@ export default function useFilters() {
         }
         return {
             set(field, operator, value, opts) {
-                if (filterSchema == null)
+                if (querySchema == null)
                     return;
-                const next = setFilter(currentFilters, filterSchema, field, operator, value);
+                const next = setFilter(currentFilters, querySchema, field, operator, value);
                 navigateWith(next, opts?.replace);
             },
             remove(field, operator, opts) {
-                if (filterSchema == null)
+                if (querySchema == null)
                     return;
                 const next = removeFilterOp(currentFilters, field, operator);
                 navigateWith(next, opts?.replace);
             },
             merge(patch, opts) {
-                if (filterSchema == null)
+                if (querySchema == null)
                     return;
                 const next = mergeFilters(currentFilters, patch);
                 navigateWith(next, opts?.replace);
             },
             clear(opts) {
-                if (filterSchema == null)
+                if (querySchema == null)
                     return;
                 if (isEmpty(currentFilters))
                     return;
                 navigateWith({}, opts?.replace);
             },
         };
-    }, [ctx, currentFilters, filterSchema, query]);
+    }, [ctx, currentFilters, querySchema, query]);
     return [currentFilters, actions];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"useFilters.js","sourceRoot":"","sources":["../../../src/routing/useFilters.ts"],"names":[],"mappings":"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","sourcesContent":["import { useContext, useMemo } from 'react';\nimport RoutingContext from './RoutingContext.js';\nimport type { FilterSchema } from '../types.js';\nimport {\n  setFilter,\n  removeFilter as removeFilterOp,\n  mergeFilters,\n  isEmpty,\n} from '@plumile/filter-query';\n\n/** Internal helper: shallow equality */\nfunction shallowEqual(a: unknown, b: unknown): boolean {\n  if (a === b) return true;\n  if (\n    typeof a !== 'object' ||\n    a === null ||\n    typeof b !== 'object' ||\n    b === null\n  ) {\n    return false;\n  }\n  const aObj = a as Record<string, unknown>;\n  const bObj = b as Record<string, unknown>;\n  const aKeys = Object.keys(aObj);\n  if (aKeys.length !== Object.keys(bObj).length) return false;\n  for (const k of aKeys) if (aObj[k] !== bObj[k]) return false;\n  return true;\n}\n\nexport type FilterActions = {\n  set: (\n    field: string,\n    operator: string,\n    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents\n    value: unknown | undefined,\n    opts?: { replace?: boolean },\n  ) => void;\n  remove: (\n    field: string,\n    operator?: string,\n    opts?: { replace?: boolean },\n  ) => void;\n  merge: (patch: Record<string, unknown>, opts?: { replace?: boolean }) => void;\n  clear: (opts?: { replace?: boolean }) => void;\n};\n\n/**\n * Hook returning current filters (typed if schema present) and actions to mutate them.\n * Fallback to empty object when no filter schema.\n */\nexport default function useFilters(): [Record<string, unknown>, FilterActions] {\n  const ctx = useContext(RoutingContext);\n  const entry = ctx?.get();\n  const route = entry?.route;\n  // Discover deepest filter schema\n  const filterSchema: FilterSchema | undefined = useMemo(() => {\n    if (route == null) return undefined;\n    const collected: FilterSchema[] = [];\n    for (const r of route.route.routes) {\n      const maybe = (r as unknown as { filterSchema?: unknown }).filterSchema;\n      if (maybe != null && typeof maybe === 'object') {\n        collected.push(maybe as FilterSchema);\n      }\n    }\n    if (collected.length === 0) return undefined;\n    return collected.at(-1);\n  }, [route]);\n\n  const currentFilters: Record<string, unknown> = useMemo(() => {\n    return entry?.filters ?? {};\n  }, [entry?.filters]);\n  const query = entry?.typedQuery ?? entry?.query;\n\n  const actions: FilterActions = useMemo(() => {\n    /** Navigate with new filters if they differ. */\n    function navigateWith(\n      nextFilters: Record<string, unknown>,\n      replace?: boolean,\n    ) {\n      if (ctx == null) return;\n      // Avoid navigation if structurally identical\n      if (shallowEqual(currentFilters, nextFilters)) return;\n      ctx.navigate({ query: query as any, filters: nextFilters, replace });\n    }\n    return {\n      set(field, operator, value, opts) {\n        if (filterSchema == null) return; // ignore when no schema\n        const next = setFilter(\n          currentFilters as any,\n          filterSchema as any,\n          field as any,\n          operator as any,\n          value as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      remove(field, operator, opts) {\n        if (filterSchema == null) return;\n        const next = removeFilterOp(\n          currentFilters as any,\n          field as any,\n          operator as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      merge(patch, opts) {\n        if (filterSchema == null) return;\n        const next = mergeFilters(\n          currentFilters as any,\n          patch as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      clear(opts) {\n        if (filterSchema == null) return;\n        if (isEmpty(currentFilters as any)) return;\n        navigateWith({}, opts?.replace);\n      },\n    };\n  }, [ctx, currentFilters, filterSchema, query]);\n\n  return [currentFilters, actions];\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"useFilters.js","sourceRoot":"","sources":["../../../src/routing/useFilters.ts"],"names":[],"mappings":"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","sourcesContent":["import { useContext, useMemo } from 'react';\nimport RoutingContext from './RoutingContext.js';\nimport type { FilterSchema } from '../types.js';\nimport {\n  setFilter,\n  removeFilter as removeFilterOp,\n  mergeFilters,\n  isEmpty,\n} from '@plumile/filter-query';\n\n/** Internal helper: shallow equality */\nfunction shallowEqual(a: unknown, b: unknown): boolean {\n  if (a === b) return true;\n  if (\n    typeof a !== 'object' ||\n    a === null ||\n    typeof b !== 'object' ||\n    b === null\n  ) {\n    return false;\n  }\n  const aObj = a as Record<string, unknown>;\n  const bObj = b as Record<string, unknown>;\n  const aKeys = Object.keys(aObj);\n  if (aKeys.length !== Object.keys(bObj).length) return false;\n  for (const k of aKeys) if (aObj[k] !== bObj[k]) return false;\n  return true;\n}\n\nexport type FilterActions = {\n  set: (\n    field: string,\n    operator: string,\n    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents\n    value: unknown | undefined,\n    opts?: { replace?: boolean },\n  ) => void;\n  remove: (\n    field: string,\n    operator?: string,\n    opts?: { replace?: boolean },\n  ) => void;\n  merge: (patch: Record<string, unknown>, opts?: { replace?: boolean }) => void;\n  clear: (opts?: { replace?: boolean }) => void;\n};\n\n/**\n * Hook returning current filters (typed if schema present) and actions to mutate them.\n * Fallback to empty object when no filter schema.\n */\nexport default function useFilters(): [Record<string, unknown>, FilterActions] {\n  const ctx = useContext(RoutingContext);\n  const entry = ctx?.get();\n  const route = entry?.route;\n  // Discover deepest unified query schema (was filterSchema during migration)\n  const querySchema: FilterSchema | undefined = useMemo(() => {\n    if (route == null) return undefined;\n    const collected: FilterSchema[] = [];\n    for (const r of route.route.routes) {\n      const maybe = (r as unknown as { querySchema?: unknown }).querySchema;\n      if (maybe != null && typeof maybe === 'object') {\n        collected.push(maybe as FilterSchema);\n      }\n    }\n    if (collected.length === 0) return undefined;\n    return collected.at(-1);\n  }, [route]);\n\n  const currentFilters: Record<string, unknown> = useMemo(() => {\n    return entry?.filters ?? {};\n  }, [entry?.filters]);\n  const query = entry?.query;\n\n  const actions: FilterActions = useMemo(() => {\n    /** Navigate with new filters if they differ. */\n    function navigateWith(\n      nextFilters: Record<string, unknown>,\n      replace?: boolean,\n    ) {\n      if (ctx == null) return;\n      // Avoid navigation if structurally identical\n      if (shallowEqual(currentFilters, nextFilters)) return;\n      ctx.navigate({ query: query as any, filters: nextFilters, replace });\n    }\n    return {\n      set(field, operator, value, opts) {\n        if (querySchema == null) return; // ignore when no schema\n        const next = setFilter(\n          currentFilters as any,\n          querySchema as any,\n          field as any,\n          operator as any,\n          value as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      remove(field, operator, opts) {\n        if (querySchema == null) return;\n        const next = removeFilterOp(\n          currentFilters as any,\n          field as any,\n          operator as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      merge(patch, opts) {\n        if (querySchema == null) return;\n        const next = mergeFilters(\n          currentFilters as any,\n          patch as any,\n        ) as Record<string, unknown>;\n        navigateWith(next, opts?.replace);\n      },\n      clear(opts) {\n        if (querySchema == null) return;\n        if (isEmpty(currentFilters as any)) return;\n        navigateWith({}, opts?.replace);\n      },\n    };\n  }, [ctx, currentFilters, querySchema, query]);\n\n  return [currentFilters, actions];\n}\n"]}

package/lib/esm/routing/useQueryState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueryState.d.ts","sourceRoot":"","sources":["../../../src/routing/useQueryState.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IAEpC,YAAY,CAAC,EAAE,CAAC,CAAC;IAEjB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAWF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,GAAG,OAAO,EAC/C,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,oBAAoB,CAAC,CAAC,CAAM,GACjC;IACD,CAAC,GAAG,SAAS;IACb,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI;CAC/D,CAsFA"}
+{"version":3,"file":"useQueryState.d.ts","sourceRoot":"","sources":["../../../src/routing/useQueryState.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IAEpC,YAAY,CAAC,EAAE,CAAC,CAAC;IAEjB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAWF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,GAAG,OAAO,EAC/C,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,oBAAoB,CAAC,CAAC,CAAM,GACjC;IACD,CAAC,GAAG,SAAS;IACb,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI;CAC/D,CA8CA"}

package/lib/esm/routing/useQueryState.js

@@ -1,47 +1,17 @@
-import { useCallback, useContext, useMemo } from 'react';
+import { useCallback, useContext } from 'react';
 import RoutingContext from './RoutingContext.js';
 export default function useQueryState(key, opts = {}) {
     const ctx = useContext(RoutingContext);
     const { defaultValue, omitIfDefault = true } = opts;
     const entry = ctx?.get();
-    const route = entry?.route;
-    const schema = useMemo(() => {
-        if (route == null)
-            return undefined;
-        const collected = [];
-        for (const r of route.route.routes) {
-            const maybe = r.query;
-            if (maybe !== null &&
-                typeof maybe === 'object' &&
-                Object.values(maybe).some((v) => {
-                    if (v == null || typeof v !== 'object')
-                        return false;
-                    if (!('parse' in v))
-                        return false;
-                    const candidate = v;
-                    return typeof candidate.parse === 'function';
-                })) {
-                collected.push(maybe);
-            }
-        }
-        if (collected.length === 0)
-            return undefined;
-        return collected.at(-1);
-    }, [route]);
-    const typedQuery = entry?.typedQuery;
     const rawQuery = entry?.query;
     let current;
-    if (opts.raw || schema == null) {
-        const rawVal = rawQuery?.[key];
-        if (Array.isArray(rawVal)) {
-            current = rawVal[rawVal.length - 1];
-        }
-        else if (rawVal != null) {
-            current = rawVal;
-        }
+    const rawVal = rawQuery?.[key];
+    if (Array.isArray(rawVal)) {
+        current = rawVal[rawVal.length - 1];
     }
-    else if (typedQuery != null) {
-        current = typedQuery[key];
+    else if (rawVal != null) {
+        current = rawVal;
     }
     if (current === undefined && defaultValue !== undefined) {
         current = defaultValue;
@@ -51,17 +21,12 @@ export default function useQueryState(key, opts = {}) {
             return;
         const replace = navOpts?.replace ?? opts.replace;
         const entryNow = ctx.get();
-        const source = entryNow.typedQuery ?? entryNow.query;
+        const source = entryNow.query;
         const base = {};
         for (const k of Object.keys(source)) {
             base[k] = source[k];
         }
-        const descriptor = schema?.[key];
-        const isDefault = descriptor != null &&
-            descriptor.hasDefault &&
-            next === descriptor.defaultValue;
-        if (!(next === undefined ||
-            (omitIfDefault && (isDefault || next === defaultValue)))) {
+        if (!(next === undefined || (omitIfDefault && next === defaultValue))) {
             base[key] = next;
         }
         else if (Object.prototype.hasOwnProperty.call(base, key)) {
@@ -74,7 +39,7 @@ export default function useQueryState(key, opts = {}) {
             return;
         }
         ctx.navigate({ query: base, replace });
-    }, [ctx, schema, key, omitIfDefault, defaultValue, opts.replace]);
+    }, [ctx, key, omitIfDefault, defaultValue, opts.replace]);
     return [current, setValue];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"useQueryState.js","sourceRoot":"","sources":["../../../src/routing/useQueryState.ts"],"names":[],"mappings":"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","sourcesContent":["import { useCallback, useContext, useMemo } from 'react';\nimport RoutingContext from './RoutingContext.js';\nimport type { QuerySchema } from '../types.js';\n\n/** Options for useQueryState */\nexport type UseQueryStateOptions<T> = {\n  /** Default value when the key is absent (overrides schema default for the hook consumer) */\n  defaultValue?: T;\n  /** If true, omit this key when value equals defaultValue (and schema default) */\n  omitIfDefault?: boolean;\n  /** Replace instead of push when updating (prevents new history entry) */\n  replace?: boolean;\n  /** Use raw (untyped) query value rather than typedQuery (fallback for migration) */\n  raw?: boolean;\n};\n\n/**\n * Bidirectional state ↔ URL synchronization for a single query param.\n *\n * Behaviours:\n * - Reads from typedQuery (if schema present) else raw query aggregation.\n * - When setting value to undefined (or default with omitIfDefault) the key is removed.\n * - Serializes through existing navigate+buildSearch pipeline (schema aware ordering & omission).\n * - Stable identity for setter.\n */\nexport default function useQueryState<T = unknown>(\n  key: string,\n  opts: UseQueryStateOptions<T> = {},\n): [\n  T | undefined,\n  (next: T | undefined, navOpts?: { replace?: boolean }) => void,\n] {\n  const ctx = useContext(RoutingContext);\n  const { defaultValue, omitIfDefault = true } = opts;\n  const entry = ctx?.get();\n  const route = entry?.route;\n\n  // Extract deepest schema (same heuristic as useTypedQuery)\n  const schema: QuerySchema | undefined = useMemo(() => {\n    if (route == null) return undefined;\n    const collected: QuerySchema[] = [];\n    for (const r of route.route.routes) {\n      const maybe = (r as unknown as { query?: unknown }).query;\n      if (\n        maybe !== null &&\n        typeof maybe === 'object' &&\n        Object.values(maybe as Record<string, unknown>).some((v) => {\n          if (v == null || typeof v !== 'object') return false;\n          if (!('parse' in (v as Record<string, unknown>))) return false;\n          const candidate = v as { parse?: unknown };\n          return typeof candidate.parse === 'function';\n        })\n      ) {\n        collected.push(maybe as QuerySchema);\n      }\n    }\n    if (collected.length === 0) return undefined;\n    return collected.at(-1);\n  }, [route]);\n\n  const typedQuery = entry?.typedQuery;\n  const rawQuery = entry?.query;\n\n  let current: unknown;\n  if (opts.raw || schema == null) {\n    const rawVal = rawQuery?.[key];\n    if (Array.isArray(rawVal)) {\n      // pick last for symmetry with typed parsing of primitives\n      current = rawVal[rawVal.length - 1];\n    } else if (rawVal != null) {\n      current = rawVal;\n    }\n  } else if (typedQuery != null) {\n    current = typedQuery[key];\n  }\n  if (current === undefined && defaultValue !== undefined) {\n    current = defaultValue;\n  }\n\n  const setValue = useCallback(\n    (next: T | undefined, navOpts?: { replace?: boolean }) => {\n      if (ctx == null) return;\n      const replace = navOpts?.replace ?? opts.replace;\n      const entryNow = ctx.get();\n      // Base object: start from existing typedQuery if present else raw query clone\n      const source = entryNow.typedQuery ?? entryNow.query;\n      const base: Record<string, unknown> = {};\n      for (const k of Object.keys(source)) {\n        base[k] = source[k];\n      }\n      const descriptor = schema?.[key];\n      const isDefault =\n        descriptor != null &&\n        descriptor.hasDefault &&\n        next === descriptor.defaultValue;\n      if (\n        !(\n          next === undefined ||\n          (omitIfDefault && (isDefault || next === defaultValue))\n        )\n      ) {\n        base[key] = next;\n      } else if (Object.prototype.hasOwnProperty.call(base, key)) {\n        // rebuild without key\n        const rebuilt: Record<string, unknown> = {};\n        for (const k of Object.keys(base)) {\n          if (k !== key) rebuilt[k] = base[k];\n        }\n        ctx.navigate({ query: rebuilt, replace });\n        return;\n      }\n      ctx.navigate({ query: base, replace });\n    },\n    [ctx, schema, key, omitIfDefault, defaultValue, opts.replace],\n  );\n\n  return [current as T | undefined, setValue];\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlUXVlcnlTdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yb3V0aW5nL3VzZVF1ZXJ5U3RhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxPQUFPLENBQUM7QUFDaEQsT0FBTyxjQUFjLE1BQU0scUJBQXFCLENBQUM7QUF1QmpELE1BQU0sQ0FBQyxPQUFPLFVBQVUsYUFBYSxDQUNuQyxHQUFXLEVBQ1gsT0FBZ0MsRUFBRTtJQUtsQyxNQUFNLEdBQUcsR0FBRyxVQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDdkMsTUFBTSxFQUFFLFlBQVksRUFBRSxhQUFhLEdBQUcsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQ3BELE1BQU0sS0FBSyxHQUFHLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztJQUN6QixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBRTlCLElBQUksT0FBZ0IsQ0FBQztJQUNyQixNQUFNLE1BQU0sR0FBRyxRQUFRLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUUxQixPQUFPLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDdEMsQ0FBQztTQUFNLElBQUksTUFBTSxJQUFJLElBQUksRUFBRSxDQUFDO1FBQzFCLE9BQU8sR0FBRyxNQUFNLENBQUM7SUFDbkIsQ0FBQztJQUNELElBQUksT0FBTyxLQUFLLFNBQVMsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDeEQsT0FBTyxHQUFHLFlBQVksQ0FBQztJQUN6QixDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsV0FBVyxDQUMxQixDQUFDLElBQW1CLEVBQUUsT0FBK0IsRUFBRSxFQUFFO1FBQ3ZELElBQUksR0FBRyxJQUFJLElBQUk7WUFBRSxPQUFPO1FBQ3hCLE1BQU0sT0FBTyxHQUFHLE9BQU8sRUFBRSxPQUFPLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNqRCxNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7UUFFM0IsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQztRQUM5QixNQUFNLElBQUksR0FBNEIsRUFBRSxDQUFDO1FBQ3pDLEtBQUssTUFBTSxDQUFDLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQ3BDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEIsQ0FBQztRQUNELElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxTQUFTLElBQUksQ0FBQyxhQUFhLElBQUksSUFBSSxLQUFLLFlBQVksQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN0RSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ25CLENBQUM7YUFBTSxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUUzRCxNQUFNLE9BQU8sR0FBNEIsRUFBRSxDQUFDO1lBQzVDLEtBQUssTUFBTSxDQUFDLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUNsQyxJQUFJLENBQUMsS0FBSyxHQUFHO29CQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdEMsQ0FBQztZQUNELEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDMUMsT0FBTztRQUNULENBQUM7UUFDRCxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUMsRUFDRCxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLFlBQVksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQ3RELENBQUM7SUFFRixPQUFPLENBQUMsT0FBd0IsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUM5QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdXNlQ2FsbGJhY2ssIHVzZUNvbnRleHQgfSBmcm9tICdyZWFjdCc7XG5pbXBvcnQgUm91dGluZ0NvbnRleHQgZnJvbSAnLi9Sb3V0aW5nQ29udGV4dC5qcyc7XG5cbi8qKiBPcHRpb25zIGZvciB1c2VRdWVyeVN0YXRlICovXG5leHBvcnQgdHlwZSBVc2VRdWVyeVN0YXRlT3B0aW9uczxUPiA9IHtcbiAgLyoqIERlZmF1bHQgdmFsdWUgd2hlbiB0aGUga2V5IGlzIGFic2VudCAob3ZlcnJpZGVzIHNjaGVtYSBkZWZhdWx0IGZvciB0aGUgaG9vayBjb25zdW1lcikgKi9cbiAgZGVmYXVsdFZhbHVlPzogVDtcbiAgLyoqIElmIHRydWUsIG9taXQgdGhpcyBrZXkgd2hlbiB2YWx1ZSBlcXVhbHMgZGVmYXVsdFZhbHVlIChhbmQgc2NoZW1hIGRlZmF1bHQpICovXG4gIG9taXRJZkRlZmF1bHQ/OiBib29sZWFuO1xuICAvKiogUmVwbGFjZSBpbnN0ZWFkIG9mIHB1c2ggd2hlbiB1cGRhdGluZyAocHJldmVudHMgbmV3IGhpc3RvcnkgZW50cnkpICovXG4gIHJlcGxhY2U/OiBib29sZWFuO1xuICAvKiogKExlZ2FjeSkgcmF3IGZsYWcgcmV0YWluZWQgZm9yIGJhY2t3YXJkcyBjb21wYXQg4oCTIG5vIGVmZmVjdCAodHlwZWQgbW9kZWwgcmVtb3ZlZCkgKi9cbiAgcmF3PzogYm9vbGVhbjtcbn07XG5cbi8qKlxuICogQmlkaXJlY3Rpb25hbCBzdGF0ZSDihpQgVVJMIHN5bmNocm9uaXphdGlvbiBmb3IgYSBzaW5nbGUgcXVlcnkgcGFyYW0uXG4gKlxuICogQmVoYXZpb3VyczpcbiAqIC0gUmVhZHMgZnJvbSByYXcgcXVlcnkgYWdncmVnYXRpb24gKHR5cGVkIHF1ZXJ5IHJlbW92ZWQpLlxuICogLSBXaGVuIHNldHRpbmcgdmFsdWUgdG8gdW5kZWZpbmVkIChvciBkZWZhdWx0IHdpdGggb21pdElmRGVmYXVsdCkgdGhlIGtleSBpcyByZW1vdmVkLlxuICogLSBTZXJpYWxpemVzIHZpYSBuYXZpZ2F0ZSArIHVuaWZpZWQgYnVpbGRDb21iaW5lZFNlYXJjaCAoc2NoZW1hIG9yZGVyaW5nICYgb21pc3Npb24gcmVzcGVjdGVkKS5cbiAqIC0gU3RhYmxlIGlkZW50aXR5IGZvciBzZXR0ZXIuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVzZVF1ZXJ5U3RhdGU8VCA9IHVua25vd24+KFxuICBrZXk6IHN0cmluZyxcbiAgb3B0czogVXNlUXVlcnlTdGF0ZU9wdGlvbnM8VD4gPSB7fSxcbik6IFtcbiAgVCB8IHVuZGVmaW5lZCxcbiAgKG5leHQ6IFQgfCB1bmRlZmluZWQsIG5hdk9wdHM/OiB7IHJlcGxhY2U/OiBib29sZWFuIH0pID0+IHZvaWQsXG5dIHtcbiAgY29uc3QgY3R4ID0gdXNlQ29udGV4dChSb3V0aW5nQ29udGV4dCk7XG4gIGNvbnN0IHsgZGVmYXVsdFZhbHVlLCBvbWl0SWZEZWZhdWx0ID0gdHJ1ZSB9ID0gb3B0cztcbiAgY29uc3QgZW50cnkgPSBjdHg/LmdldCgpO1xuICBjb25zdCByYXdRdWVyeSA9IGVudHJ5Py5xdWVyeTtcblxuICBsZXQgY3VycmVudDogdW5rbm93bjtcbiAgY29uc3QgcmF3VmFsID0gcmF3UXVlcnk/LltrZXldO1xuICBpZiAoQXJyYXkuaXNBcnJheShyYXdWYWwpKSB7XG4gICAgLy8gcGljayBsYXN0IGZvciBzeW1tZXRyeSB3aXRoIHR5cGVkIHBhcnNpbmcgb2YgcHJpbWl0aXZlc1xuICAgIGN1cnJlbnQgPSByYXdWYWxbcmF3VmFsLmxlbmd0aCAtIDFdO1xuICB9IGVsc2UgaWYgKHJhd1ZhbCAhPSBudWxsKSB7XG4gICAgY3VycmVudCA9IHJhd1ZhbDtcbiAgfVxuICBpZiAoY3VycmVudCA9PT0gdW5kZWZpbmVkICYmIGRlZmF1bHRWYWx1ZSAhPT0gdW5kZWZpbmVkKSB7XG4gICAgY3VycmVudCA9IGRlZmF1bHRWYWx1ZTtcbiAgfVxuXG4gIGNvbnN0IHNldFZhbHVlID0gdXNlQ2FsbGJhY2soXG4gICAgKG5leHQ6IFQgfCB1bmRlZmluZWQsIG5hdk9wdHM/OiB7IHJlcGxhY2U/OiBib29sZWFuIH0pID0+IHtcbiAgICAgIGlmIChjdHggPT0gbnVsbCkgcmV0dXJuO1xuICAgICAgY29uc3QgcmVwbGFjZSA9IG5hdk9wdHM/LnJlcGxhY2UgPz8gb3B0cy5yZXBsYWNlO1xuICAgICAgY29uc3QgZW50cnlOb3cgPSBjdHguZ2V0KCk7XG4gICAgICAvLyBCYXNlIG9iamVjdDogc3RhcnQgZnJvbSBleGlzdGluZyByYXcgcXVlcnkgY2xvbmUgKHR5cGVkIG1vZGVsIHJlbW92ZWQpXG4gICAgICBjb25zdCBzb3VyY2UgPSBlbnRyeU5vdy5xdWVyeTtcbiAgICAgIGNvbnN0IGJhc2U6IFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0ge307XG4gICAgICBmb3IgKGNvbnN0IGsgb2YgT2JqZWN0LmtleXMoc291cmNlKSkge1xuICAgICAgICBiYXNlW2tdID0gc291cmNlW2tdO1xuICAgICAgfVxuICAgICAgaWYgKCEobmV4dCA9PT0gdW5kZWZpbmVkIHx8IChvbWl0SWZEZWZhdWx0ICYmIG5leHQgPT09IGRlZmF1bHRWYWx1ZSkpKSB7XG4gICAgICAgIGJhc2Vba2V5XSA9IG5leHQ7XG4gICAgICB9IGVsc2UgaWYgKE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChiYXNlLCBrZXkpKSB7XG4gICAgICAgIC8vIHJlYnVpbGQgd2l0aG91dCBrZXlcbiAgICAgICAgY29uc3QgcmVidWlsdDogUmVjb3JkPHN0cmluZywgdW5rbm93bj4gPSB7fTtcbiAgICAgICAgZm9yIChjb25zdCBrIG9mIE9iamVjdC5rZXlzKGJhc2UpKSB7XG4gICAgICAgICAgaWYgKGsgIT09IGtleSkgcmVidWlsdFtrXSA9IGJhc2Vba107XG4gICAgICAgIH1cbiAgICAgICAgY3R4Lm5hdmlnYXRlKHsgcXVlcnk6IHJlYnVpbHQsIHJlcGxhY2UgfSk7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIGN0eC5uYXZpZ2F0ZSh7IHF1ZXJ5OiBiYXNlLCByZXBsYWNlIH0pO1xuICAgIH0sXG4gICAgW2N0eCwga2V5LCBvbWl0SWZEZWZhdWx0LCBkZWZhdWx0VmFsdWUsIG9wdHMucmVwbGFjZV0sXG4gICk7XG5cbiAgcmV0dXJuIFtjdXJyZW50IGFzIFQgfCB1bmRlZmluZWQsIHNldFZhbHVlXTtcbn1cbiJdfQ==

package/lib/esm/tools/buildCombinedSearch.d.ts

@@ -1,11 +1,7 @@
 import { type Schema as FilterSchema } from '@plumile/filter-query';
-import type { QuerySchema } from '../types.js';
 export declare function buildCombinedSearch(opts: {
-    query?: Record<string, unknown>;
-    querySchema?: QuerySchema;
     filters?: Record<string, unknown>;
-    filterSchema?: FilterSchema;
-    omitQueryDefaults?: boolean;
+    querySchema?: FilterSchema;
 }): string;
 export default buildCombinedSearch;
 //# sourceMappingURL=buildCombinedSearch.d.ts.map

package/lib/esm/tools/buildCombinedSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildCombinedSearch.d.ts","sourceRoot":"","sources":["../../../src/tools/buildCombinedSearch.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,MAAM,IAAI,YAAY,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAU/C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,GAAG,MAAM,CA0BT;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"buildCombinedSearch.d.ts","sourceRoot":"","sources":["../../../src/tools/buildCombinedSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,MAAM,IAAI,YAAY,EAC5B,MAAM,uBAAuB,CAAC;AAM/B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B,GAAG,MAAM,CAaT;AAED,eAAe,mBAAmB,CAAC"}

package/lib/esm/tools/buildCombinedSearch.js

@@ -1,28 +1,19 @@
-import { buildSearch } from './buildSearch.js';
 import { stringify as stringifyFilters, } from '@plumile/filter-query';
 export function buildCombinedSearch(opts) {
-    const { query, querySchema, filters, filterSchema, omitQueryDefaults = true, } = opts;
-    const queryPart = buildSearch(query, querySchema, {
-        omitDefaults: omitQueryDefaults,
-        sortKeys: true,
-    });
+    const { filters, querySchema } = opts;
     let filterPart = '';
-    if (filterSchema != null && filters != null) {
+    if (querySchema != null && filters != null) {
         try {
-            const raw = stringifyFilters(filters, filterSchema);
+            const raw = stringifyFilters(filters, querySchema);
             if (raw !== '')
                 filterPart = raw;
         }
         catch {
         }
     }
-    if (queryPart === '' && filterPart === '')
-        return '';
-    if (queryPart === '')
-        return `?${filterPart}`;
     if (filterPart === '')
-        return queryPart;
-    return `${queryPart}&${filterPart}`;
+        return '';
+    return `?${filterPart}`;
 }
 export default buildCombinedSearch;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRDb21iaW5lZFNlYXJjaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29scy9idWlsZENvbWJpbmVkU2VhcmNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQ0wsU0FBUyxJQUFJLGdCQUFnQixHQUU5QixNQUFNLHVCQUF1QixDQUFDO0FBVy9CLE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxJQU1uQztJQUNDLE1BQU0sRUFDSixLQUFLLEVBQ0wsV0FBVyxFQUNYLE9BQU8sRUFDUCxZQUFZLEVBQ1osaUJBQWlCLEdBQUcsSUFBSSxHQUN6QixHQUFHLElBQUksQ0FBQztJQUVULE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxLQUFZLEVBQUUsV0FBa0IsRUFBRTtRQUM5RCxZQUFZLEVBQUUsaUJBQWlCO1FBQy9CLFFBQVEsRUFBRSxJQUFJO0tBQ2YsQ0FBQyxDQUFDO0lBQ0gsSUFBSSxVQUFVLEdBQUcsRUFBRSxDQUFDO0lBQ3BCLElBQUksWUFBWSxJQUFJLElBQUksSUFBSSxPQUFPLElBQUksSUFBSSxFQUFFLENBQUM7UUFDNUMsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsT0FBYyxFQUFFLFlBQW1CLENBQUMsQ0FBQztZQUNsRSxJQUFJLEdBQUcsS0FBSyxFQUFFO2dCQUFFLFVBQVUsR0FBRyxHQUFHLENBQUM7UUFDbkMsQ0FBQztRQUFDLE1BQU0sQ0FBQztRQUVULENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBSSxTQUFTLEtBQUssRUFBRSxJQUFJLFVBQVUsS0FBSyxFQUFFO1FBQUUsT0FBTyxFQUFFLENBQUM7SUFDckQsSUFBSSxTQUFTLEtBQUssRUFBRTtRQUFFLE9BQU8sSUFBSSxVQUFVLEVBQUUsQ0FBQztJQUM5QyxJQUFJLFVBQVUsS0FBSyxFQUFFO1FBQUUsT0FBTyxTQUFTLENBQUM7SUFDeEMsT0FBTyxHQUFHLFNBQVMsSUFBSSxVQUFVLEVBQUUsQ0FBQztBQUN0QyxDQUFDO0FBRUQsZUFBZSxtQkFBbUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGJ1aWxkU2VhcmNoIH0gZnJvbSAnLi9idWlsZFNlYXJjaC5qcyc7XG5pbXBvcnQge1xuICBzdHJpbmdpZnkgYXMgc3RyaW5naWZ5RmlsdGVycyxcbiAgdHlwZSBTY2hlbWEgYXMgRmlsdGVyU2NoZW1hLFxufSBmcm9tICdAcGx1bWlsZS9maWx0ZXItcXVlcnknO1xuaW1wb3J0IHR5cGUgeyBRdWVyeVNjaGVtYSB9IGZyb20gJy4uL3R5cGVzLmpzJztcblxuLyoqXG4gKiBCdWlsZCBhIGNvbWJpbmVkIHNlYXJjaCBzdHJpbmcgaW5jbHVkaW5nIHR5cGVkIHF1ZXJ5IHBhcmFtcyAoc2NoZW1hIGF3YXJlKVxuICogYW5kIGZpbHRlcnMgKGZpbHRlci1xdWVyeSBzY2hlbWEpLlxuICogT3JkZXJpbmcgcnVsZXM6XG4gKiAgLSBRdWVyeSBwYXJhbWV0ZXJzIGZpcnN0IChhcyBwcm9kdWNlZCBieSBidWlsZFNlYXJjaCB3aXRob3V0IGxlYWRpbmcgJz8nKS5cbiAqICAtIEZpbHRlciBzZWdtZW50cyBuZXh0IChzdHJpbmdpZnkgb3JkZXI6IHNjaGVtYSBmaWVsZCBvcmRlciB0aGVuIG9wZXJhdG9yIG9yZGVyKS5cbiAqICAtIElmIGJvdGggZW1wdHkgPT4gJycgKG5vIGxlYWRpbmcgPykuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBidWlsZENvbWJpbmVkU2VhcmNoKG9wdHM6IHtcbiAgcXVlcnk/OiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPjtcbiAgcXVlcnlTY2hlbWE/OiBRdWVyeVNjaGVtYTtcbiAgZmlsdGVycz86IFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuICBmaWx0ZXJTY2hlbWE/OiBGaWx0ZXJTY2hlbWE7XG4gIG9taXRRdWVyeURlZmF1bHRzPzogYm9vbGVhbjtcbn0pOiBzdHJpbmcge1xuICBjb25zdCB7XG4gICAgcXVlcnksXG4gICAgcXVlcnlTY2hlbWEsXG4gICAgZmlsdGVycyxcbiAgICBmaWx0ZXJTY2hlbWEsXG4gICAgb21pdFF1ZXJ5RGVmYXVsdHMgPSB0cnVlLFxuICB9ID0gb3B0cztcbiAgLy8gRmlyc3QgYnVpbGQgcXVlcnkgcGFydCB1c2luZyBleGlzdGluZyB1dGlsIChyZXR1cm5zICcnIG9yIHN0YXJ0aW5nIHdpdGggJz8nKVxuICBjb25zdCBxdWVyeVBhcnQgPSBidWlsZFNlYXJjaChxdWVyeSBhcyBhbnksIHF1ZXJ5U2NoZW1hIGFzIGFueSwge1xuICAgIG9taXREZWZhdWx0czogb21pdFF1ZXJ5RGVmYXVsdHMsXG4gICAgc29ydEtleXM6IHRydWUsXG4gIH0pO1xuICBsZXQgZmlsdGVyUGFydCA9ICcnO1xuICBpZiAoZmlsdGVyU2NoZW1hICE9IG51bGwgJiYgZmlsdGVycyAhPSBudWxsKSB7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnN0IHJhdyA9IHN0cmluZ2lmeUZpbHRlcnMoZmlsdGVycyBhcyBhbnksIGZpbHRlclNjaGVtYSBhcyBhbnkpO1xuICAgICAgaWYgKHJhdyAhPT0gJycpIGZpbHRlclBhcnQgPSByYXc7IC8vIHJhdyBoYXMgbm8gbGVhZGluZyA/IGJ5IGRlc2lnbiBpbiBmaWx0ZXItcXVlcnlcbiAgICB9IGNhdGNoIHtcbiAgICAgIC8vIElnbm9yZSBzZXJpYWxpemF0aW9uIGVycm9yczsgdHJlYXQgYXMgYWJzZW50IGZpbHRlcnNcbiAgICB9XG4gIH1cbiAgaWYgKHF1ZXJ5UGFydCA9PT0gJycgJiYgZmlsdGVyUGFydCA9PT0gJycpIHJldHVybiAnJztcbiAgaWYgKHF1ZXJ5UGFydCA9PT0gJycpIHJldHVybiBgPyR7ZmlsdGVyUGFydH1gO1xuICBpZiAoZmlsdGVyUGFydCA9PT0gJycpIHJldHVybiBxdWVyeVBhcnQ7IC8vIGFscmVhZHkgaGFzIGxlYWRpbmcgP1xuICByZXR1cm4gYCR7cXVlcnlQYXJ0fSYke2ZpbHRlclBhcnR9YDsgLy8gcXVlcnlQYXJ0IGFscmVhZHkgc3RhcnRzIHdpdGggP1xufVxuXG5leHBvcnQgZGVmYXVsdCBidWlsZENvbWJpbmVkU2VhcmNoO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRDb21iaW5lZFNlYXJjaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29scy9idWlsZENvbWJpbmVkU2VhcmNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxTQUFTLElBQUksZ0JBQWdCLEdBRTlCLE1BQU0sdUJBQXVCLENBQUM7QUFNL0IsTUFBTSxVQUFVLG1CQUFtQixDQUFDLElBR25DO0lBQ0MsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUM7SUFDdEMsSUFBSSxVQUFVLEdBQUcsRUFBRSxDQUFDO0lBQ3BCLElBQUksV0FBVyxJQUFJLElBQUksSUFBSSxPQUFPLElBQUksSUFBSSxFQUFFLENBQUM7UUFDM0MsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsT0FBYyxFQUFFLFdBQWtCLENBQUMsQ0FBQztZQUNqRSxJQUFJLEdBQUcsS0FBSyxFQUFFO2dCQUFFLFVBQVUsR0FBRyxHQUFHLENBQUM7UUFDbkMsQ0FBQztRQUFDLE1BQU0sQ0FBQztRQUVULENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBSSxVQUFVLEtBQUssRUFBRTtRQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2pDLE9BQU8sSUFBSSxVQUFVLEVBQUUsQ0FBQztBQUMxQixDQUFDO0FBRUQsZUFBZSxtQkFBbUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIHN0cmluZ2lmeSBhcyBzdHJpbmdpZnlGaWx0ZXJzLFxuICB0eXBlIFNjaGVtYSBhcyBGaWx0ZXJTY2hlbWEsXG59IGZyb20gJ0BwbHVtaWxlL2ZpbHRlci1xdWVyeSc7XG5cbi8qKlxuICogQnVpbGQgYSBzZWFyY2ggc3RyaW5nIGZyb20gZmlsdGVycyBvbmx5ICh1bmlmaWVkIG1vZGVsKS5cbiAqIFJldHVybnMgJycgd2hlbiBubyBmaWx0ZXJzIHByZXNlbnQsIGVsc2Ugc3RyaW5nIHN0YXJ0aW5nIHdpdGggJz8nLlxuICovXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRDb21iaW5lZFNlYXJjaChvcHRzOiB7XG4gIGZpbHRlcnM/OiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPjtcbiAgcXVlcnlTY2hlbWE/OiBGaWx0ZXJTY2hlbWE7XG59KTogc3RyaW5nIHtcbiAgY29uc3QgeyBmaWx0ZXJzLCBxdWVyeVNjaGVtYSB9ID0gb3B0cztcbiAgbGV0IGZpbHRlclBhcnQgPSAnJztcbiAgaWYgKHF1ZXJ5U2NoZW1hICE9IG51bGwgJiYgZmlsdGVycyAhPSBudWxsKSB7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnN0IHJhdyA9IHN0cmluZ2lmeUZpbHRlcnMoZmlsdGVycyBhcyBhbnksIHF1ZXJ5U2NoZW1hIGFzIGFueSk7XG4gICAgICBpZiAocmF3ICE9PSAnJykgZmlsdGVyUGFydCA9IHJhdzsgLy8gcmF3IGhhcyBubyBsZWFkaW5nID8gYnkgZGVzaWduIGluIGZpbHRlci1xdWVyeVxuICAgIH0gY2F0Y2gge1xuICAgICAgLy8gSWdub3JlIHNlcmlhbGl6YXRpb24gZXJyb3JzOyB0cmVhdCBhcyBhYnNlbnQgZmlsdGVyc1xuICAgIH1cbiAgfVxuICBpZiAoZmlsdGVyUGFydCA9PT0gJycpIHJldHVybiAnJztcbiAgcmV0dXJuIGA/JHtmaWx0ZXJQYXJ0fWA7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGJ1aWxkQ29tYmluZWRTZWFyY2g7XG4iXX0=

package/lib/esm/tools.d.ts

@@ -1,11 +1,7 @@
 import type { ParamData } from 'path-to-regexp';
-import type { PrepareResult, PreparedMatch, Route, RouterMatchedRoute, QuerySchema, InferQuery } from './types.js';
+import type { PrepareResult, PreparedMatch, Route, RouterMatchedRoute } from './types.js';
 import type { FlatRoute } from './builder.js';
 export declare function getMatchedRoute<TParams extends ParamData>(routes: FlatRoute<TParams>[], location: Location): RouterMatchedRoute<TParams> | null;
 export declare function prepareMatch<TParams extends ParamData>(match: RouterMatchedRoute<TParams> | null, query?: Record<string, unknown>): PreparedMatch<TParams>;
-export declare function r<TPrepared extends PrepareResult = PrepareResult, TVariables extends ParamData = ParamData, TQuery extends Record<string, unknown> = Record<string, unknown>, TSchema extends QuerySchema | undefined = undefined>(route: (TSchema extends QuerySchema ? Omit<Route<TPrepared, TVariables, InferQuery<TSchema>>, 'query'> & {
-    query: TSchema;
-} : Route<TPrepared, TVariables, TQuery>) & {
-    query?: TSchema;
-}): Route<TPrepared, TVariables, TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery>;
+export declare function r<TPrepared extends PrepareResult = PrepareResult, TVariables extends ParamData = ParamData, TQuery extends Record<string, unknown> = Record<string, unknown>>(route: Route<TPrepared, TVariables, TQuery>): Route<TPrepared, TVariables, TQuery>;
 //# sourceMappingURL=tools.d.ts.map

package/lib/esm/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,KAAK,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACX,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAW9C,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,EAC5B,QAAQ,EAAE,QAAQ,GACjB,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,CAepC;AAUD,wBAAgB,YAAY,CAAC,OAAO,SAAS,SAAS,EACpD,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,EACzC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,aAAa,CAAC,OAAO,CAAC,CAmDxB;AAwBD,wBAAgB,CAAC,CACf,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,OAAO,SAAS,WAAW,GAAG,SAAS,GAAG,SAAS,EAEnD,KAAK,EAAE,CAAC,OAAO,SAAS,WAAW,GAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;IACjE,KAAK,EAAE,OAAO,CAAC;CAChB,GACD,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,KAAK,CACN,SAAS,EACT,UAAU,EACV,OAAO,SAAS,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,CAC3D,CAMA"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,KAAK,EACL,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAW9C,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,EAC5B,QAAQ,EAAE,QAAQ,GACjB,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,CAepC;AAUD,wBAAgB,YAAY,CAAC,OAAO,SAAS,SAAS,EACpD,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,EACzC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,aAAa,CAAC,OAAO,CAAC,CAmDxB;AAwBD,wBAAgB,CAAC,CACf,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEhE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,GAC1C,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAEtC"}

package/lib/esm/tools.js

@@ -56,4 +56,4 @@ export function prepareMatch(match, query) {
 export function r(route) {
     return route;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,eAAe,CAC7B,MAA4B,EAC5B,QAAkB;IAElB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;YAC/B,OAAO;gBACL,KAAK;gBACL,KAAK;gBACL,IAAI;gBACJ,MAAM;aACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAUD,MAAM,UAAU,YAAY,CAC1B,KAAyC,EACzC,KAA+B;IAM/B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO;YACL,KAAK;YACL,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;IAEjC,MAAM,MAAM,GAAyB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QAEtD,IAAI,SAAkB,CAAC;QACvB,IAAI,QAAmC,CAAC;QAExC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,QAAQ,GAAG,OAAO,CAAC;gBACjB,KAAK;gBACL,YAAY;gBACZ,YAAY;gBAEZ,SAAS,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE;gBAC9B,KAAK,EAAE,KAAK,IAAI,EAAE;aACnB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBAEtB,YAAY,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;QACD,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,IAAI;YAC3C,MAAM;YACN,YAAY;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC;AAwBD,MAAM,UAAU,CAAC,CAMf,KAI+D;IAM/D,OAAO,KAIN,CAAC;AACJ,CAAC","sourcesContent":["import type { ParamData } from 'path-to-regexp';\n\nimport type {\n  PrepareResult,\n  PreparedMatch,\n  PreparedMatchRoute,\n  Route,\n  RouterMatchedRoute,\n  QuerySchema,\n  InferQuery,\n} from './types.js';\n\nimport type { FlatRoute } from './builder.js';\n\n/**\n * Finds the first route that matches the given location.\n * Iterates through all routes and returns the first match found.\n *\n * @template TParams - Route parameter types extracted from the URL path\n * @param routes - Array of flat routes to search through\n * @param location - Browser location object containing pathname to match\n * @returns The matched route with extracted parameters, or null if no match\n */\nexport function getMatchedRoute<TParams extends ParamData>(\n  routes: FlatRoute<TParams>[],\n  location: Location,\n): RouterMatchedRoute<TParams> | null {\n  for (const route of routes) {\n    const match = route.matchFunction(location.pathname);\n    if (match !== false) {\n      const { path, params } = match;\n      return {\n        match,\n        route,\n        path,\n        params,\n      };\n    }\n  }\n\n  return null;\n}\n\n/**\n * Prepares a matched route for rendering by loading components and executing prepare functions.\n * This function processes the route hierarchy and loads any required data or components.\n *\n * @template TParams - Route parameter types extracted from the URL path\n * @param match - The matched route to prepare, or null if no route matched\n * @returns Prepared match with loaded components and data ready for rendering\n */\nexport function prepareMatch<TParams extends ParamData>(\n  match: RouterMatchedRoute<TParams> | null,\n  query?: Record<string, unknown>,\n): PreparedMatch<TParams> {\n  // NOTE: Runtime retains a generic PreparedResult; type-level narrowing is achieved externally\n  // through the route union and PreparedAccess helpers. We intentionally avoid injecting\n  // generic parameters here to keep runtime lightweight while still enabling compile-time\n  // discrimination in userland via createRouter generics.\n  if (match == null) {\n    return {\n      match,\n      routes: [],\n    };\n  }\n\n  const matchedRoute = match.route;\n\n  const routes: PreparedMatchRoute[] = match.route.routes.map((route) => {\n    const { path, prepare, resourcePage, render } = route;\n\n    let Component: unknown;\n    let prepared: PrepareResult | undefined;\n\n    if (prepare != null) {\n      prepared = prepare({\n        match,\n        matchedRoute,\n        resourcePage,\n        // Fix Object.create(null) issue in path-to-regexp\n        variables: { ...match.params },\n        query: query ?? {},\n      });\n    }\n\n    if (resourcePage != null) {\n      Component = resourcePage.get();\n      if (Component == null) {\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        resourcePage.load(); // eagerly load\n      }\n    }\n    return {\n      path,\n      prepared,\n      redirectTo: matchedRoute.redirectTo ?? null,\n      render,\n      resourcePage,\n    };\n  });\n\n  return {\n    match,\n    routes,\n  };\n}\n\n/**\n * Type helper function for creating strongly-typed route definitions.\n * This function doesn't modify the route, it just provides TypeScript type inference.\n *\n * @template TPrepared - The type of prepared data returned by the route's prepare function\n * @template TVariables - Route parameter types extracted from the URL path\n * @param route - The route configuration to type\n * @returns The same route with proper TypeScript types\n *\n * @example\n * ```typescript\n * const userRoute = r<{ user: User }, { id: string }>({\n *   path: '/users/:id',\n *   prepare: ({ variables }) => fetchUser(variables.id),\n * });\n * ```\n */\n/**\n * Route helper with conditional query schema inference. If a `query` schema object is present,\n * the resulting route's third generic parameter is inferred from descriptor map; otherwise it\n * falls back to the provided generic (default Record<string,unknown>).\n */\nexport function r<\n  TPrepared extends PrepareResult = PrepareResult,\n  TVariables extends ParamData = ParamData,\n  TQuery extends Record<string, unknown> = Record<string, unknown>,\n  TSchema extends QuerySchema | undefined = undefined,\n>(\n  route: (TSchema extends QuerySchema\n    ? Omit<Route<TPrepared, TVariables, InferQuery<TSchema>>, 'query'> & {\n        query: TSchema;\n      }\n    : Route<TPrepared, TVariables, TQuery>) & { query?: TSchema },\n): Route<\n  TPrepared,\n  TVariables,\n  TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery\n> {\n  return route as unknown as Route<\n    TPrepared,\n    TVariables,\n    TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery\n  >;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdG9vbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBcUJBLE1BQU0sVUFBVSxlQUFlLENBQzdCLE1BQTRCLEVBQzVCLFFBQWtCO0lBRWxCLEtBQUssTUFBTSxLQUFLLElBQUksTUFBTSxFQUFFLENBQUM7UUFDM0IsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDckQsSUFBSSxLQUFLLEtBQUssS0FBSyxFQUFFLENBQUM7WUFDcEIsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUM7WUFDL0IsT0FBTztnQkFDTCxLQUFLO2dCQUNMLEtBQUs7Z0JBQ0wsSUFBSTtnQkFDSixNQUFNO2FBQ1AsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDO0FBVUQsTUFBTSxVQUFVLFlBQVksQ0FDMUIsS0FBeUMsRUFDekMsS0FBK0I7SUFNL0IsSUFBSSxLQUFLLElBQUksSUFBSSxFQUFFLENBQUM7UUFDbEIsT0FBTztZQUNMLEtBQUs7WUFDTCxNQUFNLEVBQUUsRUFBRTtTQUNYLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQztJQUVqQyxNQUFNLE1BQU0sR0FBeUIsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDcEUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQztRQUV0RCxJQUFJLFNBQWtCLENBQUM7UUFDdkIsSUFBSSxRQUFtQyxDQUFDO1FBRXhDLElBQUksT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3BCLFFBQVEsR0FBRyxPQUFPLENBQUM7Z0JBQ2pCLEtBQUs7Z0JBQ0wsWUFBWTtnQkFDWixZQUFZO2dCQUVaLFNBQVMsRUFBRSxFQUFFLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRTtnQkFDOUIsS0FBSyxFQUFFLEtBQUssSUFBSSxFQUFFO2FBQ25CLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxJQUFJLFlBQVksSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUN6QixTQUFTLEdBQUcsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQy9CLElBQUksU0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUV0QixZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDdEIsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPO1lBQ0wsSUFBSTtZQUNKLFFBQVE7WUFDUixVQUFVLEVBQUUsWUFBWSxDQUFDLFVBQVUsSUFBSSxJQUFJO1lBQzNDLE1BQU07WUFDTixZQUFZO1NBQ2IsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTztRQUNMLEtBQUs7UUFDTCxNQUFNO0tBQ1AsQ0FBQztBQUNKLENBQUM7QUF3QkQsTUFBTSxVQUFVLENBQUMsQ0FLZixLQUEyQztJQUUzQyxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFBhcmFtRGF0YSB9IGZyb20gJ3BhdGgtdG8tcmVnZXhwJztcblxuaW1wb3J0IHR5cGUge1xuICBQcmVwYXJlUmVzdWx0LFxuICBQcmVwYXJlZE1hdGNoLFxuICBQcmVwYXJlZE1hdGNoUm91dGUsXG4gIFJvdXRlLFxuICBSb3V0ZXJNYXRjaGVkUm91dGUsXG59IGZyb20gJy4vdHlwZXMuanMnO1xuXG5pbXBvcnQgdHlwZSB7IEZsYXRSb3V0ZSB9IGZyb20gJy4vYnVpbGRlci5qcyc7XG5cbi8qKlxuICogRmluZHMgdGhlIGZpcnN0IHJvdXRlIHRoYXQgbWF0Y2hlcyB0aGUgZ2l2ZW4gbG9jYXRpb24uXG4gKiBJdGVyYXRlcyB0aHJvdWdoIGFsbCByb3V0ZXMgYW5kIHJldHVybnMgdGhlIGZpcnN0IG1hdGNoIGZvdW5kLlxuICpcbiAqIEB0ZW1wbGF0ZSBUUGFyYW1zIC0gUm91dGUgcGFyYW1ldGVyIHR5cGVzIGV4dHJhY3RlZCBmcm9tIHRoZSBVUkwgcGF0aFxuICogQHBhcmFtIHJvdXRlcyAtIEFycmF5IG9mIGZsYXQgcm91dGVzIHRvIHNlYXJjaCB0aHJvdWdoXG4gKiBAcGFyYW0gbG9jYXRpb24gLSBCcm93c2VyIGxvY2F0aW9uIG9iamVjdCBjb250YWluaW5nIHBhdGhuYW1lIHRvIG1hdGNoXG4gKiBAcmV0dXJucyBUaGUgbWF0Y2hlZCByb3V0ZSB3aXRoIGV4dHJhY3RlZCBwYXJhbWV0ZXJzLCBvciBudWxsIGlmIG5vIG1hdGNoXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBnZXRNYXRjaGVkUm91dGU8VFBhcmFtcyBleHRlbmRzIFBhcmFtRGF0YT4oXG4gIHJvdXRlczogRmxhdFJvdXRlPFRQYXJhbXM+W10sXG4gIGxvY2F0aW9uOiBMb2NhdGlvbixcbik6IFJvdXRlck1hdGNoZWRSb3V0ZTxUUGFyYW1zPiB8IG51bGwge1xuICBmb3IgKGNvbnN0IHJvdXRlIG9mIHJvdXRlcykge1xuICAgIGNvbnN0IG1hdGNoID0gcm91dGUubWF0Y2hGdW5jdGlvbihsb2NhdGlvbi5wYXRobmFtZSk7XG4gICAgaWYgKG1hdGNoICE9PSBmYWxzZSkge1xuICAgICAgY29uc3QgeyBwYXRoLCBwYXJhbXMgfSA9IG1hdGNoO1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgbWF0Y2gsXG4gICAgICAgIHJvdXRlLFxuICAgICAgICBwYXRoLFxuICAgICAgICBwYXJhbXMsXG4gICAgICB9O1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBudWxsO1xufVxuXG4vKipcbiAqIFByZXBhcmVzIGEgbWF0Y2hlZCByb3V0ZSBmb3IgcmVuZGVyaW5nIGJ5IGxvYWRpbmcgY29tcG9uZW50cyBhbmQgZXhlY3V0aW5nIHByZXBhcmUgZnVuY3Rpb25zLlxuICogVGhpcyBmdW5jdGlvbiBwcm9jZXNzZXMgdGhlIHJvdXRlIGhpZXJhcmNoeSBhbmQgbG9hZHMgYW55IHJlcXVpcmVkIGRhdGEgb3IgY29tcG9uZW50cy5cbiAqXG4gKiBAdGVtcGxhdGUgVFBhcmFtcyAtIFJvdXRlIHBhcmFtZXRlciB0eXBlcyBleHRyYWN0ZWQgZnJvbSB0aGUgVVJMIHBhdGhcbiAqIEBwYXJhbSBtYXRjaCAtIFRoZSBtYXRjaGVkIHJvdXRlIHRvIHByZXBhcmUsIG9yIG51bGwgaWYgbm8gcm91dGUgbWF0Y2hlZFxuICogQHJldHVybnMgUHJlcGFyZWQgbWF0Y2ggd2l0aCBsb2FkZWQgY29tcG9uZW50cyBhbmQgZGF0YSByZWFkeSBmb3IgcmVuZGVyaW5nXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwcmVwYXJlTWF0Y2g8VFBhcmFtcyBleHRlbmRzIFBhcmFtRGF0YT4oXG4gIG1hdGNoOiBSb3V0ZXJNYXRjaGVkUm91dGU8VFBhcmFtcz4gfCBudWxsLFxuICBxdWVyeT86IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuKTogUHJlcGFyZWRNYXRjaDxUUGFyYW1zPiB7XG4gIC8vIE5PVEU6IFJ1bnRpbWUgcmV0YWlucyBhIGdlbmVyaWMgUHJlcGFyZWRSZXN1bHQ7IHR5cGUtbGV2ZWwgbmFycm93aW5nIGlzIGFjaGlldmVkIGV4dGVybmFsbHlcbiAgLy8gdGhyb3VnaCB0aGUgcm91dGUgdW5pb24gYW5kIFByZXBhcmVkQWNjZXNzIGhlbHBlcnMuIFdlIGludGVudGlvbmFsbHkgYXZvaWQgaW5qZWN0aW5nXG4gIC8vIGdlbmVyaWMgcGFyYW1ldGVycyBoZXJlIHRvIGtlZXAgcnVudGltZSBsaWdodHdlaWdodCB3aGlsZSBzdGlsbCBlbmFibGluZyBjb21waWxlLXRpbWVcbiAgLy8gZGlzY3JpbWluYXRpb24gaW4gdXNlcmxhbmQgdmlhIGNyZWF0ZVJvdXRlciBnZW5lcmljcy5cbiAgaWYgKG1hdGNoID09IG51bGwpIHtcbiAgICByZXR1cm4ge1xuICAgICAgbWF0Y2gsXG4gICAgICByb3V0ZXM6IFtdLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBtYXRjaGVkUm91dGUgPSBtYXRjaC5yb3V0ZTtcblxuICBjb25zdCByb3V0ZXM6IFByZXBhcmVkTWF0Y2hSb3V0ZVtdID0gbWF0Y2gucm91dGUucm91dGVzLm1hcCgocm91dGUpID0+IHtcbiAgICBjb25zdCB7IHBhdGgsIHByZXBhcmUsIHJlc291cmNlUGFnZSwgcmVuZGVyIH0gPSByb3V0ZTtcblxuICAgIGxldCBDb21wb25lbnQ6IHVua25vd247XG4gICAgbGV0IHByZXBhcmVkOiBQcmVwYXJlUmVzdWx0IHwgdW5kZWZpbmVkO1xuXG4gICAgaWYgKHByZXBhcmUgIT0gbnVsbCkge1xuICAgICAgcHJlcGFyZWQgPSBwcmVwYXJlKHtcbiAgICAgICAgbWF0Y2gsXG4gICAgICAgIG1hdGNoZWRSb3V0ZSxcbiAgICAgICAgcmVzb3VyY2VQYWdlLFxuICAgICAgICAvLyBGaXggT2JqZWN0LmNyZWF0ZShudWxsKSBpc3N1ZSBpbiBwYXRoLXRvLXJlZ2V4cFxuICAgICAgICB2YXJpYWJsZXM6IHsgLi4ubWF0Y2gucGFyYW1zIH0sXG4gICAgICAgIHF1ZXJ5OiBxdWVyeSA/PyB7fSxcbiAgICAgIH0pO1xuICAgIH1cblxuICAgIGlmIChyZXNvdXJjZVBhZ2UgIT0gbnVsbCkge1xuICAgICAgQ29tcG9uZW50ID0gcmVzb3VyY2VQYWdlLmdldCgpO1xuICAgICAgaWYgKENvbXBvbmVudCA9PSBudWxsKSB7XG4gICAgICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZmxvYXRpbmctcHJvbWlzZXNcbiAgICAgICAgcmVzb3VyY2VQYWdlLmxvYWQoKTsgLy8gZWFnZXJseSBsb2FkXG4gICAgICB9XG4gICAgfVxuICAgIHJldHVybiB7XG4gICAgICBwYXRoLFxuICAgICAgcHJlcGFyZWQsXG4gICAgICByZWRpcmVjdFRvOiBtYXRjaGVkUm91dGUucmVkaXJlY3RUbyA/PyBudWxsLFxuICAgICAgcmVuZGVyLFxuICAgICAgcmVzb3VyY2VQYWdlLFxuICAgIH07XG4gIH0pO1xuXG4gIHJldHVybiB7XG4gICAgbWF0Y2gsXG4gICAgcm91dGVzLFxuICB9O1xufVxuXG4vKipcbiAqIFR5cGUgaGVscGVyIGZ1bmN0aW9uIGZvciBjcmVhdGluZyBzdHJvbmdseS10eXBlZCByb3V0ZSBkZWZpbml0aW9ucy5cbiAqIFRoaXMgZnVuY3Rpb24gZG9lc24ndCBtb2RpZnkgdGhlIHJvdXRlLCBpdCBqdXN0IHByb3ZpZGVzIFR5cGVTY3JpcHQgdHlwZSBpbmZlcmVuY2UuXG4gKlxuICogQHRlbXBsYXRlIFRQcmVwYXJlZCAtIFRoZSB0eXBlIG9mIHByZXBhcmVkIGRhdGEgcmV0dXJuZWQgYnkgdGhlIHJvdXRlJ3MgcHJlcGFyZSBmdW5jdGlvblxuICogQHRlbXBsYXRlIFRWYXJpYWJsZXMgLSBSb3V0ZSBwYXJhbWV0ZXIgdHlwZXMgZXh0cmFjdGVkIGZyb20gdGhlIFVSTCBwYXRoXG4gKiBAcGFyYW0gcm91dGUgLSBUaGUgcm91dGUgY29uZmlndXJhdGlvbiB0byB0eXBlXG4gKiBAcmV0dXJucyBUaGUgc2FtZSByb3V0ZSB3aXRoIHByb3BlciBUeXBlU2NyaXB0IHR5cGVzXG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGNvbnN0IHVzZXJSb3V0ZSA9IHI8eyB1c2VyOiBVc2VyIH0sIHsgaWQ6IHN0cmluZyB9Pih7XG4gKiAgIHBhdGg6ICcvdXNlcnMvOmlkJyxcbiAqICAgcHJlcGFyZTogKHsgdmFyaWFibGVzIH0pID0+IGZldGNoVXNlcih2YXJpYWJsZXMuaWQpLFxuICogfSk7XG4gKiBgYGBcbiAqL1xuLyoqXG4gKiBSb3V0ZSBoZWxwZXIgd2l0aCBjb25kaXRpb25hbCBxdWVyeSBzY2hlbWEgaW5mZXJlbmNlLiBJZiBhIGBxdWVyeWAgc2NoZW1hIG9iamVjdCBpcyBwcmVzZW50LFxuICogdGhlIHJlc3VsdGluZyByb3V0ZSdzIHRoaXJkIGdlbmVyaWMgcGFyYW1ldGVyIGlzIGluZmVycmVkIGZyb20gZGVzY3JpcHRvciBtYXA7IG90aGVyd2lzZSBpdFxuICogZmFsbHMgYmFjayB0byB0aGUgcHJvdmlkZWQgZ2VuZXJpYyAoZGVmYXVsdCBSZWNvcmQ8c3RyaW5nLHVua25vd24+KS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHI8XG4gIFRQcmVwYXJlZCBleHRlbmRzIFByZXBhcmVSZXN1bHQgPSBQcmVwYXJlUmVzdWx0LFxuICBUVmFyaWFibGVzIGV4dGVuZHMgUGFyYW1EYXRhID0gUGFyYW1EYXRhLFxuICBUUXVlcnkgZXh0ZW5kcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuPihcbiAgcm91dGU6IFJvdXRlPFRQcmVwYXJlZCwgVFZhcmlhYmxlcywgVFF1ZXJ5Pixcbik6IFJvdXRlPFRQcmVwYXJlZCwgVFZhcmlhYmxlcywgVFF1ZXJ5PiB7XG4gIHJldHVybiByb3V0ZTtcbn1cbiJdfQ==

package/lib/esm/type-tests/query-infer.test-d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-infer.test-d.d.ts","sourceRoot":"","sources":["../../../src/type-tests/query-infer.test-d.ts"],"names":[],"mappings":"AAiEA,OAAO,EAAE,CAAC"}
+{"version":3,"file":"query-infer.test-d.d.ts","sourceRoot":"","sources":["../../../src/type-tests/query-infer.test-d.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC"}

package/lib/esm/type-tests/query-infer.test-d.js

@@ -1,49 +1,2 @@
-import { q, parseTypedQuery } from '../tools/query-dsl.js';
-const schema1 = {
-    page: q.default(q.number(), 1),
-    tag: q.array(q.string()),
-    mode: q.optional(q.enum('list', 'grid')),
-    flag: q.optional(q.boolean()),
-    raw: q.string(),
-};
-const parsed1 = parseTypedQuery(schema1, {
-    page: '2',
-    tag: ['a', 'b'],
-    mode: 'list',
-    flag: '1',
-    raw: 'x',
-});
-_consume(parsed1);
-expectType(parsed1.page);
-expectType(parsed1.tag);
-expectType(parsed1.mode);
-expectType(parsed1.flag);
-expectType(parsed1.raw);
-expectType(parsed1.page);
-expectType(parsed1.tag);
-const schema2 = { a: q.default(q.optional(q.number()), 5) };
-const parsed2 = parseTypedQuery(schema2, {});
-expectType(parsed2.a);
-expectType(parsed2.a);
-const schema3 = { tags: q.array(q.string()) };
-const parsed3 = parseTypedQuery(schema3, {});
-expectType(parsed3.tags);
-expectType(parsed3.tags);
-parsed1.page;
-parsed2.a;
-parsed3.tags.length;
-const routeWithQuery = {
-    path: '/x/:id',
-    query: { page: q.number() },
-    prepare: ({ variables, query }) => ({
-        value: Number(variables.id) + query.page,
-    }),
-};
-routeWithQuery.prepare?.({
-    match: undefined,
-    matchedRoute: undefined,
-    resourcePage: undefined,
-    variables: { id: '1' },
-    query: { page: 2 },
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktaW5mZXIudGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGUtdGVzdHMvcXVlcnktaW5mZXIudGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxDQUFDLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFNM0QsTUFBTSxPQUFPLEdBQUc7SUFDZCxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzlCLEdBQUcsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUN4QixJQUFJLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN4QyxJQUFJLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0IsR0FBRyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDUCxDQUFDO0FBS1gsTUFBTSxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sRUFBRTtJQUN2QyxJQUFJLEVBQUUsR0FBRztJQUNULEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUM7SUFDZixJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxHQUFHO0lBQ1QsR0FBRyxFQUFFLEdBQUc7Q0FDVCxDQUFDLENBQUM7QUFHSCxRQUFRLENBQTZCLE9BQU8sQ0FBQyxDQUFDO0FBRTlDLFVBQVUsQ0FBUyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDakMsVUFBVSxDQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNsQyxVQUFVLENBQThCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUN0RCxVQUFVLENBQXNCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUM5QyxVQUFVLENBQVMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBR2hDLFVBQVUsQ0FBUyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFakMsVUFBVSxDQUFTLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUtoQyxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQVcsQ0FBQztBQUNyRSxNQUFNLE9BQU8sR0FBRyxlQUFlLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBRTdDLFVBQVUsQ0FBcUIsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRTFDLFVBQVUsQ0FBUyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFHOUIsTUFBTSxPQUFPLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBVyxDQUFDO0FBQ3ZELE1BQU0sT0FBTyxHQUFHLGVBQWUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDN0MsVUFBVSxDQUFXLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUVuQyxVQUFVLENBQVMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBR2pDLE9BQU8sQ0FBQyxJQUFJLENBQUM7QUFDYixPQUFPLENBQUMsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7QUFVcEIsTUFBTSxjQUFjLEdBQTZCO0lBQy9DLElBQUksRUFBRSxRQUFRO0lBQ2QsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtJQUMzQixPQUFPLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNsQyxLQUFLLEVBQUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsSUFBSTtLQUN6QyxDQUFDO0NBQ0gsQ0FBQztBQUVGLGNBQWMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUV2QixLQUFLLEVBQUUsU0FBUztJQUVoQixZQUFZLEVBQUUsU0FBZ0I7SUFDOUIsWUFBWSxFQUFFLFNBQVM7SUFDdkIsU0FBUyxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRTtJQUN0QixLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFO0NBQ25CLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlICovXG4vLyBUeXBlIEluZmVyZW5jZSBUZXN0cyBmb3IgUGx1bWlsZSBSb3V0ZXIgUXVlcnkgRFNMXG4vLyBUaGVzZSBhc3NlcnRpb25zIHJlbHkgb24gVHlwZVNjcmlwdCBjb21waWxlLXRpbWUgY2hlY2tpbmcuXG5cbmltcG9ydCB7IHEsIHBhcnNlVHlwZWRRdWVyeSB9IGZyb20gJy4uL3Rvb2xzL3F1ZXJ5LWRzbC5qcyc7XG5pbXBvcnQgdHlwZSB7IEluZmVyUXVlcnksIFJvdXRlIH0gZnJvbSAnLi4vdHlwZXMuanMnO1xuXG5kZWNsYXJlIGZ1bmN0aW9uIGV4cGVjdFR5cGU8VD4oX3ZhbHVlOiBUKTogdm9pZDtcblxuLy8gU2NoZW1hIDFcbmNvbnN0IHNjaGVtYTEgPSB7XG4gIHBhZ2U6IHEuZGVmYXVsdChxLm51bWJlcigpLCAxKSxcbiAgdGFnOiBxLmFycmF5KHEuc3RyaW5nKCkpLFxuICBtb2RlOiBxLm9wdGlvbmFsKHEuZW51bSgnbGlzdCcsICdncmlkJykpLFxuICBmbGFnOiBxLm9wdGlvbmFsKHEuYm9vbGVhbigpKSxcbiAgcmF3OiBxLnN0cmluZygpLFxufSBhcyBjb25zdDtcblxuLy8gSGVscGVyIHRvIGNvbnN1bWUgdHlwZXMgbGF0ZXJcbmRlY2xhcmUgZnVuY3Rpb24gX2NvbnN1bWU8VD4oX3Y6IFQpOiB2b2lkO1xuXG5jb25zdCBwYXJzZWQxID0gcGFyc2VUeXBlZFF1ZXJ5KHNjaGVtYTEsIHtcbiAgcGFnZTogJzInLFxuICB0YWc6IFsnYScsICdiJ10sXG4gIG1vZGU6ICdsaXN0JyxcbiAgZmxhZzogJzEnLFxuICByYXc6ICd4Jyxcbn0pO1xuXG4vLyBDb25zdW1lIGluZmVycmVkIHR5cGUgKGFmdGVyIGRlZmluaXRpb24gdG8gYXZvaWQgdGVtcG9yYWwgZGVhZCB6b25lIGlzc3Vlcylcbl9jb25zdW1lPEluZmVyUXVlcnk8dHlwZW9mIHNjaGVtYTE+PihwYXJzZWQxKTtcblxuZXhwZWN0VHlwZTxudW1iZXI+KHBhcnNlZDEucGFnZSk7XG5leHBlY3RUeXBlPHN0cmluZ1tdPihwYXJzZWQxLnRhZyk7XG5leHBlY3RUeXBlPCdsaXN0JyB8ICdncmlkJyB8IHVuZGVmaW5lZD4ocGFyc2VkMS5tb2RlKTtcbmV4cGVjdFR5cGU8Ym9vbGVhbiB8IHVuZGVmaW5lZD4ocGFyc2VkMS5mbGFnKTtcbmV4cGVjdFR5cGU8c3RyaW5nPihwYXJzZWQxLnJhdyk7XG5cbi8vIEB0cy1leHBlY3QtZXJyb3IgcGFnZSBpcyBudW1iZXJcbmV4cGVjdFR5cGU8c3RyaW5nPihwYXJzZWQxLnBhZ2UpO1xuLy8gQHRzLWV4cGVjdC1lcnJvciB0YWcgaXMgc3RyaW5nW11cbmV4cGVjdFR5cGU8c3RyaW5nPihwYXJzZWQxLnRhZyk7XG4vLyBSZW1vdmUgaW5jb3JyZWN0IGV4cGVjdGF0aW9uOiByYXcgaXMgcmVxdWlyZWQgc3RyaW5nOyBhc3NlcnRpbmcgYnJvYWRlciB0eXBlIHNob3VsZCBlcnJvci5cbi8vIChyYXcgbmVnYXRpdmUgdGVzdCBvbWl0dGVkOiB3aWRlbmluZyB0byBzdHJpbmcgfCB1bmRlZmluZWQgd291bGQgbm90IGVycm9yIGluIFRTKVxuXG4vLyBTY2hlbWEgMiAob3B0aW9uYWwgKyBkZWZhdWx0KVxuY29uc3Qgc2NoZW1hMiA9IHsgYTogcS5kZWZhdWx0KHEub3B0aW9uYWwocS5udW1iZXIoKSksIDUpIH0gYXMgY29uc3Q7XG5jb25zdCBwYXJzZWQyID0gcGFyc2VUeXBlZFF1ZXJ5KHNjaGVtYTIsIHt9KTtcbi8vIEN1cnJlbnQgSW5mZXJRdWVyeSBrZWVwcyBvcHRpb25hbCBmbGFnIGV2ZW4gd2l0aCBkZWZhdWx0ID0+IG51bWJlciB8IHVuZGVmaW5lZFxuZXhwZWN0VHlwZTxudW1iZXIgfCB1bmRlZmluZWQ+KHBhcnNlZDIuYSk7XG4vLyBAdHMtZXhwZWN0LWVycm9yIGEgaXMgbm90IGEgc3RyaW5nXG5leHBlY3RUeXBlPHN0cmluZz4ocGFyc2VkMi5hKTtcblxuLy8gU2NoZW1hIDMgYXJyYXkgb25seVxuY29uc3Qgc2NoZW1hMyA9IHsgdGFnczogcS5hcnJheShxLnN0cmluZygpKSB9IGFzIGNvbnN0O1xuY29uc3QgcGFyc2VkMyA9IHBhcnNlVHlwZWRRdWVyeShzY2hlbWEzLCB7fSk7XG5leHBlY3RUeXBlPHN0cmluZ1tdPihwYXJzZWQzLnRhZ3MpO1xuLy8gQHRzLWV4cGVjdC1lcnJvciB0YWdzIGlzIHN0cmluZ1tdXG5leHBlY3RUeXBlPHN0cmluZz4ocGFyc2VkMy50YWdzKTtcblxuLy8gVXNlIGluZmVycmVkIHR5cGVzIHRvIGF2b2lkIHVudXNlZCB3YXJuaW5nc1xucGFyc2VkMS5wYWdlO1xucGFyc2VkMi5hO1xucGFyc2VkMy50YWdzLmxlbmd0aDtcblxuZXhwb3J0IHt9O1xuXG4vLyBSb3V0ZSBnZW5lcmljIHdpdGggZXhwbGljaXQgVFF1ZXJ5XG5pbnRlcmZhY2UgUHJlcERhdGEge1xuICB2YWx1ZTogbnVtYmVyO1xufVxudHlwZSBWYXJzID0geyBpZDogc3RyaW5nOyBbazogc3RyaW5nXTogc3RyaW5nIH07XG50eXBlIFEgPSB7IHBhZ2U6IG51bWJlciB9O1xuY29uc3Qgcm91dGVXaXRoUXVlcnk6IFJvdXRlPFByZXBEYXRhLCBWYXJzLCBRPiA9IHtcbiAgcGF0aDogJy94LzppZCcsXG4gIHF1ZXJ5OiB7IHBhZ2U6IHEubnVtYmVyKCkgfSxcbiAgcHJlcGFyZTogKHsgdmFyaWFibGVzLCBxdWVyeSB9KSA9PiAoe1xuICAgIHZhbHVlOiBOdW1iZXIodmFyaWFibGVzLmlkKSArIHF1ZXJ5LnBhZ2UsXG4gIH0pLFxufTtcbi8vIEVuc3VyZSBwcmVwYXJlIHJlY2VpdmVzIGNvcnJlY3QgdHlwZXNcbnJvdXRlV2l0aFF1ZXJ5LnByZXBhcmU/Lih7XG4gIC8vIEB0cy1leHBlY3QtZXJyb3IgbWF0Y2ggbWlzc2luZ1xuICBtYXRjaDogdW5kZWZpbmVkLFxuICAvLyBtaW5pbWFsIGNhc3QgZm9yIHJlcXVpcmVkIGZpZWxkcyBpbiB0aGlzIGlzb2xhdGVkIHRlc3QgY29udGV4dFxuICBtYXRjaGVkUm91dGU6IHVuZGVmaW5lZCBhcyBhbnksXG4gIHJlc291cmNlUGFnZTogdW5kZWZpbmVkLFxuICB2YXJpYWJsZXM6IHsgaWQ6ICcxJyB9LFxuICBxdWVyeTogeyBwYWdlOiAyIH0sXG59KTtcbiJdfQ==
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktaW5mZXIudGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGUtdGVzdHMvcXVlcnktaW5mZXIudGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBMZWdhY3kgcXVlcnkgRFNMIHR5cGUgaW5mZXJlbmNlIHRlc3QgcmVtb3ZlZC5cbi8vIEludGVudGlvbmFsIGVtcHR5IGZpbGUgdG8gc2F0aXNmeSB0c2J1aWxkIHdpdGhvdXQgbGVnYWN5IHN5bWJvbHMuXG5leHBvcnQge307XG4iXX0=

package/lib/esm/type-tests/routes-inference.test-d.d.ts

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=routes-inference.test-d.d.ts.map

package/lib/esm/type-tests/routes-inference.test-d.js

@@ -1,49 +1,2 @@
-import { r, q, createRouter } from '../index.js';
-const schema = { page: q.number() };
-const plansRoute = r({
-    path: '/plans',
-    query: schema,
-    prepare: () => {
-        return { plansLoaded: true };
-    },
-});
-const userRoute = r({
-    path: '/users/:id',
-    prepare: ({ variables }) => {
-        return { userId: variables.id };
-    },
-});
-const searchRoute = r({
-    path: '/search',
-    query: { q: q.string() },
-    prepare: ({ query }) => {
-        return { term: query.q };
-    },
-});
-const { context } = createRouter([plansRoute, userRoute, searchRoute]);
-const entry = context.get();
-function __consume(_v) {
-}
-if (entry.route?.path === '/plans') {
-    const typed = entry.typedQuery;
-    if (typed != null) {
-        __consume(typed.page);
-    }
-}
-if (entry.route?.path === '/users/:id') {
-    const prepared = entry.preparedMatch.routes.find((r) => {
-        return r.path === '/users/:id';
-    })?.prepared;
-    if (prepared != null) {
-        __consume(prepared.userId);
-    }
-}
-if (entry.route?.path === '/search') {
-    const p = entry.preparedMatch.routes.find((r) => {
-        return r.path === '/search';
-    })?.prepared;
-    if (p != null) {
-        __consume(p.term);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVzLWluZmVyZW5jZS50ZXN0LWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZS10ZXN0cy9yb3V0ZXMtaW5mZXJlbmNlLnRlc3QtZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxZQUFZLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHakQsTUFBTSxNQUFNLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFXLENBQUM7QUFFN0MsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLElBQUksRUFBRSxRQUFRO0lBQ2QsS0FBSyxFQUFFLE1BQU07SUFDYixPQUFPLEVBQUUsR0FBRyxFQUFFO1FBQ1osT0FBTyxFQUFFLFdBQVcsRUFBRSxJQUFhLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFxQztJQUN0RCxJQUFJLEVBQUUsWUFBWTtJQUNsQixPQUFPLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUU7UUFDekIsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDbEMsQ0FBQztDQUNGLENBQUMsQ0FBQztBQUVILE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBQztJQUNwQixJQUFJLEVBQUUsU0FBUztJQUNmLEtBQUssRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQVc7SUFDakMsT0FBTyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1FBQ3JCLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQzNCLENBQUM7Q0FDRixDQUFDLENBQUM7QUFFSCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsWUFBWSxDQUFDLENBQUMsVUFBVSxFQUFFLFNBQVMsRUFBRSxXQUFXLENBQVUsQ0FBQyxDQUFDO0FBR2hGLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUc1QixTQUFTLFNBQVMsQ0FBSSxFQUFLO0FBRTNCLENBQUM7QUFDRCxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUUsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO0lBQ25DLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxVQUEyQyxDQUFDO0lBQ2hFLElBQUksS0FBSyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2xCLFNBQVMsQ0FBcUIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7QUFDSCxDQUFDO0FBQ0QsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksS0FBSyxZQUFZLEVBQUUsQ0FBQztJQUN2QyxNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNyRCxPQUFPLENBQUMsQ0FBQyxJQUFJLEtBQUssWUFBWSxDQUFDO0lBQ2pDLENBQUMsQ0FBQyxFQUFFLFFBQTBDLENBQUM7SUFDL0MsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFLENBQUM7UUFDckIsU0FBUyxDQUFTLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNyQyxDQUFDO0FBQ0gsQ0FBQztBQUNELElBQUksS0FBSyxDQUFDLEtBQUssRUFBRSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7SUFDcEMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDOUMsT0FBTyxDQUFDLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQztJQUM5QixDQUFDLENBQUMsRUFBRSxRQUFvRCxDQUFDO0lBQ3pELElBQUksQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2QsU0FBUyxDQUFxQixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEMsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByLCBxLCBjcmVhdGVSb3V0ZXIgfSBmcm9tICcuLi9pbmRleC5qcyc7XG5cbi8vIEJhc2ljIHF1ZXJ5IHNjaGVtYVxuY29uc3Qgc2NoZW1hID0geyBwYWdlOiBxLm51bWJlcigpIH0gYXMgY29uc3Q7XG5cbmNvbnN0IHBsYW5zUm91dGUgPSByKHtcbiAgcGF0aDogJy9wbGFucycsXG4gIHF1ZXJ5OiBzY2hlbWEsXG4gIHByZXBhcmU6ICgpID0+IHtcbiAgICByZXR1cm4geyBwbGFuc0xvYWRlZDogdHJ1ZSBhcyBjb25zdCB9O1xuICB9LFxufSk7XG5cbmNvbnN0IHVzZXJSb3V0ZSA9IHI8eyB1c2VySWQ6IHN0cmluZyB9LCB7IGlkOiBzdHJpbmcgfT4oe1xuICBwYXRoOiAnL3VzZXJzLzppZCcsXG4gIHByZXBhcmU6ICh7IHZhcmlhYmxlcyB9KSA9PiB7XG4gICAgcmV0dXJuIHsgdXNlcklkOiB2YXJpYWJsZXMuaWQgfTtcbiAgfSxcbn0pO1xuXG5jb25zdCBzZWFyY2hSb3V0ZSA9IHIoe1xuICBwYXRoOiAnL3NlYXJjaCcsXG4gIHF1ZXJ5OiB7IHE6IHEuc3RyaW5nKCkgfSBhcyBjb25zdCxcbiAgcHJlcGFyZTogKHsgcXVlcnkgfSkgPT4ge1xuICAgIHJldHVybiB7IHRlcm06IHF1ZXJ5LnEgfTtcbiAgfSxcbn0pO1xuXG5jb25zdCB7IGNvbnRleHQgfSA9IGNyZWF0ZVJvdXRlcihbcGxhbnNSb3V0ZSwgdXNlclJvdXRlLCBzZWFyY2hSb3V0ZV0gYXMgY29uc3QpO1xuXG4vLyBOYXJyb3dpbmcgdGVzdHMgKGNvbXBpbGUtdGltZSBvbmx5KVxuY29uc3QgZW50cnkgPSBjb250ZXh0LmdldCgpO1xuLyoqIE5vLW9wIHNpbmsgdG8gZm9yY2UgdHlwZSBldmFsdWF0aW9uIHdpdGhvdXQgcnVudGltZSB1c2FnZSAqL1xuLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby11bnVzZWQtdmFyc1xuZnVuY3Rpb24gX19jb25zdW1lPFQ+KF92OiBUKTogdm9pZCB7XG4gIC8qIG5vb3AgKi9cbn1cbmlmIChlbnRyeS5yb3V0ZT8ucGF0aCA9PT0gJy9wbGFucycpIHtcbiAgY29uc3QgdHlwZWQgPSBlbnRyeS50eXBlZFF1ZXJ5IGFzIHsgcGFnZT86IG51bWJlciB9IHwgdW5kZWZpbmVkO1xuICBpZiAodHlwZWQgIT0gbnVsbCkge1xuICAgIF9fY29uc3VtZTxudW1iZXIgfCB1bmRlZmluZWQ+KHR5cGVkLnBhZ2UpO1xuICB9XG59XG5pZiAoZW50cnkucm91dGU/LnBhdGggPT09ICcvdXNlcnMvOmlkJykge1xuICBjb25zdCBwcmVwYXJlZCA9IGVudHJ5LnByZXBhcmVkTWF0Y2gucm91dGVzLmZpbmQoKHIpID0+IHtcbiAgICByZXR1cm4gci5wYXRoID09PSAnL3VzZXJzLzppZCc7XG4gIH0pPy5wcmVwYXJlZCBhcyB7IHVzZXJJZDogc3RyaW5nIH0gfCB1bmRlZmluZWQ7XG4gIGlmIChwcmVwYXJlZCAhPSBudWxsKSB7XG4gICAgX19jb25zdW1lPHN0cmluZz4ocHJlcGFyZWQudXNlcklkKTtcbiAgfVxufVxuaWYgKGVudHJ5LnJvdXRlPy5wYXRoID09PSAnL3NlYXJjaCcpIHtcbiAgY29uc3QgcCA9IGVudHJ5LnByZXBhcmVkTWF0Y2gucm91dGVzLmZpbmQoKHIpID0+IHtcbiAgICByZXR1cm4gci5wYXRoID09PSAnL3NlYXJjaCc7XG4gIH0pPy5wcmVwYXJlZCBhcyB7IHRlcm06IHN0cmluZyB8IHVuZGVmaW5lZCB9IHwgdW5kZWZpbmVkO1xuICBpZiAocCAhPSBudWxsKSB7XG4gICAgX19jb25zdW1lPHN0cmluZyB8IHVuZGVmaW5lZD4ocC50ZXJtKTtcbiAgfVxufVxuIl19
+"use strict";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVzLWluZmVyZW5jZS50ZXN0LWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZS10ZXN0cy9yb3V0ZXMtaW5mZXJlbmNlLnRlc3QtZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLyoqIFBsYWNlaG9sZGVyIGxlZ2FjeSB0eXBlIHRlc3QgcmVtb3ZlZCAoUXVlcnlTY2hlbWEgRFNMIGRlcHJlY2F0ZWQpLiAqL1xuIl19

package/lib/esm/types.d.ts

@@ -45,21 +45,9 @@ export type RouteEntry<TVariables extends ParamData> = {
     forceRerender: boolean;
     rawSearch?: string;
     query: Record<string, string | string[]>;
-    typedQuery?: Record<string, unknown>;
     filters?: Record<string, unknown>;
     filterDiagnostics?: FilterDiagnostic[];
-};
-export type QueryDescriptor<T> = {
-    __type: T;
-    parse: (values: string[]) => T | undefined;
-    serialize: (value: T) => string[];
-    optional?: boolean;
-    hasDefault?: boolean;
-    defaultValue?: T;
-};
-export type QuerySchema = Record<string, QueryDescriptor<any>>;
-export type InferQuery<S extends QuerySchema> = {
-    [K in keyof S]: S[K] extends QueryDescriptor<infer O> ? S[K]['optional'] extends true ? S[K]['hasDefault'] extends true ? O : O | undefined : O : never;
+    activeQuerySchema?: FilterSchema;
 };
 export type RouterRedirectStatus = 301 | 302;
 export type MatchedRoute<TVariables extends ParamData> = {
@@ -86,8 +74,7 @@ export type Route<TPrepared extends PrepareResult, TVariables extends ParamData
     path?: string;
     prepare?: RoutePrepare<TPrepared, TVariables, TQueryShape>;
     render?: RouteRender<TPrepared, TVariables, TQueryShape>;
-    query?: QuerySchema;
-    filterSchema?: FilterSchema;
+    querySchema?: FilterSchema;
 };
 export type RouteComponentProps<TVariables extends ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
     children: ReactElement;
@@ -134,7 +121,6 @@ export type QueryShapeMap<Routes extends readonly AnyRoute[]> = {
 };
 export interface PreparedAccess<Routes extends readonly AnyRoute[]> {
     getPrepared: <P extends PathsOf<Routes>>(path: P) => PreparedMap<Routes>[P];
-    getTypedQuery: <P extends PathsOf<Routes>>(path: P) => QueryShapeMap<Routes>[P] | undefined;
 }
 export type NavigateInputForPath<Routes extends readonly AnyRoute[], P extends PathsOf<Routes>> = {
     pathname: P;