refactor: adds guards for fields with null values

zenstackhq · Nov 25, 2024 · 0f0a66f · 0f0a66f
1 parent dc072dd
commit 0f0a66f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/runtime/src/cross/mutator.ts b/packages/runtime/src/cross/mutator.ts
@@ -151,7 +151,7 @@ async function doApplyMutation(
                 logging
             );
 
-            if (r) {
+            if (r && typeof r === 'object') {
                 if (!arrayCloned) {
                     resultData = [...resultData];
                     arrayCloned = true;
@@ -160,9 +160,12 @@ async function doApplyMutation(
                 updated = true;
             }
         }
-    } else {
+    } else if (resultData !== null && typeof resultData === 'object') {
+        // Clone resultData to prevent mutations affecting the loop
+        const currentData = { ...resultData };
+
         // iterate over each field and apply mutation to nested data models
-        for (const [key, value] of Object.entries(resultData)) {
+        for (const [key, value] of Object.entries(currentData)) {
             const fieldInfo = modelFields[key];
             if (!fieldInfo?.isDataModel) {
                 continue;
@@ -178,7 +181,7 @@ async function doApplyMutation(
                 logging
             );
 
-            if (r) {
+            if (r && typeof r === 'object') {
                 resultData = { ...resultData, [key]: r };
                 updated = true;
             }