@firtoz/router-toolkit 7.0.0 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/router-toolkit",
-	"version": "7.0.0",
+	"version": "7.0.2",
 	"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",
@@ -26,7 +26,7 @@
 		"README.md"
 	],
 	"scripts": {
-		"typecheck": "tsc --noEmit -p ./tsconfig.json",
+		"typecheck": "tsgo --noEmit -p ./tsconfig.json",
 		"lint": "biome check --write src",
 		"lint:ci": "biome ci src",
 		"format": "biome format src --write",
@@ -57,7 +57,7 @@
 	"peerDependencies": {
 		"@firtoz/maybe-error": "^1.5.1",
 		"react": "^19.2.4",
-		"react-router": "^7.13.0",
+		"react-router": "^7.13.2",
 		"zod": "^4.3.6"
 	},
 	"engines": {
@@ -71,9 +71,9 @@
 	},
 	"devDependencies": {
 		"@testing-library/react": "^16.3.1",
-		"@types/jsdom": "^27.0.0",
+		"@types/jsdom": "^28.0.1",
 		"@types/react": "^19.2.14",
-		"bun-types": "^1.3.9",
-		"jsdom": "^28.1.0"
+		"bun-types": "^1.3.11",
+		"jsdom": "^29.0.1"
 	}
 }

package/src/ConcurrentSubmitterProvider.tsx

@@ -142,10 +142,12 @@ function FetcherRunner({
 	}, [pendingSubmit, fetcher.submit]);
 
 	React.useEffect(() => {
-		const wasSubmitting = prevStateRef.current === "submitting";
+		const wasWorking =
+			prevStateRef.current === "submitting" ||
+			prevStateRef.current === "loading";
 		prevStateRef.current = fetcher.state;
 
-		if (wasSubmitting && fetcher.state === "idle" && !settledRef.current) {
+		if (wasWorking && fetcher.state === "idle" && !settledRef.current) {
 			settledRef.current = true;
 			if (fetcher.data !== undefined) {
 				onSettle(id, fetcher.data, undefined);

package/src/useConcurrentSubmitter.tsx

@@ -22,20 +22,17 @@ export type { ActionResult };
 
 type RouteParams<R extends keyof RegisterPages> = RegisterPages[R]["params"];
 
-// Mirror HrefArgs logic: empty params → omit args; optional params → args optional; required → args required
-type Equal<X, Y> =
-	(<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
-		? true
-		: false;
-
-type HasNoParams<R extends keyof RegisterPages> =
-	Equal<
-		RouteParams<R>,
-		// biome-ignore lint/complexity/noBannedTypes: Intentionally empty for route with no params
-		{}
-	> extends true
-		? true
-		: false;
+/**
+ * True when the route has no dynamic segments (`params: {}` from React Router typegen).
+ * Uses `keyof … extends never` so real empty params stay distinct from the `RegisterPages`
+ * fallback (`AnyPages` → `params: Record<string, …>` has `keyof` = `string`, not `never`).
+ * That avoids mis-resolving `submitJson(path, data)` as the route-args overload (strings only).
+ */
+type HasNoParams<R extends keyof RegisterPages> = [
+	keyof RegisterPages[R]["params"],
+] extends [never]
+	? true
+	: false;
 
 type HasOptionalParams<R extends keyof RegisterPages> =
 	HasNoParams<R> extends true