not-node 6.2.1 → 6.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.2.1",
+	"version": "6.2.4",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/fields/index.js

@@ -194,9 +194,9 @@ function mutateFieldSide(field, mutation, side) {
 module.exports.mutateFieldSide = mutateFieldSide;
 
 function mutateField(sourceField, sourceMutation) {
-    const sides = ["ui", " model"];
-    let field = structuredClone(sourceField);
-    let mutation = structuredClone(sourceMutation);
+    const sides = ["ui", "model"];
+    let field = clone(sourceField);
+    let mutation = clone(sourceMutation);
     if (mutation) {
         sides.forEach((side) => mutateFieldSide(field, mutation, side));
     }

package/src/form/form.js

@@ -359,25 +359,36 @@ class Form {
         }
     }
 
+    extractActionFieldsFromRequest(req) {
+        if (
+            req?.notRouteData?.actionData?.fields &&
+            Array.isArray(req.notRouteData.actionData.fields)
+        ) {
+            return req.notRouteData.actionData.fields.flat(2);
+        }
+        if (
+            req?.notRouteData?.rule?.fields &&
+            Array.isArray(req.notRouteData.rule.fields)
+        ) {
+            return req.notRouteData.rule.fields;
+        }
+        return [];
+    }
+
     createInstructionFromRouteActionFields(
         req,
         mainInstruction = "fromBody",
         exceptions = {}
     ) {
         const result = {};
-        if (
-            req?.notRouteData?.actionData?.fields &&
-            Array.isArray(req.notRouteData.actionData.fields)
-        ) {
-            const fields = req.notRouteData.actionData.fields.flat(2);
-            fields.forEach((fieldName) => {
-                if (objHas(exceptions, fieldName)) {
-                    result[fieldName] = exceptions[fieldName];
-                } else {
-                    result[fieldName] = mainInstruction;
-                }
-            });
-        }
+        const fields = this.extractActionFieldsFromRequest(req);
+        fields.forEach((fieldName) => {
+            if (objHas(exceptions, fieldName)) {
+                result[fieldName] = exceptions[fieldName];
+            } else {
+                result[fieldName] = mainInstruction;
+            }
+        });
         return result;
     }