refactor: correct export

diff --git a/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.spec.ts b/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.spec.ts
index ed1dc7d32addb9fa05fdc560a4aa48bf08913892..582580c7cda9e9f1dbc49da5c946f55f9a28f599 100644 (file)
--- a/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.spec.ts
+++ b/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.spec.ts
@@ -5,7 +5,7 @@ import {
 } from './matcher-pattern'
 import { MatcherPatternPathStar } from './matcher-pattern-path-star'
 import { miss } from './errors'
-import { definePathParamParser } from './param-parsers/types'
+import { definePathParamParser } from './param-parsers'
 
 describe('MatcherPatternPathStatic', () => {
   describe('match()', () => {

diff --git a/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.test-d.ts b/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.test-d.ts
index 42df251a83e3bad2002f0c2b4cdddcb816216aa7..4450910979c3a920ba5ce2994a31be8de3e44264 100644 (file)
--- a/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.test-d.ts
+++ b/packages/router/src/experimental/route-resolver/matchers/matcher-pattern.test-d.ts
@@ -2,7 +2,7 @@ import { describe, expectTypeOf, it } from 'vitest'
 import { MatcherPatternPathDynamic } from './matcher-pattern'
 import { PATH_PARAM_PARSER_DEFAULTS } from './param-parsers'
 import { PATH_PARAM_SINGLE_DEFAULT } from './param-parsers'
-import { definePathParamParser } from './param-parsers/types'
+import { definePathParamParser } from './param-parsers'
 
 describe('MatcherPatternPathDynamic', () => {
   it('can be generic', () => {

diff --git a/packages/router/src/experimental/route-resolver/matchers/param-parsers/index.ts b/packages/router/src/experimental/route-resolver/matchers/param-parsers/index.ts
index c57f67b942a7863f3e39a45db3a5ba3ccf338aca..e8beef88a289233bc661ea418343f69e7ccba4bf 100644 (file)
--- a/packages/router/src/experimental/route-resolver/matchers/param-parsers/index.ts
+++ b/packages/router/src/experimental/route-resolver/matchers/param-parsers/index.ts
@@ -1,10 +1,8 @@
+import type { MatcherQueryParamsValue } from '../matcher-pattern'
 import type { ParamParser } from './types'
 
-export {
-  definePathParamParser,
-  defineParamParser,
-  defineQueryParamParser,
-} from './types'
+export { PARAM_PARSER_BOOL } from './booleans'
+export { PARAM_PARSER_INT } from './integers'
 
 export const PATH_PARAM_SINGLE_DEFAULT: ParamParser<string, string> = {}
 
@@ -34,5 +32,53 @@ export const PATH_PARAM_PARSER_DEFAULTS = {
 
 export type { ParamParser }
 
-export { PARAM_PARSER_INT } from './integers'
-export { PARAM_PARSER_BOOL } from './booleans'
+/**
+ * Defines a path param parser.
+ *
+ * @param parser - the parser to define. Will be returned as is.
+ *
+ * @see {@link defineQueryParamParser}
+ * @see {@link defineParamParser}
+ */
+/*! #__NO_SIDE_EFFECTS__ */
+
+export function definePathParamParser<
+  TParam,
+  // path params are parsed by the router as these
+  // we use extend to allow infering a more specific type
+  TUrlParam extends string | string[] | null,
+  // we can allow pushing with extra values
+  TParamRaw,
+>(parser: Required<ParamParser<TParam, TUrlParam, TParamRaw>>) {
+  return parser
+}
+
+/**
+ * Defines a query param parser. Note that query params can also be used as
+ * path param parsers.
+ *
+ * @param parser - the parser to define. Will be returned as is.
+ *
+ * @see {@link definePathParamParser}
+ * @see {@link defineParamParser}
+ */
+/*! #__NO_SIDE_EFFECTS__ */
+
+export function defineQueryParamParser<
+  TParam,
+  // we can allow pushing with extra values
+  TParamRaw = TParam,
+>(parser: Required<ParamParser<TParam, MatcherQueryParamsValue, TParamRaw>>) {
+  return parser
+}
+
+/**
+ * Alias for {@link defineQueryParamParser}. Implementing a param parser like this
+ * works for path, query, and hash params.
+ *
+ * @see {@link defineQueryParamParser}
+ * @see {@link definePathParamParser}
+ */
+/*! #__NO_SIDE_EFFECTS__ */
+
+export const defineParamParser = defineQueryParamParser

diff --git a/packages/router/src/experimental/route-resolver/matchers/param-parsers/types.ts b/packages/router/src/experimental/route-resolver/matchers/param-parsers/types.ts
index 0c051d2bb878fe2b1954c243d41f661743451ff2..b7337bdc73203727f6a6d8554553b047bb2191bc 100644 (file)
--- a/packages/router/src/experimental/route-resolver/matchers/param-parsers/types.ts
+++ b/packages/router/src/experimental/route-resolver/matchers/param-parsers/types.ts
@@ -1,4 +1,4 @@
-import { MatcherQueryParamsValue } from '../matcher-pattern'
+import type { MatcherQueryParamsValue } from '../matcher-pattern'
 
 /**
  * Defines a parser that can read a param from the url (string-based) and
@@ -20,54 +20,6 @@ export interface ParamParser<
   set?: (value: TParamRaw) => TUrlParam
 }
 
-/**
- * Defines a path param parser.
- *
- * @param parser - the parser to define. Will be returned as is.
- *
- * @see {@link defineQueryParamParser}
- * @see {@link defineParamParser}
- */
-/*! #__NO_SIDE_EFFECTS__ */
-export function definePathParamParser<
-  TParam,
-  // path params are parsed by the router as these
-  // we use extend to allow infering a more specific type
-  TUrlParam extends string | string[] | null,
-  // we can allow pushing with extra values
-  TParamRaw,
->(parser: Required<ParamParser<TParam, TUrlParam, TParamRaw>>) {
-  return parser
-}
-
-/**
- * Defines a query param parser. Note that query params can also be used as
- * path param parsers.
- *
- * @param parser - the parser to define. Will be returned as is.
- *
- * @see {@link definePathParamParser}
- * @see {@link defineParamParser}
- */
-/*! #__NO_SIDE_EFFECTS__ */
-export function defineQueryParamParser<
-  TParam,
-  // we can allow pushing with extra values
-  TParamRaw = TParam,
->(parser: Required<ParamParser<TParam, MatcherQueryParamsValue, TParamRaw>>) {
-  return parser
-}
-
-/**
- * Alias for {@link defineQueryParamParser}. Implementing a param parser like this
- * works for path, query, and hash params.
- *
- * @see {@link defineQueryParamParser}
- * @see {@link definePathParamParser}
- */
-/*! #__NO_SIDE_EFFECTS__ */
-export const defineParamParser = defineQueryParamParser
-
 // TODO: I wonder if native param parsers should follow this or similar
 // these parsers can be used for both query and path params
 // export type ParamParserBoth<T> = ParamParser<T | T[] | null>