rankrunners-cms 0.0.35 → 0.0.37

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rankrunners-cms",
   "type": "module",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "peerDependencies": {
     "@puckeditor/core": "^0.21.1",
     "@tanstack/react-router": "^1.166.7",

package/src/api/client/form-fills.ts

@@ -6,7 +6,10 @@ import {
 } from "valibot";
 import { CMS_BASE_URL, SITE_ID } from "../constants";
 import type { FormFillSubmissionDTO } from "../types/form-fills";
-import { SendFormFillResult } from "../types/form-fills";
+import {
+  type SendFormFillResult,
+  SendFormFillResultType,
+} from "../types/form-fills";
 
 export type SendFormFillArgs<
   A,
@@ -33,14 +36,21 @@ export const sendFormFill = async <
   const formToSend = safeParse(args.schema, args.data);
 
   if (!formToSend.success) {
+    const errors: Record<string, string> = {};
+    formToSend.issues.forEach((issue) => {
+      if (issue.path && issue.path[0] && issue.path[0].key) {
+        errors[issue.path[0].key as string] = issue.message;
+      }
+    });
+
     console.error("Form fill validation failed:", formToSend.issues);
-    return SendFormFillResult.ValidationError;
+    return { response: SendFormFillResultType.ValidationError, errors };
   }
 
   const data: FormFillSubmissionDTO = {
     siteId: SITE_ID,
     type: args.type,
-    data: args.data as Record<string, string>,
+    data: formToSend.output as Record<string, string>,
     schema: {
       schema: JSON.stringify(args.schema),
       fields: args.fieldNames,
@@ -59,21 +69,26 @@ export const sendFormFill = async <
     });
 
     if (response.ok) {
-      return SendFormFillResult.Success;
+      return { response: SendFormFillResultType.Success };
     }
 
     console.error("Form fill submission failed with status:", response.status);
-    return SendFormFillResult.UnknownError;
+    console.error("Form fill submission:", data);
+    return { response: SendFormFillResultType.UnknownError };
   } catch (error) {
     console.error("Error sending form fill:", error);
     if (error instanceof Error) {
       if (error.message.includes("validation")) {
-        return SendFormFillResult.ValidationError;
+        return { response: SendFormFillResultType.ValidationError };
       }
       if (error.message.includes("captcha")) {
-        return SendFormFillResult.CaptchaError;
+        return { response: SendFormFillResultType.CaptchaError };
       }
     }
-    return SendFormFillResult.UnknownError;
+    if (error instanceof TypeError) {
+      // fetch throws TypeError on network failure
+      return { response: SendFormFillResultType.NetworkError };
+    }
+    return { response: SendFormFillResultType.UnknownError };
   }
 };

package/src/api/types/form-fills.ts

@@ -46,25 +46,35 @@ export const FormFillSubmissionSchema = object({
 
 export type FormFillSubmissionDTO = InferInput<typeof FormFillSubmissionSchema>;
 
-export enum SendFormFillResult {
+export type SendFormFillResult = {
+  response: SendFormFillResultType;
+  errors?: Record<string, string>;
+};
+
+export enum SendFormFillResultType {
   Success = "success",
   ValidationError = "validation_error",
   CaptchaError = "captcha_error",
+  NetworkError = "network_error",
   InvalidResponse = "invalid_response",
   UnknownError = "unknown_error",
 }
 
-export const formFillResultToMessage = (result: SendFormFillResult): string => {
+export const formFillResultToMessage = (
+  result: SendFormFillResultType,
+): string => {
   switch (result) {
-    case SendFormFillResult.Success:
+    case SendFormFillResultType.Success:
       return "Form submitted successfully!";
-    case SendFormFillResult.ValidationError:
+    case SendFormFillResultType.ValidationError:
       return "There was a validation error with your submission. Please check your input and try again.";
-    case SendFormFillResult.CaptchaError:
+    case SendFormFillResultType.CaptchaError:
       return "Captcha verification failed. Please complete the captcha and try again.";
-    case SendFormFillResult.InvalidResponse:
+    case SendFormFillResultType.NetworkError:
+      return "A network error occurred while submitting the form. Please check your internet connection and try again.";
+    case SendFormFillResultType.InvalidResponse:
       return "An internal error occurred while submitting the form. Please call us instead!";
-    case SendFormFillResult.UnknownError:
+    case SendFormFillResultType.UnknownError:
     default:
       return "An unknown error occurred while submitting the form. Please try again later, or try calling us!";
   }