@remoteoss/json-schema-form 0.11.12-dev.20250310202108 → 0.11.12-dev.20250411165200

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
- Generated: Mon, 10 Mar 2025 20:22:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -96,6 +96,75 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
+// src/internals/checkIfConditionMatches.js
+function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
+  if (node.if.anyOf) {
+    return node.if.anyOf.some(
+      (property) => checkIfConditionMatchesProperties({ if: property }, formValues, formFields, logic)
+    );
+  }
+  return Object.keys(node.if.properties ?? {}).every((name) => {
+    const currentProperty = node.if.properties[name];
+    const value = formValues[name];
+    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
+    value === null;
+    const hasIfExplicit = node.if.required?.includes(name);
+    if (hasEmptyValue && !hasIfExplicit) {
+      return true;
+    }
+    if (hasProperty(currentProperty, "const")) {
+      return compareFormValueWithSchemaValue(value, currentProperty.const);
+    }
+    if (currentProperty.contains?.pattern) {
+      const formValue = value || [];
+      if (Array.isArray(formValue)) {
+        const pattern = new RegExp(currentProperty.contains.pattern);
+        return (value || []).some((item) => pattern.test(item));
+      }
+    }
+    if (currentProperty.enum) {
+      return currentProperty.enum.includes(value);
+    }
+    if (currentProperty.properties) {
+      return checkIfConditionMatchesProperties(
+        { if: currentProperty },
+        formValues[name],
+        getField(name, formFields).fields,
+        logic
+      );
+    }
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        ...field,
+        ...currentProperty,
+        required: true
+      },
+      value
+    );
+  });
+}
+function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
+  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property]) => {
+    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
+    if (Object.hasOwn(property, "const") && currentValue === property.const)
+      return true;
+    return false;
+  });
+  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
+    ([name, property]) => {
+      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
+      if (Object.hasOwn(property, "const") && currentValue === property.const)
+        return true;
+      return false;
+    }
+  );
+  return computedValuesMatch && validationsMatch;
+}
+
 // src/internals/helpers.js
 var import_merge = __toESM(require("lodash/fp/merge"));
 var import_get = __toESM(require("lodash/get"));
@@ -355,76 +424,6 @@ function _composeFieldCustomClosure(defaultComposeFn) {
   };
 }
 
-// src/internals/checkIfConditionMatches.js
-function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
-  if (typeof node.if === "boolean") {
-    return node.if;
-  }
-  if (node.if.anyOf) {
-    return node.if.anyOf.some(
-      (property) => checkIfConditionMatchesProperties({ if: property }, formValues, formFields, logic)
-    );
-  }
-  return Object.keys(node.if.properties ?? {}).every((name) => {
-    const currentProperty = node.if.properties[name];
-    const field = getField(name, formFields ?? []);
-    const isFieldsetField = field?.inputType === supportedTypes.FIELDSET;
-    const value = formValues?.[name] ?? (isFieldsetField ? {} : void 0);
-    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
-    value === null;
-    const hasIfExplicit = node.if.required?.includes(name);
-    if (hasEmptyValue && !hasIfExplicit) {
-      return true;
-    }
-    if (hasProperty(currentProperty, "const")) {
-      return compareFormValueWithSchemaValue(value, currentProperty.const);
-    }
-    if (currentProperty.contains?.pattern) {
-      const formValue = value || [];
-      if (Array.isArray(formValue)) {
-        const pattern = new RegExp(currentProperty.contains.pattern);
-        return (value || []).some((item) => pattern.test(item));
-      }
-    }
-    if (currentProperty.enum) {
-      return currentProperty.enum.includes(value);
-    }
-    if (currentProperty.properties) {
-      return checkIfConditionMatchesProperties(
-        { if: currentProperty },
-        formValues[name],
-        getField(name, formFields).fields,
-        logic
-      );
-    }
-    return validateFieldSchema(
-      {
-        ...field,
-        ...currentProperty,
-        required: true
-      },
-      value
-    );
-  });
-}
-function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
-  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property]) => {
-    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
-    if (Object.hasOwn(property, "const") && currentValue === property.const)
-      return true;
-    return false;
-  });
-  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
-    ([name, property]) => {
-      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
-      if (Object.hasOwn(property, "const") && currentValue === property.const)
-        return true;
-      return false;
-    }
-  );
-  return computedValuesMatch && validationsMatch;
-}
-
 // src/jsonLogic.js
 var import_json_logic_js = __toESM(require("json-logic-js"));
 
@@ -1309,12 +1308,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1331,7 +1342,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -1341,7 +1353,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -1358,20 +1371,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -1386,6 +1385,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
- Generated: Mon, 10 Mar 2025 20:22:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -59,6 +59,75 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
+// src/internals/checkIfConditionMatches.js
+function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
+  if (node.if.anyOf) {
+    return node.if.anyOf.some(
+      (property) => checkIfConditionMatchesProperties({ if: property }, formValues, formFields, logic)
+    );
+  }
+  return Object.keys(node.if.properties ?? {}).every((name) => {
+    const currentProperty = node.if.properties[name];
+    const value = formValues[name];
+    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
+    value === null;
+    const hasIfExplicit = node.if.required?.includes(name);
+    if (hasEmptyValue && !hasIfExplicit) {
+      return true;
+    }
+    if (hasProperty(currentProperty, "const")) {
+      return compareFormValueWithSchemaValue(value, currentProperty.const);
+    }
+    if (currentProperty.contains?.pattern) {
+      const formValue = value || [];
+      if (Array.isArray(formValue)) {
+        const pattern = new RegExp(currentProperty.contains.pattern);
+        return (value || []).some((item) => pattern.test(item));
+      }
+    }
+    if (currentProperty.enum) {
+      return currentProperty.enum.includes(value);
+    }
+    if (currentProperty.properties) {
+      return checkIfConditionMatchesProperties(
+        { if: currentProperty },
+        formValues[name],
+        getField(name, formFields).fields,
+        logic
+      );
+    }
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        ...field,
+        ...currentProperty,
+        required: true
+      },
+      value
+    );
+  });
+}
+function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
+  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property]) => {
+    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
+    if (Object.hasOwn(property, "const") && currentValue === property.const)
+      return true;
+    return false;
+  });
+  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
+    ([name, property]) => {
+      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
+      if (Object.hasOwn(property, "const") && currentValue === property.const)
+        return true;
+      return false;
+    }
+  );
+  return computedValuesMatch && validationsMatch;
+}
+
 // src/internals/helpers.js
 import merge from "lodash/fp/merge";
 import get from "lodash/get";
@@ -318,76 +387,6 @@ function _composeFieldCustomClosure(defaultComposeFn) {
   };
 }
 
-// src/internals/checkIfConditionMatches.js
-function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
-  if (typeof node.if === "boolean") {
-    return node.if;
-  }
-  if (node.if.anyOf) {
-    return node.if.anyOf.some(
-      (property) => checkIfConditionMatchesProperties({ if: property }, formValues, formFields, logic)
-    );
-  }
-  return Object.keys(node.if.properties ?? {}).every((name) => {
-    const currentProperty = node.if.properties[name];
-    const field = getField(name, formFields ?? []);
-    const isFieldsetField = field?.inputType === supportedTypes.FIELDSET;
-    const value = formValues?.[name] ?? (isFieldsetField ? {} : void 0);
-    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
-    value === null;
-    const hasIfExplicit = node.if.required?.includes(name);
-    if (hasEmptyValue && !hasIfExplicit) {
-      return true;
-    }
-    if (hasProperty(currentProperty, "const")) {
-      return compareFormValueWithSchemaValue(value, currentProperty.const);
-    }
-    if (currentProperty.contains?.pattern) {
-      const formValue = value || [];
-      if (Array.isArray(formValue)) {
-        const pattern = new RegExp(currentProperty.contains.pattern);
-        return (value || []).some((item) => pattern.test(item));
-      }
-    }
-    if (currentProperty.enum) {
-      return currentProperty.enum.includes(value);
-    }
-    if (currentProperty.properties) {
-      return checkIfConditionMatchesProperties(
-        { if: currentProperty },
-        formValues[name],
-        getField(name, formFields).fields,
-        logic
-      );
-    }
-    return validateFieldSchema(
-      {
-        ...field,
-        ...currentProperty,
-        required: true
-      },
-      value
-    );
-  });
-}
-function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
-  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property]) => {
-    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
-    if (Object.hasOwn(property, "const") && currentValue === property.const)
-      return true;
-    return false;
-  });
-  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
-    ([name, property]) => {
-      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
-      if (Object.hasOwn(property, "const") && currentValue === property.const)
-        return true;
-      return false;
-    }
-  );
-  return computedValuesMatch && validationsMatch;
-}
-
 // src/jsonLogic.js
 import jsonLogic from "json-logic-js";
 
@@ -1272,12 +1271,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1294,7 +1305,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -1304,7 +1316,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -1321,20 +1334,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -1349,6 +1348,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
- Generated: Mon, 10 Mar 2025 20:22:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -11576,6 +11576,75 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
+// src/internals/checkIfConditionMatches.js
+function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
+  if (node.if.anyOf) {
+    return node.if.anyOf.some(
+      (property2) => checkIfConditionMatchesProperties({ if: property2 }, formValues, formFields, logic)
+    );
+  }
+  return Object.keys(node.if.properties ?? {}).every((name) => {
+    const currentProperty = node.if.properties[name];
+    const value = formValues[name];
+    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
+    value === null;
+    const hasIfExplicit = node.if.required?.includes(name);
+    if (hasEmptyValue && !hasIfExplicit) {
+      return true;
+    }
+    if (hasProperty(currentProperty, "const")) {
+      return compareFormValueWithSchemaValue(value, currentProperty.const);
+    }
+    if (currentProperty.contains?.pattern) {
+      const formValue = value || [];
+      if (Array.isArray(formValue)) {
+        const pattern = new RegExp(currentProperty.contains.pattern);
+        return (value || []).some((item) => pattern.test(item));
+      }
+    }
+    if (currentProperty.enum) {
+      return currentProperty.enum.includes(value);
+    }
+    if (currentProperty.properties) {
+      return checkIfConditionMatchesProperties(
+        { if: currentProperty },
+        formValues[name],
+        getField(name, formFields).fields,
+        logic
+      );
+    }
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        ...field,
+        ...currentProperty,
+        required: true
+      },
+      value
+    );
+  });
+}
+function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
+  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property2]) => {
+    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
+    if (Object.hasOwn(property2, "const") && currentValue === property2.const)
+      return true;
+    return false;
+  });
+  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
+    ([name, property2]) => {
+      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
+      if (Object.hasOwn(property2, "const") && currentValue === property2.const)
+        return true;
+      return false;
+    }
+  );
+  return computedValuesMatch && validationsMatch;
+}
+
 // src/internals/helpers.js
 var import_merge = __toESM(require_merge2());
 var import_get2 = __toESM(require_get());
@@ -11835,76 +11904,6 @@ function _composeFieldCustomClosure(defaultComposeFn) {
   };
 }
 
-// src/internals/checkIfConditionMatches.js
-function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
-  if (typeof node.if === "boolean") {
-    return node.if;
-  }
-  if (node.if.anyOf) {
-    return node.if.anyOf.some(
-      (property2) => checkIfConditionMatchesProperties({ if: property2 }, formValues, formFields, logic)
-    );
-  }
-  return Object.keys(node.if.properties ?? {}).every((name) => {
-    const currentProperty = node.if.properties[name];
-    const field = getField(name, formFields ?? []);
-    const isFieldsetField = field?.inputType === supportedTypes.FIELDSET;
-    const value = formValues?.[name] ?? (isFieldsetField ? {} : void 0);
-    const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
-    value === null;
-    const hasIfExplicit = node.if.required?.includes(name);
-    if (hasEmptyValue && !hasIfExplicit) {
-      return true;
-    }
-    if (hasProperty(currentProperty, "const")) {
-      return compareFormValueWithSchemaValue(value, currentProperty.const);
-    }
-    if (currentProperty.contains?.pattern) {
-      const formValue = value || [];
-      if (Array.isArray(formValue)) {
-        const pattern = new RegExp(currentProperty.contains.pattern);
-        return (value || []).some((item) => pattern.test(item));
-      }
-    }
-    if (currentProperty.enum) {
-      return currentProperty.enum.includes(value);
-    }
-    if (currentProperty.properties) {
-      return checkIfConditionMatchesProperties(
-        { if: currentProperty },
-        formValues[name],
-        getField(name, formFields).fields,
-        logic
-      );
-    }
-    return validateFieldSchema(
-      {
-        ...field,
-        ...currentProperty,
-        required: true
-      },
-      value
-    );
-  });
-}
-function checkIfMatchesValidationsAndComputedValues(node, formValues, logic, parentID) {
-  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property2]) => {
-    const currentValue = logic.getScope(parentID).applyValidationRuleInCondition(name, formValues);
-    if (Object.hasOwn(property2, "const") && currentValue === property2.const)
-      return true;
-    return false;
-  });
-  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
-    ([name, property2]) => {
-      const currentValue = logic.getScope(parentID).applyComputedValueRuleInCondition(name, formValues);
-      if (Object.hasOwn(property2, "const") && currentValue === property2.const)
-        return true;
-      return false;
-    }
-  );
-  return computedValuesMatch && validationsMatch;
-}
-
 // src/jsonLogic.js
 var import_json_logic_js = __toESM(require_logic());
 
@@ -12788,12 +12787,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -12810,7 +12821,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -12820,7 +12832,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -12837,20 +12850,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -12865,6 +12864,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.12-dev.20250310202108",
+  "version": "0.11.12-dev.20250411165200",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

package/src/tests/conditions.test.js

@@ -596,74 +596,6 @@ describe('Conditional with anyOf', () => {
   });
 });
 
-describe('Conditional with fieldset', () => {
-  const schema = {
-    additionalProperties: false,
-    type: 'object',
-    properties: {
-      field_a: {
-        type: 'object',
-        properties: {
-          min: { type: 'number' },
-          max: { type: 'number' },
-        },
-      },
-      field_b: { type: 'string' },
-    },
-    allOf: [
-      {
-        if: {
-          properties: {
-            field_a: {
-              properties: {
-                min: {
-                  minimum: 10,
-                },
-              },
-              required: ['min'],
-            },
-          },
-          required: ['field_a'],
-        },
-        then: {
-          required: ['field_b'],
-        },
-        else: {
-          properties: {
-            field_b: false,
-          },
-        },
-      },
-    ],
-  };
-
-  it('handles true case', () => {
-    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
-
-    expect(fields[1].isVisible).toBe(false);
-    expect(handleValidation({ field_a: { min: 100 } }).formErrors).toEqual({
-      field_b: 'Required field',
-    });
-    expect(fields[1].isVisible).toBe(true);
-  });
-
-  it('handles false case', () => {
-    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
-
-    expect(fields[1].isVisible).toBe(false);
-    expect(handleValidation({ field_a: { min: 1 } }).formErrors).toBeUndefined();
-    expect(fields[1].isVisible).toBe(false);
-  });
-
-  it('handles undefined fieldset case', () => {
-    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
-
-    expect(fields[1].isVisible).toBe(false);
-    expect(handleValidation({}).formErrors).toBeUndefined();
-    expect(fields[1].isVisible).toBe(false);
-  });
-});
-
 describe('Conditionals - bugs and code-smells', () => {
   // Why do we have these bugs?
   // To be honest we never realized it much later later.

package/src/tests/createHeadlessForm.test.js

@@ -63,6 +63,7 @@ import {
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
   schemaInputTypeFile,
+  schemaWithRootFieldsetsConditionals,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -2162,6 +2163,47 @@ describe('createHeadlessForm', () => {
           ).toBeUndefined();
         });
       });
+
+      describe('supports root fieldsets conditionals', () => {
+        it('Given a basic retirement, the perks.has_pension is hidden', async () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithRootFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(validateForm({})).toEqual({
+            perks: {
+              retirement: 'Required field',
+            },
+          });
+
+          // has_pension is not visible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(false);
+
+          expect(
+            validateForm({
+              perks: { retirement: 'plus' },
+            })
+          ).toEqual({
+            perks: {
+              has_pension: 'Required field',
+            },
+          });
+
+          // field becomes visible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(true);
+
+          expect(
+            validateForm({
+              perks: { retirement: 'basic' },
+            })
+          ).toBeUndefined();
+
+          // field becomes invisible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(false);
+        });
+      });
     });
 
     it('support "email" field type', () => {

package/src/tests/helpers.js

@@ -1973,6 +1973,90 @@ export const schemaWithConditionalToFieldset = {
   required: ['perks', 'work_hours_per_week'],
 };
 
+export const schemaWithRootFieldsetsConditionals = {
+  additionalProperties: false,
+  type: 'object',
+  properties: {
+    perks: {
+      additionalProperties: false,
+      properties: {
+        retirement: {
+          oneOf: [
+            {
+              const: 'basic',
+              title: 'Basic',
+            },
+            {
+              const: 'plus',
+              title: 'Plus',
+            },
+          ],
+          title: 'Retirement',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+        has_pension: {
+          oneOf: [
+            {
+              const: 'yes',
+              title: 'Yes',
+            },
+            {
+              const: 'no',
+              title: 'No',
+            },
+          ],
+          title: 'Has pension',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+      },
+      required: ['retirement'],
+      title: 'Perks',
+      type: 'object',
+      'x-jsf-presentation': {
+        inputType: 'fieldset',
+      },
+    },
+  },
+  required: ['perks'],
+  allOf: [
+    {
+      if: {
+        properties: {
+          perks: {
+            properties: {
+              retirement: {
+                const: 'basic',
+              },
+            },
+          },
+        },
+      },
+      then: {
+        properties: {
+          perks: {
+            properties: {
+              has_pension: false,
+            },
+          },
+        },
+      },
+      else: {
+        properties: {
+          perks: {
+            required: ['has_pension'],
+          },
+        },
+      },
+    },
+  ],
+};
+
 export const schemaWorkSchedule = {
   type: 'object',
   properties: {

package/src/tests/jsonLogic.fixtures.js

@@ -984,3 +984,51 @@ export const schemaWithTwoValidationsWhereOneOfThemIsAppliedConditionally = {
     },
   ],
 };
+
+export const schemaWithReduceAccumulator = {
+  properties: {
+    work_days: {
+      items: {
+        anyOf: [
+          { const: 'monday', title: 'Monday' },
+          { const: 'tuesday', title: 'Tuesday' },
+          { const: 'wednesday', title: 'Wednesday' },
+          { const: 'thursday', title: 'Thursday' },
+          { const: 'friday', title: 'Friday' },
+          { const: 'saturday', title: 'Saturday' },
+          { const: 'sunday', title: 'Sunday' },
+        ],
+      },
+      type: 'array',
+      uniqueItems: true,
+      'x-jsf-presentation': {
+        inputType: 'select',
+      },
+    },
+    working_hours_per_day: {
+      type: 'number',
+    },
+    working_hours_per_week: {
+      type: 'number',
+      'x-jsf-logic-computedAttrs': {
+        const: 'computed_work_hours_per_week',
+        defaultValue: 'computed_work_hours_per_week',
+        title: '{{computed_work_hours_per_week}} hours per week',
+      },
+    },
+  },
+  'x-jsf-logic': {
+    computedValues: {
+      computed_work_hours_per_week: {
+        rule: {
+          '*': [
+            { var: 'working_hours_per_day' },
+            {
+              reduce: [{ var: 'work_days' }, { '+': [{ var: ['accumulator', 0] }, 1] }, 0],
+            },
+          ],
+        },
+      },
+    },
+  },
+};

package/src/tests/jsonLogic.test.js

@@ -34,6 +34,7 @@ import {
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
   badSchemaThatWillNotSetAForcedValue,
+  schemaWithReduceAccumulator,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -243,6 +244,23 @@ describe('jsonLogic: cross-values validations', () => {
     });
   });
 
+  // TODO: Implement this test.
+  describe.skip('Reduce', () => {
+    it('reduce: working_hours_per_day * work_days', () => {
+      const { fields, handleValidation } = createHeadlessForm(schemaWithReduceAccumulator, {
+        strictInputType: false,
+      });
+      handleValidation({
+        work_days: ['monday', 'tuesday'],
+        working_hours_per_day: 8,
+      });
+      const field = fields.find((i) => i.name === 'working_hours_per_week');
+      expect(field.const).toEqual(16);
+      expect(field.default).toEqual(16);
+      expect(field.label).toEqual('16 hours per week');
+    });
+  });
+
   describe('Logical: ||, &&', () => {
     it('AND: field_a > field_b && field_a > field_c (implicit with multiple rules in a single field)', () => {
       const schema = createSchemaWithThreePropertiesWithRuleOnFieldA({