@remoteoss/json-schema-form 0.11.11-dev.20250220164730 → 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.20250220164730
- Generated: Thu, 20 Feb 2025 16:47:52 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -96,75 +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;
-  }
-  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"));
@@ -424,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"));
 

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.11-dev.20250220164730
- Generated: Thu, 20 Feb 2025 16:47:52 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -59,75 +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;
-  }
-  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";
@@ -387,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";
 

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.11-dev.20250220164730
- Generated: Thu, 20 Feb 2025 16:47:52 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250310202108
+ Generated: Mon, 10 Mar 2025 20:22:24 GMT
 
  MIT License
 
@@ -11576,75 +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;
-  }
-  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());
@@ -11904,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());
 

package/package.json

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

@@ -549,78 +549,118 @@ describe('Conditional with literal booleans', () => {
 });
 
 describe('Conditional with anyOf', () => {
-  it('handles true case', () => {
-    const { fields, handleValidation } = createHeadlessForm(
+  const schema = {
+    additionalProperties: false,
+    type: 'object',
+    properties: {
+      field_a: { type: 'string' },
+      field_b: { type: 'string' },
+      field_c: { type: 'string' },
+    },
+    allOf: [
       {
-        additionalProperties: false,
-        type: 'object',
-        properties: {
-          field_a: { type: 'string' },
-          field_b: { type: 'string' },
-          field_c: { type: 'string' },
+        if: {
+          anyOf: [
+            { properties: { field_a: { const: '1' } }, required: ['field_a'] },
+            { properties: { field_b: { const: '2' } }, required: ['field_b'] },
+          ],
         },
-        allOf: [
-          {
-            if: {
-              anyOf: [
-                { properties: { field_a: { const: '1' } }, required: ['a'] },
-                { properties: { field_b: { const: '2' } }, required: ['b'] },
-              ],
-            },
-            then: {
-              required: ['field_c'],
-            },
-            else: {
-              properties: {
-                field_c: false,
-              },
-            },
+        then: {
+          required: ['field_c'],
+        },
+        else: {
+          properties: {
+            field_c: false,
           },
-        ],
+        },
       },
-      { strictInputType: false }
-    );
+    ],
+  };
+
+  it('handles true case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
 
-    expect(handleValidation({ field_a: '4', field_b: '2' }).formErrors).toEqual({
+    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(
-      {
-        additionalProperties: false,
+    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: {
-          field_a: { type: 'string' },
-          field_b: { type: 'string' },
-          field_c: { type: 'string' },
+          min: { type: 'number' },
+          max: { type: 'number' },
         },
-        allOf: [
-          {
-            if: {
-              anyOf: [
-                { properties: { field_a: { const: '1' } }, required: ['a'] },
-                { properties: { field_b: { const: '2' } }, required: ['b'] },
-              ],
-            },
-            then: {
-              required: ['field_c'],
-            },
-            else: {
+      },
+      field_b: { type: 'string' },
+    },
+    allOf: [
+      {
+        if: {
+          properties: {
+            field_a: {
               properties: {
-                field_c: false,
+                min: {
+                  minimum: 10,
+                },
               },
+              required: ['min'],
             },
           },
-        ],
+          required: ['field_a'],
+        },
+        then: {
+          required: ['field_b'],
+        },
+        else: {
+          properties: {
+            field_b: false,
+          },
+        },
       },
-      { strictInputType: false }
-    );
+    ],
+  };
 
-    expect(handleValidation({ field_a: '4', field_b: '4' }).formErrors).toBeUndefined();
-    expect(fields[2].isVisible).toBe(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);
   });
 });