@remoteoss/json-schema-form 0.11.10-beta.0 → 0.11.11-beta.0

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.10-beta.0
- Generated: Wed, 22 Jan 2025 16:30:09 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.11-beta.0
+ Generated: Thu, 20 Feb 2025 18:25:18 GMT
 
  MIT License
 
@@ -101,6 +101,11 @@ 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];

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.10-beta.0
- Generated: Wed, 22 Jan 2025 16:30:09 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.11-beta.0
+ Generated: Thu, 20 Feb 2025 18:25:18 GMT
 
  MIT License
 
@@ -64,6 +64,11 @@ 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];

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.10-beta.0
- Generated: Wed, 22 Jan 2025 16:30:09 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.11-beta.0
+ Generated: Thu, 20 Feb 2025 18:25:18 GMT
 
  MIT License
 
@@ -11581,6 +11581,11 @@ 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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.10-beta.0",
+  "version": "0.11.11-beta.0",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",
@@ -32,11 +32,14 @@
     "format:prettier": "prettier --write \"src/**/*.{js,ts}\"",
     "prettier:check": "prettier --check \"src/**/*.{js,ts}\"",
     "check:pr-version": "node scripts/pr_dev_version",
+    "check:pr-next-version": "node scripts/pr_next_dev_version",
     "release:local": "node scripts/release_local",
     "release:dev:patch": "node scripts/release_dev patch",
     "release:dev:minor": "node scripts/release_dev minor",
     "release:main:patch": "node scripts/release_main patch",
     "release:main:minor": "node scripts/release_main minor",
+    "release:v1:dev": "node scripts/release_v1 dev",
+    "release:v1:beta": "node scripts/release_v1 beta",
     "version_as_main": "node scripts/version_as_main.js",
     "psrepublishOnly": "if [[ ! $PWD =~ scripts$ ]]; then npm run publish:nopublish; fi",
     "psublish:nopublish": "echo 'Use `npm release:*` script instead && exit 1"
@@ -57,6 +60,7 @@
     "@babel/eslint-parser": "^7.25.9",
     "@babel/preset-env": "^7.21.5",
     "babel-jest": "^29.5.0",
+    "babel-plugin-module-resolver": "^5.0.2",
     "child-process-promise": "^2.2.1",
     "esbuild": "^0.17.15",
     "eslint": "^7.32.0",

package/src/tests/checkIfConditionMatches.test.js

@@ -1,4 +1,4 @@
-import { checkIfConditionMatchesProperties } from '../internals/checkIfConditionMatches';
+import { checkIfConditionMatchesProperties } from '@/internals/checkIfConditionMatches';
 
 describe('checkIfConditionMatchesProperties()', () => {
   it('True if is always going to be true', () => {

package/src/tests/conditions.test.js

@@ -1,4 +1,4 @@
-import { createHeadlessForm } from '../createHeadlessForm';
+import { createHeadlessForm } from '@/createHeadlessForm';
 
 describe('Conditional attributes updated', () => {
   it('Should allow check of a nested property in a conditional', () => {
@@ -548,6 +548,54 @@ 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('Conditionals - bugs and code-smells', () => {
   // Why do we have these bugs?
   // To be honest we never realized it much later later.

package/src/tests/const.test.js

@@ -1,4 +1,4 @@
-import { createHeadlessForm } from '../createHeadlessForm';
+import { createHeadlessForm } from '@/createHeadlessForm';
 
 describe('validations: const', () => {
   it('Should work for number', () => {

package/src/tests/createHeadlessForm.customValidations.test.js

@@ -1,9 +1,8 @@
 import merge from 'lodash/fp/merge';
 
-import { createHeadlessForm } from '../createHeadlessForm';
-
 import { JSONSchemaBuilder, mockFieldset, mockRadioInputString } from './helpers';
 import { mockMoneyInput } from './helpers.custom';
+import { createHeadlessForm } from '@/createHeadlessForm';
 
 function friendlyError({ formErrors }) {
   // destruct the formErrors directly

package/src/tests/createHeadlessForm.test.js

@@ -2,8 +2,6 @@ import isNil from 'lodash/isNil';
 import omitBy from 'lodash/omitBy';
 import { object } from 'yup';
 
-import { createHeadlessForm } from '../createHeadlessForm';
-
 import {
   JSONSchemaBuilder,
   schemaInputTypeText,
@@ -67,6 +65,7 @@ import {
   schemaInputTypeFile,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
+import { createHeadlessForm } from '@/createHeadlessForm';
 
 function buildJSONSchemaInput({ presentationFields, inputFields = {}, required }) {
   return {

package/src/tests/internals.helpers.test.js

@@ -1,7 +1,7 @@
 import * as Yup from 'yup';
 
-import { yupToFormErrors } from '../helpers';
-import { getFieldDescription, pickXKey } from '../internals/helpers';
+import { yupToFormErrors } from '@/helpers';
+import { getFieldDescription, pickXKey } from '@/internals/helpers';
 
 describe('getFieldDescription()', () => {
   it('returns no description', () => {

package/src/tests/jsonLogic.test.js

@@ -1,5 +1,3 @@
-import { createHeadlessForm } from '../createHeadlessForm';
-
 import {
   createSchemaWithRulesOnFieldA,
   createSchemaWithThreePropertiesWithRuleOnFieldA,
@@ -38,6 +36,7 @@ import {
   badSchemaThatWillNotSetAForcedValue,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
+import { createHeadlessForm } from '@/createHeadlessForm';
 
 beforeEach(mockConsole);
 afterEach(restoreConsoleAndEnsureItWasNotCalled);

package/src/tests/modify.test.js

@@ -1,4 +1,4 @@
-import { modify } from '../modify';
+import { modify } from '@/modify';
 
 const schemaPet = {
   type: 'object',

package/src/tests/utils.test.jsx

@@ -1,4 +1,4 @@
-import { convertDiskSizeFromTo } from '../utils';
+import { convertDiskSizeFromTo } from '@/utils';
 
 describe('convertDiskSizeFromTo()', () => {
   it('should convert bytes to KB', () => {