From 18438dbdd0219d225d04337535094093d3f30d7c Mon Sep 17 00:00:00 2001
From: kshern <kshern@yeah.net>
Date: Mon, 24 Feb 2025 02:52:17 +0800
Subject: [PATCH] feat: add error handling

---
 client/src/components/DynamicJsonForm.tsx | 65 +++++++++++++++++++----
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/client/src/components/DynamicJsonForm.tsx b/client/src/components/DynamicJsonForm.tsx
index e760a13..75bdc6a 100644
--- a/client/src/components/DynamicJsonForm.tsx
+++ b/client/src/components/DynamicJsonForm.tsx
@@ -218,11 +218,30 @@ const DynamicJsonForm = ({
     const updateArray = (array: JsonValue[], path: string[], value: JsonValue): JsonValue[] => {
       const [index, ...restPath] = path;
       const arrayIndex = Number(index);
+
+      // Validate array index
+      if (isNaN(arrayIndex)) {
+        console.error(`Invalid array index: ${index}`);
+        return array;
+      }
+
+      // Check array bounds
+      if (arrayIndex < 0) {
+        console.error(`Array index out of bounds: ${arrayIndex} < 0`);
+        return array;
+      }
+
       const newArray = [...array];
       
       if (restPath.length === 0) {
         newArray[arrayIndex] = value;
       } else {
+        // Ensure index position exists
+        if (arrayIndex >= array.length) {
+          console.warn(`Extending array to index ${arrayIndex}`);
+          newArray.length = arrayIndex + 1;
+          newArray.fill(null, array.length, arrayIndex);
+        }
         newArray[arrayIndex] = updateValue(newArray[arrayIndex], restPath, value);
       }
       return newArray;
@@ -230,11 +249,23 @@ const DynamicJsonForm = ({
 
     const updateObject = (obj: JsonObject, path: string[], value: JsonValue): JsonObject => {
       const [key, ...restPath] = path;
+      
+      // Validate object key
+      if (typeof key !== 'string') {
+        console.error(`Invalid object key: ${key}`);
+        return obj;
+      }
+
       const newObj = { ...obj };
       
       if (restPath.length === 0) {
         newObj[key] = value;
       } else {
+        // Ensure key exists
+        if (!(key in newObj)) {
+          console.warn(`Creating new key in object: ${key}`);
+          newObj[key] = {};
+        }
         newObj[key] = updateValue(newObj[key], restPath, value);
       }
       return newObj;
@@ -243,20 +274,34 @@ const DynamicJsonForm = ({
     const updateValue = (current: JsonValue, path: string[], value: JsonValue): JsonValue => {
       if (path.length === 0) return value;
 
-      if (!current) {
-        current = !isNaN(Number(path[0])) ? [] : {};
-      }
+      try {
+        if (!current) {
+          current = !isNaN(Number(path[0])) ? [] : {};
+        }
 
-      if (Array.isArray(current)) {
-        return updateArray(current, path, value);
-      } else if (typeof current === 'object' && current !== null) {
-        return updateObject(current, path, value);
+        // Type checking
+        if (Array.isArray(current)) {
+          return updateArray(current, path, value);
+        } else if (typeof current === 'object' && current !== null) {
+          return updateObject(current, path, value);
+        } else {
+          console.error(`Cannot update path ${path.join('.')} in non-object/array value:`, current);
+          return current;
+        }
+      } catch (error) {
+        console.error(`Error updating value at path ${path.join('.')}:`, error);
+        return current;
       }
-      
-      return current;
     };
 
-    onChange(updateValue(value, path, fieldValue));
+    try {
+      const newValue = updateValue(value, path, fieldValue);
+      onChange(newValue);
+    } catch (error) {
+      console.error('Failed to update form value:', error);
+      // Keep the original value unchanged
+      onChange(value);
+    }
   };
 
   return (