@firtoz/router-toolkit 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firtoz/router-toolkit",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Type-safe React Router 7 framework mode helpers with enhanced fetching, form submission, and state management",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -11,7 +11,10 @@
       "import": "./src/index.ts",
       "require": "./src/index.ts"
     },
-    "./*": ["./src/*.ts", "./src/*.tsx"]
+    "./*": [
+      "./src/*.ts",
+      "./src/*.tsx"
+    ]
   },
   "files": [
     "src/**/*",
@@ -20,8 +23,12 @@
   "scripts": {
     "build": "echo 'No build step - using TypeScript source directly'",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint src",
-    "test": "echo 'No tests yet'"
+    "lint": "biome check src",
+    "format": "biome format src --write",
+    "test": "echo 'No tests yet'",
+    "changeset": "changeset",
+    "version": "changeset version",
+    "release": "changeset publish"
   },
   "keywords": [
     "react-router",
@@ -49,6 +56,8 @@
     "zod": "^3.25.69"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.0.6",
+    "@changesets/cli": "^2.29.5",
     "@types/react": "^19.1.8",
     "react": "^19.1.0",
     "react-router": "^7.6.3",

package/src/types/Func.ts

@@ -1,2 +1,2 @@
 // biome-ignore lint/suspicious/noExplicitAny: We really want to use any here
-export type Func = (...args: any[]) => unknown; 
+export type Func = (...args: any[]) => unknown;

package/src/types/HrefArgs.ts

@@ -1,17 +1,8 @@
-import type { href, Register } from "react-router";
-
-type AnyParams = Record<string, string | undefined>;
-type AnyPages = Record<string, {
-	params: AnyParams;
-}>;
-
-export type RegisterPages = Register extends {
-	pages: infer Registered extends AnyPages;
-} ? Registered : AnyPages;
-
-export type HrefArgs<T extends keyof RegisterPages> = Parameters<typeof href<T>> extends [
-	string,
-	...infer Rest,
-] ? Rest : [];
-
-export type RoutePath<TPath extends keyof RegisterPages> = TPath;
+import type { href } from "react-router";
+import type { RegisterPages } from "./RegisterPages";
+
+export type HrefArgs<T extends keyof RegisterPages> = Parameters<
+	typeof href<T>
+> extends [string, ...infer Rest]
+	? Rest
+	: [];

package/src/types/RegisterPages.ts

@@ -0,0 +1,15 @@
+import type { Register } from "react-router";
+
+type AnyParams = Record<string, string | undefined>;
+type AnyPages = Record<
+	string,
+	{
+		params: AnyParams;
+	}
+>;
+
+export type RegisterPages = Register extends {
+	pages: infer Registered extends AnyPages;
+}
+	? Registered
+	: AnyPages;

package/src/types/RoutePath.ts

@@ -0,0 +1,3 @@
+import type { RegisterPages } from "./RegisterPages";
+
+export type RoutePath<TPath extends keyof RegisterPages> = TPath;

package/src/useDynamicFetcher.ts

@@ -1,7 +1,8 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { href, useFetcher, type useLoaderData } from "react-router";
 import type { Func } from "./types/Func";
-import type { HrefArgs, RegisterPages } from "./types/HrefArgs";
+import type { HrefArgs } from "./types/HrefArgs";
+import type { RegisterPages } from "./types/RegisterPages";
 
 type RouteModule = {
 	file: keyof RegisterPages;
@@ -10,7 +11,9 @@ type RouteModule = {
 
 export const useDynamicFetcher = <TInfo extends RouteModule>(
 	path: TInfo["file"],
-	...args: TInfo["file"] extends "undefined" ? HrefArgs<"/"> : HrefArgs<TInfo["file"]>
+	...args: TInfo["file"] extends "undefined"
+		? HrefArgs<"/">
+		: HrefArgs<TInfo["file"]>
 ): Omit<ReturnType<typeof useFetcher<TInfo["loader"]>>, "load" | "submit"> & {
 	load: (queryParams?: Record<string, string>) => Promise<void>;
 } => {
@@ -49,24 +52,13 @@ export const useDynamicFetcher = <TInfo extends RouteModule>(
 const fetchCache = new Map<string, unknown>();
 
 // Hook that uses regular fetch instead of useFetcher to avoid route invalidation
-export const useCachedFetch = <
-	TInfo extends {
-		file: string;
-		module: RouteModule;
-	},
->(
-	path: TInfo["file"] extends "undefined"
-		? "/"
-		: `/${TInfo["file"]}` extends keyof RegisterPages
-		? `/${TInfo["file"]}`
-		: never,
+export const useCachedFetch = <TInfo extends RouteModule>(
+	path: TInfo["file"],
 	...args: TInfo["file"] extends "undefined"
 		? HrefArgs<"/">
-		: `/${TInfo["file"]}` extends keyof RegisterPages
-		? HrefArgs<`/${TInfo["file"]}`>
-		: never
+		: HrefArgs<TInfo["file"]>
 ): {
-	data: ReturnType<typeof useLoaderData<TInfo["module"]["loader"]>> | undefined;
+	data: ReturnType<typeof useLoaderData<TInfo["loader"]>> | undefined;
 	isLoading: boolean;
 	error: Error | undefined;
 } => {
@@ -83,10 +75,12 @@ export const useCachedFetch = <
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState<Error | undefined>(undefined);
 	const [data, setData] = useState<
-		ReturnType<typeof useLoaderData<TInfo["module"]["loader"]>> | undefined
+		ReturnType<typeof useLoaderData<TInfo["loader"]>> | undefined
 	>(() =>
 		fetchCache.has(cacheKey)
-			? (fetchCache.get(cacheKey) as ReturnType<typeof useLoaderData<TInfo["module"]["loader"]>>)
+			? (fetchCache.get(cacheKey) as ReturnType<
+					typeof useLoaderData<TInfo["loader"]>
+				>)
 			: undefined,
 	);
 
@@ -112,7 +106,7 @@ export const useCachedFetch = <
 
 				// Update cache and state
 				fetchCache.set(cacheKey, result);
-				setData(result as ReturnType<typeof useLoaderData<TInfo["module"]["loader"]>>);
+				setData(result as ReturnType<typeof useLoaderData<TInfo["loader"]>>);
 			} catch (err) {
 				setError(err instanceof Error ? err : new Error(String(err)));
 			} finally {
@@ -124,4 +118,4 @@ export const useCachedFetch = <
 	}, [url, cacheKey]);
 
 	return { data, isLoading, error };
-}; 
+};

package/src/useDynamicSubmitter.tsx

@@ -7,8 +7,9 @@ import {
 	useFetcher,
 } from "react-router";
 import type { z } from "zod/v4";
-import { HrefArgs, RegisterPages } from "./types/HrefArgs";
-import { Func } from "./types";
+import type { Func } from "./types/Func";
+import type { HrefArgs } from "./types/HrefArgs";
+import type { RegisterPages } from "./types/RegisterPages";
 
 type RouteModule = {
 	file: keyof RegisterPages;
@@ -24,15 +25,23 @@ type SubmitFunc<TModule extends RouteModule> = (
 ) => Promise<void>;
 
 type SubmitForm = (
-	props: Omit<FetcherFormProps & React.RefAttributes<HTMLFormElement>, "action" | "method"> & {
+	props: Omit<
+		FetcherFormProps & React.RefAttributes<HTMLFormElement>,
+		"action" | "method"
+	> & {
 		method: Exclude<SubmitOptions["method"], "GET">;
 	},
 ) => React.ReactElement;
 
 export const useDynamicSubmitter = <TInfo extends RouteModule>(
 	path: TInfo["file"],
-	...args: TInfo["file"] extends "undefined" ? HrefArgs<"/"> : HrefArgs<TInfo["file"]>
-): Omit<ReturnType<typeof useFetcher<TInfo["action"]>>, "load" | "submit" | "Form"> & {
+	...args: TInfo["file"] extends "undefined"
+		? HrefArgs<"/">
+		: HrefArgs<TInfo["file"]>
+): Omit<
+	ReturnType<typeof useFetcher<TInfo["action"]>>,
+	"load" | "submit" | "Form"
+> & {
 	submit: SubmitFunc<TInfo>;
 	Form: SubmitForm;
 } => {

package/src/useFetcherStateChanged.ts

@@ -8,7 +8,10 @@ import type { useFetcher } from "react-router";
  */
 export const useFetcherStateChanged = (
 	fetcher: Pick<ReturnType<typeof useFetcher>, "state">,
-	onChange: (lastState: typeof fetcher.state | undefined, newState: typeof fetcher.state) => void,
+	onChange: (
+		lastState: typeof fetcher.state | undefined,
+		newState: typeof fetcher.state,
+	) => void,
 ) => {
 	const lastStateRef = useRef<typeof fetcher.state>(fetcher.state);
 
@@ -18,4 +21,4 @@ export const useFetcherStateChanged = (
 			lastStateRef.current = fetcher.state;
 		}
 	}, [fetcher.state, onChange]);
-}; 
+};

package/src/types/index.ts

@@ -1,2 +0,0 @@
-export type { Func } from "./Func";
-export type { HrefArgs,RoutePath } from "./HrefArgs";