@firtoz/router-toolkit 6.0.0 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/router-toolkit",
-	"version": "6.0.0",
+	"version": "7.0.1",
 	"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",

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);
@@ -176,7 +178,7 @@ export function ConcurrentSubmitterProvider({
 			setOperationsState((prev) => {
 				const op = prev[id];
 				if (!op) return prev;
-				const { resolve, reject, ...rest } = op;
+				const { resolve, reject, pendingSubmit: _p, ...rest } = op;
 				if (error !== undefined) {
 					reject(error);
 					return {
@@ -187,7 +189,6 @@ export function ConcurrentSubmitterProvider({
 							error,
 							resolve,
 							reject,
-							pendingSubmit: undefined,
 						},
 					};
 				}
@@ -200,7 +201,6 @@ export function ConcurrentSubmitterProvider({
 						data,
 						resolve,
 						reject,
-						pendingSubmit: undefined,
 					},
 				};
 			});

package/src/useConcurrentSubmitter.tsx

@@ -22,6 +22,75 @@ 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;
+
+type HasOptionalParams<R extends keyof RegisterPages> =
+	HasNoParams<R> extends true
+		? false
+		: Partial<RouteParams<R>> extends RouteParams<R>
+			? true
+			: false;
+
+// Args immediately after path (when needed), matching useDynamicFetcher/useDynamicSubmitter.
+// Order: (path, args?, data, options?) and (path, args?, formData, submittedData?, options?).
+type SubmitJsonFn<TInfo extends RouteWithActionModule> =
+	HasNoParams<TInfo["route"]> extends true
+		? (
+				path: TInfo["route"],
+				data: z.infer<TInfo["formSchema"]>,
+				options?: SubmitJsonOptions,
+			) => SubmitJsonResult<ActionResult<TInfo>>
+		: HasOptionalParams<TInfo["route"]> extends true
+			? (
+					path: TInfo["route"],
+					args: RouteParams<TInfo["route"]> | undefined,
+					data: z.infer<TInfo["formSchema"]>,
+					options?: SubmitJsonOptions,
+				) => SubmitJsonResult<ActionResult<TInfo>>
+			: (
+					path: TInfo["route"],
+					args: RouteParams<TInfo["route"]>,
+					data: z.infer<TInfo["formSchema"]>,
+					options?: SubmitJsonOptions,
+				) => SubmitJsonResult<ActionResult<TInfo>>;
+
+type SubmitFormDataFn<TInfo extends RouteWithActionModule> =
+	HasNoParams<TInfo["route"]> extends true
+		? (
+				path: TInfo["route"],
+				formData: FormData,
+				submittedData?: FormDataSubmittedData,
+				options?: SubmitFormDataOptions,
+			) => SubmitJsonResult<ActionResult<TInfo>>
+		: HasOptionalParams<TInfo["route"]> extends true
+			? (
+					path: TInfo["route"],
+					args: RouteParams<TInfo["route"]> | undefined,
+					formData: FormData,
+					submittedData?: FormDataSubmittedData,
+					options?: SubmitFormDataOptions,
+				) => SubmitJsonResult<ActionResult<TInfo>>
+			: (
+					path: TInfo["route"],
+					args: RouteParams<TInfo["route"]>,
+					formData: FormData,
+					submittedData?: FormDataSubmittedData,
+					options?: SubmitFormDataOptions,
+				) => SubmitJsonResult<ActionResult<TInfo>>;
+
 export type UseConcurrentSubmitterReturn<TInfo extends RouteWithActionModule> =
 	{
 		operations: Record<
@@ -31,19 +100,8 @@ export type UseConcurrentSubmitterReturn<TInfo extends RouteWithActionModule> =
 				z.infer<TInfo["formSchema"]> | FormDataSubmittedData
 			>
 		>;
-		submitJson: (
-			path: TInfo["route"],
-			args: RouteParams<TInfo["route"]> | undefined,
-			data: z.infer<TInfo["formSchema"]>,
-			options?: SubmitJsonOptions,
-		) => SubmitJsonResult<ActionResult<TInfo>>;
-		submitFormData: (
-			path: TInfo["route"],
-			args: RouteParams<TInfo["route"]> | undefined,
-			formData: FormData,
-			submittedData?: FormDataSubmittedData,
-			options?: SubmitFormDataOptions,
-		) => SubmitJsonResult<ActionResult<TInfo>>;
+		submitJson: SubmitJsonFn<TInfo>;
+		submitFormData: SubmitFormDataFn<TInfo>;
 	};
 
 export function useConcurrentSubmitter<
@@ -56,24 +114,75 @@ export function useConcurrentSubmitter<
 		);
 	}
 
+	function isRouteParams(obj: unknown): obj is Record<string, string> {
+		return (
+			typeof obj === "object" &&
+			obj !== null &&
+			!Array.isArray(obj) &&
+			obj instanceof FormData === false &&
+			Object.values(obj as Record<string, unknown>).every(
+				(v) => typeof v === "string",
+			)
+		);
+	}
+
 	const submitJson = useCallback(
-		(
-			path: string,
-			args: Record<string, string> | undefined,
-			data: unknown,
-			options?: SubmitJsonOptions,
-		) => ctx.addJsonSubmission(path, args, data, options),
+		(path: string, ...rest: unknown[]) => {
+			if (rest.length === 1) {
+				return ctx.addJsonSubmission(path, undefined, rest[0], undefined);
+			}
+			if (rest.length === 2 && rest[0] === undefined) {
+				return ctx.addJsonSubmission(path, undefined, rest[1], undefined);
+			}
+			if (rest.length === 2 && !isRouteParams(rest[0])) {
+				const [data, options] = rest as [
+					Record<string, unknown>,
+					SubmitJsonOptions | undefined,
+				];
+				return ctx.addJsonSubmission(path, undefined, data, options);
+			}
+			const [args, data, options] = rest as [
+				Record<string, string> | undefined,
+				Record<string, unknown>,
+				SubmitJsonOptions | undefined,
+			];
+			return ctx.addJsonSubmission(path, args, data, options);
+		},
 		[ctx],
 	) as UseConcurrentSubmitterReturn<TInfo>["submitJson"];
 
 	const submitFormData = useCallback(
-		(
-			path: string,
-			args: Record<string, string> | undefined,
-			formData: FormData,
-			submittedData: FormDataSubmittedData = {},
-			options?: SubmitFormDataOptions,
-		) => ctx.addFormSubmission(path, args, formData, submittedData, options),
+		(path: string, ...rest: unknown[]) => {
+			const second = rest[0];
+			if (second instanceof FormData) {
+				const formData = second;
+				const submittedData =
+					rest.length >= 2 ? (rest[1] as FormDataSubmittedData) : {};
+				const options =
+					rest.length === 3 ? (rest[2] as SubmitFormDataOptions) : undefined;
+				return ctx.addFormSubmission(
+					path,
+					undefined,
+					formData,
+					submittedData,
+					options,
+				);
+			}
+			const args = second as Record<string, string>;
+			const formData = rest[1] as FormData;
+			const submittedData =
+				rest.length >= 3 ? (rest[2] as FormDataSubmittedData) : {};
+			const options = (rest.length === 4 ? rest[3] : undefined) as
+				| SubmitFormDataOptions
+				| undefined;
+			return ctx.addFormSubmission(
+				path,
+				args,
+				formData,
+				submittedData,
+				options,
+			);
+		},
 		[ctx],
 	) as UseConcurrentSubmitterReturn<TInfo>["submitFormData"];