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

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 0.11.11-beta.0 (2025-02-20)
+
+##### Bug Fixes
+
+* **conditionals:**  Add support to `oneOf` ([#136](https://github.com/remoteoss/json-schema-form/pull/136)) ([966cec59](https://github.com/remoteoss/json-schema-form/commit/966cec595ed2a1ff35f9d15e22acaea16cdd5113))
+
 #### 0.11.10-beta.0 (2025-01-22)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.11-dev.20250220174843
- Generated: Thu, 20 Feb 2025 17:48:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -96,70 +96,6 @@ 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;
-  }
-  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"));
@@ -419,6 +355,76 @@ 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"));
 
@@ -1164,11 +1170,7 @@ function hasType(type, typeName) {
   return Array.isArray(type) ? type.includes(typeName) : type === typeName;
 }
 function getField(fieldName, fields) {
-  if (Array.isArray(fields)) {
-    return fields.find(({ name }) => name === fieldName);
-  } else {
-    return fields[fieldName];
-  }
+  return fields.find(({ name }) => name === fieldName);
 }
 function validateFieldSchema(field, value, logic) {
   const validator = buildYupSchema(field, {}, logic);
@@ -1382,25 +1384,6 @@ function processNode({
           logic
         });
       }
-      if (inputType === supportedTypes.GROUP_ARRAY) {
-        const values = formValues[name];
-        if (Array.isArray(values)) {
-          const newFields = [];
-          const field = getField(name, formFields);
-          values.forEach((value) => {
-            const fields = field.fields();
-            processNode({
-              node: nestedNode.items,
-              formValues: value,
-              formFields: fields,
-              parentID: name,
-              logic
-            });
-            newFields.push(fields);
-          });
-          field.dynamicFields = newFields;
-        }
-      }
     });
   }
   if (node["x-jsf-logic"]) {
@@ -1772,16 +1755,6 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
       logic
     );
   }
-  if (inputType === supportedTypes.GROUP_ARRAY) {
-    fields = () => getFieldsFromJSONSchema(
-      fieldProperties.items,
-      {
-        customProperties: (0, import_get3.default)(config, `customProperties.${name}.customProperties`, {}),
-        parentID: name
-      },
-      logic
-    );
-  }
   const result = {
     name,
     inputType,
@@ -1875,10 +1848,12 @@ function getFieldsFromJSONSchema(scopedJsonSchema, config, logic) {
     if (fieldParams.inputType === "group-array") {
       const groupArrayItems = convertJSONSchemaPropertiesToFieldParameters(fieldParams.items);
       const groupArrayFields = groupArrayItems.map((groupArrayItem) => {
+        groupArrayItem.nameKey = groupArrayItem.name;
         const customProperties = null;
         const composeFn = getComposeFunctionForField(groupArrayItem, !!customProperties);
         return composeFn(groupArrayItem);
       });
+      fieldParams.nameKey = fieldParams.name;
       fieldParams.nthFieldGroup = {
         name: fieldParams.name,
         label: fieldParams.label,

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.11-dev.20250220174843
- Generated: Thu, 20 Feb 2025 17:48:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -59,70 +59,6 @@ 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;
-  }
-  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";
@@ -382,6 +318,76 @@ 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";
 
@@ -1127,11 +1133,7 @@ function hasType(type, typeName) {
   return Array.isArray(type) ? type.includes(typeName) : type === typeName;
 }
 function getField(fieldName, fields) {
-  if (Array.isArray(fields)) {
-    return fields.find(({ name }) => name === fieldName);
-  } else {
-    return fields[fieldName];
-  }
+  return fields.find(({ name }) => name === fieldName);
 }
 function validateFieldSchema(field, value, logic) {
   const validator = buildYupSchema(field, {}, logic);
@@ -1345,25 +1347,6 @@ function processNode({
           logic
         });
       }
-      if (inputType === supportedTypes.GROUP_ARRAY) {
-        const values = formValues[name];
-        if (Array.isArray(values)) {
-          const newFields = [];
-          const field = getField(name, formFields);
-          values.forEach((value) => {
-            const fields = field.fields();
-            processNode({
-              node: nestedNode.items,
-              formValues: value,
-              formFields: fields,
-              parentID: name,
-              logic
-            });
-            newFields.push(fields);
-          });
-          field.dynamicFields = newFields;
-        }
-      }
     });
   }
   if (node["x-jsf-logic"]) {
@@ -1735,16 +1718,6 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
       logic
     );
   }
-  if (inputType === supportedTypes.GROUP_ARRAY) {
-    fields = () => getFieldsFromJSONSchema(
-      fieldProperties.items,
-      {
-        customProperties: get3(config, `customProperties.${name}.customProperties`, {}),
-        parentID: name
-      },
-      logic
-    );
-  }
   const result = {
     name,
     inputType,
@@ -1838,10 +1811,12 @@ function getFieldsFromJSONSchema(scopedJsonSchema, config, logic) {
     if (fieldParams.inputType === "group-array") {
       const groupArrayItems = convertJSONSchemaPropertiesToFieldParameters(fieldParams.items);
       const groupArrayFields = groupArrayItems.map((groupArrayItem) => {
+        groupArrayItem.nameKey = groupArrayItem.name;
         const customProperties = null;
         const composeFn = getComposeFunctionForField(groupArrayItem, !!customProperties);
         return composeFn(groupArrayItem);
       });
+      fieldParams.nameKey = fieldParams.name;
       fieldParams.nthFieldGroup = {
         name: fieldParams.name,
         label: fieldParams.label,

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.11-dev.20250220174843
- Generated: Thu, 20 Feb 2025 17:48:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -11576,70 +11576,6 @@ 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;
-  }
-  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());
@@ -11899,6 +11835,76 @@ 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());
 
@@ -12643,11 +12649,7 @@ function hasType(type, typeName) {
   return Array.isArray(type) ? type.includes(typeName) : type === typeName;
 }
 function getField(fieldName, fields) {
-  if (Array.isArray(fields)) {
-    return fields.find(({ name }) => name === fieldName);
-  } else {
-    return fields[fieldName];
-  }
+  return fields.find(({ name }) => name === fieldName);
 }
 function validateFieldSchema(field, value, logic) {
   const validator = buildYupSchema(field, {}, logic);
@@ -12861,25 +12863,6 @@ function processNode({
           logic
         });
       }
-      if (inputType === supportedTypes.GROUP_ARRAY) {
-        const values2 = formValues[name];
-        if (Array.isArray(values2)) {
-          const newFields = [];
-          const field = getField(name, formFields);
-          values2.forEach((value) => {
-            const fields = field.fields();
-            processNode({
-              node: nestedNode.items,
-              formValues: value,
-              formFields: fields,
-              parentID: name,
-              logic
-            });
-            newFields.push(fields);
-          });
-          field.dynamicFields = newFields;
-        }
-      }
     });
   }
   if (node["x-jsf-logic"]) {
@@ -13251,16 +13234,6 @@ function buildFieldParameters(name, fieldProperties, required2 = [], config = {}
       logic
     );
   }
-  if (inputType === supportedTypes.GROUP_ARRAY) {
-    fields = () => getFieldsFromJSONSchema(
-      fieldProperties.items,
-      {
-        customProperties: (0, import_get4.default)(config, `customProperties.${name}.customProperties`, {}),
-        parentID: name
-      },
-      logic
-    );
-  }
   const result = {
     name,
     inputType,
@@ -13354,10 +13327,12 @@ function getFieldsFromJSONSchema(scopedJsonSchema, config, logic) {
     if (fieldParams.inputType === "group-array") {
       const groupArrayItems = convertJSONSchemaPropertiesToFieldParameters(fieldParams.items);
       const groupArrayFields = groupArrayItems.map((groupArrayItem) => {
+        groupArrayItem.nameKey = groupArrayItem.name;
         const customProperties = null;
         const composeFn = getComposeFunctionForField(groupArrayItem, !!customProperties);
         return composeFn(groupArrayItem);
       });
+      fieldParams.nameKey = fieldParams.name;
       fieldParams.nthFieldGroup = {
         name: fieldParams.name,
         label: fieldParams.label,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.11-dev.20250220174843",
+  "version": "0.11.12-dev.20250310202108",
   "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

@@ -422,233 +422,6 @@ describe('Conditional attributes updated', () => {
     handleValidation({ is_full_time: 'no' });
     expect(fields[1].visibilityCondition).toEqual(expect.any(Function));
   });
-
-  it('Group array nested condition', () => {
-    const { fields, handleValidation } = createHeadlessForm({
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        companies: {
-          type: 'array',
-          'x-jsf-presentation': {
-            inputType: 'group-array',
-          },
-          items: {
-            type: 'object',
-            properties: {
-              company: {
-                type: 'string',
-                oneOf: [
-                  {
-                    title: 'A',
-                    const: 'A',
-                  },
-                  {
-                    title: 'B',
-                    const: 'B',
-                  },
-                ],
-                'x-jsf-presentation': {
-                  inputType: 'select',
-                },
-              },
-              role: {
-                title: 'Role',
-                oneOf: [],
-                'x-jsf-presentation': {
-                  inputType: 'select',
-                },
-              },
-            },
-            allOf: [
-              {
-                if: {
-                  properties: {
-                    company: {
-                      const: 'A',
-                    },
-                  },
-                  required: ['company'],
-                },
-                then: {
-                  properties: {
-                    role: {
-                      oneOf: [
-                        {
-                          title: 'adminA',
-                          const: 'adminA',
-                        },
-                        {
-                          title: 'userA',
-                          const: 'userA',
-                        },
-                      ],
-                      'x-jsf-presentation': {
-                        inputType: 'select',
-                      },
-                    },
-                  },
-                  required: ['role'],
-                },
-              },
-              {
-                if: {
-                  properties: {
-                    company: {
-                      const: 'B',
-                    },
-                  },
-                  required: ['company'],
-                },
-                then: {
-                  properties: {
-                    role: {
-                      oneOf: [
-                        {
-                          title: 'adminB',
-                          const: 'adminB',
-                        },
-                        {
-                          title: 'userB',
-                          const: 'userB',
-                        },
-                      ],
-                      'x-jsf-presentation': {
-                        inputType: 'select',
-                      },
-                    },
-                  },
-                  required: ['role'],
-                },
-              },
-            ],
-            required: ['company', 'role'],
-          },
-        },
-      },
-      required: ['companies'],
-    });
-
-    handleValidation({ companies: [{ company: 'A' }, { company: 'B' }] });
-    expect(fields[0].dynamicFields[0][1].options).toEqual([
-      { label: 'adminA', value: 'adminA' },
-      { label: 'userA', value: 'userA' },
-    ]);
-    expect(fields[0].dynamicFields[1][1].options).toEqual([
-      { label: 'adminB', value: 'adminB' },
-      { label: 'userB', value: 'userB' },
-    ]);
-    handleValidation({ companies: [] });
-    expect(fields[0].dynamicFields).toEqual([]);
-  });
-
-  it('select multiple conditions', () => {
-    const { fields, handleValidation } = createHeadlessForm({
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        company: {
-          title: 'Select Company',
-          type: 'string',
-          description: 'Choose a company',
-          oneOf: [
-            {
-              title: 'A',
-              const: 'A',
-            },
-            {
-              title: 'B',
-              const: 'B',
-            },
-          ],
-          'x-jsf-presentation': {
-            inputType: 'select',
-          },
-        },
-        role: {
-          title: 'Role',
-          oneOf: [],
-          'x-jsf-presentation': {
-            inputType: 'select',
-          },
-        },
-      },
-      allOf: [
-        {
-          if: {
-            properties: {
-              company: {
-                const: 'A',
-              },
-            },
-            required: ['company'],
-          },
-          then: {
-            properties: {
-              role: {
-                oneOf: [
-                  {
-                    title: 'adminA',
-                    const: 'adminA',
-                  },
-                  {
-                    title: 'userA',
-                    const: 'userA',
-                  },
-                ],
-                'x-jsf-presentation': {
-                  inputType: 'select',
-                },
-              },
-            },
-            required: ['role'],
-          },
-        },
-        {
-          if: {
-            properties: {
-              company: {
-                const: 'B',
-              },
-            },
-            required: ['company'],
-          },
-          then: {
-            properties: {
-              role: {
-                oneOf: [
-                  {
-                    title: 'adminB',
-                    const: 'adminB',
-                  },
-                  {
-                    title: 'userB',
-                    const: 'userB',
-                  },
-                ],
-                'x-jsf-presentation': {
-                  inputType: 'select',
-                },
-              },
-            },
-            required: ['role'],
-          },
-        },
-      ],
-      required: ['company', 'role'],
-    });
-
-    handleValidation({ company: 'A' });
-    expect(fields[1].options).toEqual([
-      { label: 'adminA', value: 'adminA' },
-      { label: 'userA', value: 'userA' },
-    ]);
-    handleValidation({ company: 'B' });
-    expect(fields[1].options).toEqual([
-      { label: 'adminB', value: 'adminB' },
-      { label: 'userB', value: 'userB' },
-    ]);
-  });
 });
 
 describe('Conditional with a minimum value check', () => {
@@ -775,6 +548,122 @@ describe('Conditional with literal booleans', () => {
   });
 });
 
+describe('Conditional with anyOf', () => {
+  const schema = {
+    additionalProperties: false,
+    type: 'object',
+    properties: {
+      field_a: { type: 'string' },
+      field_b: { type: 'string' },
+      field_c: { type: 'string' },
+    },
+    allOf: [
+      {
+        if: {
+          anyOf: [
+            { properties: { field_a: { const: '1' } }, required: ['field_a'] },
+            { properties: { field_b: { const: '2' } }, required: ['field_b'] },
+          ],
+        },
+        then: {
+          required: ['field_c'],
+        },
+        else: {
+          properties: {
+            field_c: false,
+          },
+        },
+      },
+    ],
+  };
+
+  it('handles true case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    expect(fields[2].isVisible).toBe(false);
+    expect(handleValidation({ field_a: 'x', field_b: '2' }).formErrors).toEqual({
+      field_c: 'Required field',
+    });
+    expect(fields[2].isVisible).toBe(true);
+  });
+
+  it('handles false case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    expect(fields[2].isVisible).toBe(false);
+    expect(handleValidation({ field_a: 'x', field_b: 'x' }).formErrors).toBeUndefined();
+    expect(fields[2].isVisible).toBe(false);
+  });
+});
+
+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,7 +63,6 @@ import {
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
   schemaInputTypeFile,
-  nestedGroupArrayForm,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -1605,6 +1604,7 @@ describe('createHeadlessForm', () => {
             type: 'text',
             description: 'Enter your child’s full name',
             maxLength: 255,
+            nameKey: 'full_name',
             label: 'Child Full Name',
             name: 'full_name',
             required: true,
@@ -1616,6 +1616,7 @@ describe('createHeadlessForm', () => {
             required: true,
             description: 'Enter your child’s date of birth',
             maxLength: 255,
+            nameKey: 'birthdate',
           },
           {
             type: 'radio',
@@ -1634,6 +1635,7 @@ describe('createHeadlessForm', () => {
             required: true,
             description:
               'We know sex is non-binary but for insurance and payroll purposes, we need to collect this information.',
+            nameKey: 'sex',
           },
         ]);
       });
@@ -1735,63 +1737,6 @@ describe('createHeadlessForm', () => {
         });
       });
 
-      it('nested "group-array" fields', () => {
-        const result = createHeadlessForm({
-          properties: {
-            nestedGroupArray: nestedGroupArrayForm,
-          },
-        });
-
-        expect(result.fields[0]).toMatchObject({
-          label: 'Parent object',
-          name: 'nestedGroupArray',
-          required: false,
-          type: 'group-array',
-          inputType: 'group-array',
-          jsonType: 'array',
-          fields: expect.any(Function),
-        });
-
-        expect(result.fields[0].fields()).toMatchObject([
-          {
-            type: 'text',
-            description: 'Simple text field',
-            maxLength: 255,
-            label: 'Outer Field',
-            name: 'notNested',
-            required: true,
-          },
-          {
-            label: 'Nested group-array',
-            name: 'nested',
-            required: true,
-            type: 'group-array',
-            inputType: 'group-array',
-            jsonType: 'array',
-            fields: expect.any(Function),
-          },
-        ]);
-
-        expect(result.fields[0].fields()[1].fields()).toMatchObject([
-          {
-            type: 'text',
-            description: 'First nested text field',
-            maxLength: 255,
-            label: 'Inner Field 1',
-            name: 'nestedField1',
-            required: true,
-          },
-          {
-            type: 'text',
-            description: 'Second nested text field',
-            maxLength: 255,
-            label: 'Inner Field 2',
-            name: 'nestedField2',
-            required: true,
-          },
-        ]);
-      });
-
       it('can pass custom field attributes', () => {
         const result = createHeadlessForm(
           {

package/src/tests/helpers.js

@@ -2327,59 +2327,3 @@ export const schemaWithCustomValidationsAndConditionals = {
     },
   ],
 };
-
-export const nestedGroupArrayForm = {
-  items: {
-    properties: {
-      notNested: {
-        description: 'Simple text field',
-        'x-jsf-presentation': {
-          inputType: 'text',
-        },
-        title: 'Outer Field',
-        type: 'string',
-        maxLength: 255,
-      },
-      nested: {
-        items: {
-          properties: {
-            nestedField1: {
-              description: 'First nested text field',
-              'x-jsf-presentation': {
-                inputType: 'text',
-              },
-              title: 'Inner Field 1',
-              type: 'string',
-              maxLength: 255,
-            },
-            nestedField2: {
-              description: 'Second nested text field',
-              'x-jsf-presentation': {
-                inputType: 'text',
-              },
-              title: 'Inner Field 2',
-              type: 'string',
-              maxLength: 255,
-            },
-          },
-          'x-jsf-order': ['nestedField1', 'nestedField2'],
-          required: ['nestedField1', 'nestedField2'],
-          type: 'object',
-        },
-        'x-jsf-presentation': {
-          inputType: 'group-array',
-        },
-        title: 'Nested group-array',
-        type: 'array',
-      },
-    },
-    'x-jsf-order': ['notNested', 'nested'],
-    required: ['notNested', 'nested'],
-    type: 'object',
-  },
-  'x-jsf-presentation': {
-    inputType: 'group-array',
-  },
-  title: 'Parent object',
-  type: 'array',
-};