@kitbag/router 0.5.1 → 0.5.2

package/dist/kitbag-router.d.ts

@@ -153,7 +153,7 @@ declare type CombinePath<TParent extends Path, TChild extends Path> = ToPath<TPa
 } ? ToPath<TChild> extends {
     path: infer TChildPath extends string;
     params: infer TChildParams extends Record<string, unknown>;
-} ? MergeParams<TParentParams, TChildParams> extends PathParams<`${TParentPath}${TChildPath}`> ? Path<`${TParentPath}${TChildPath}`, MergeParams<TParentParams, TChildParams>> : Path<'', {}> : Path<'', {}> : Path<'', {}>;
+} ? MergeParams<RemoveLeadingQuestionMarkFromKeys<TParentParams>, RemoveLeadingQuestionMarkFromKeys<TChildParams>> extends PathParamsWithParamNameExtracted<`${TParentPath}${TChildPath}`> ? Path<`${TParentPath}${TChildPath}`, MergeParams<RemoveLeadingQuestionMarkFromKeys<TParentParams>, RemoveLeadingQuestionMarkFromKeys<TChildParams>>> : Path<'', {}> : Path<'', {}> : Path<'', {}>;
 
 declare type CombineQuery<TParent extends Query | undefined, TChild extends Query | undefined> = ToQuery<TParent> extends {
     query: infer TParentQuery extends string;
@@ -161,7 +161,7 @@ declare type CombineQuery<TParent extends Query | undefined, TChild extends Quer
 } ? ToQuery<TChild> extends {
     query: infer TChildQuery extends string;
     params: infer TChildParams extends Record<string, unknown>;
-} ? MergeParams<TParentParams, TChildParams> extends QueryParams<CombineQueryString<TParentQuery, TChildQuery>> ? Query<CombineQueryString<TParentQuery, TChildQuery>, MergeParams<TParentParams, TChildParams>> : Query<'', {}> : Query<'', {}> : Query<'', {}>;
+} ? MergeParams<RemoveLeadingQuestionMarkFromKeys<TParentParams>, RemoveLeadingQuestionMarkFromKeys<TChildParams>> extends QueryParamsWithParamNameExtracted<CombineQueryString<TParentQuery, TChildQuery>> ? Query<CombineQueryString<TParentQuery, TChildQuery>, MergeParams<RemoveLeadingQuestionMarkFromKeys<TParentParams>, RemoveLeadingQuestionMarkFromKeys<TChildParams>>> : Query<'', {}> : Query<'', {}> : Query<'', {}>;
 
 declare type CombineQueryString<TParent extends string | undefined, TChild extends string | undefined> = StringHasValue<TParent> extends true ? StringHasValue<TChild> extends true ? `${TParent}&${TChild}` : TParent : TChild;
 
@@ -624,10 +624,6 @@ declare type Path<TPath extends string = string, TParams extends PathParamsWithP
  */
 export declare function path<TPath extends string, TParams extends PathParamsWithParamNameExtracted<TPath>>(path: TPath, params: Identity<TParams>): Path<TPath, TParams>;
 
-declare type PathParams<TPath extends string> = {
-    [K in keyof ExtractParamsFromPathString<TPath>]?: Param;
-};
-
 declare type PathParamsWithParamNameExtracted<TPath extends string> = {
     [K in keyof ExtractParamsFromPathString<TPath> as ExtractParamName<K>]?: Param;
 };
@@ -667,10 +663,6 @@ declare type Query<TQuery extends string = string, TQueryParams extends QueryPar
  */
 export declare function query<TQuery extends string, TParams extends QueryParamsWithParamNameExtracted<TQuery>>(query: TQuery, params: Identity<TParams>): Query<TQuery, TParams>;
 
-declare type QueryParams<T extends string> = {
-    [K in keyof ExtractQueryParamsFromQueryString<T>]?: Param;
-};
-
 declare type QueryParamsWithParamNameExtracted<T extends string> = {
     [K in keyof ExtractQueryParamsFromQueryString<T> as ExtractParamName<K>]?: Param;
 };
@@ -744,6 +736,12 @@ export declare type RegisteredRoutes = Register extends {
  */
 export declare type RegisteredRoutesKey = RoutesKey<RegisteredRoutes>;
 
+declare type RemoveLeadingQuestionMark<T extends PropertyKey> = T extends `?${infer TRest extends string}` ? TRest : T;
+
+declare type RemoveLeadingQuestionMarkFromKeys<T extends Record<string, unknown>> = {
+    [K in keyof T as RemoveLeadingQuestionMark<K>]: T[K];
+};
+
 /**
  * Represents a route that the router has matched to current browser location.
  * @template TRoute - Underlying Route that has been resolved.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kitbag/router",
   "private": false,
-  "version": "0.5.1",
+  "version": "0.5.2",
   "bugs": {
     "url": "https://github.com/kitbagjs/router/issues"
   },