@remoteoss/json-schema-form 0.11.7-dev.20241120091537 → 0.11.9-beta.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+#### 0.11.9-beta.0 (2024-12-17)
+
+##### Bug Fixes
+
+*  Add support for boolean values in the if condition ([#100](https://github.com/remoteoss/json-schema-form/pull/100)) ([b3dca67d](https://github.com/remoteoss/json-schema-form/commit/b3dca67da14a7e4f5339a14a1e2f14ac014d2b92))
+
+#### 0.11.8-beta.0 (2024-11-20)
+
+##### Bug Fixes
+
+* **integer:**  support integer field type ([#11](https://github.com/remoteoss/json-schema-form/pull/11)) ([14f34971](https://github.com/remoteoss/json-schema-form/commit/14f349714ce7b294ae710801168b017692c659af))
+
+#### 0.11.7-beta.0 (2024-11-14)
+
+##### Bug Fixes
+
+* **validation:**  validate radio with string-y types; ([#94](https://github.com/remoteoss/json-schema-form/pull/94)) ([606913d8](https://github.com/remoteoss/json-schema-form/commit/606913d8412a02d9a38a43e903add58b8e11a7e4))
+
 #### 0.11.6-beta.0 (2024-10-15)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
- Generated: Wed, 20 Nov 2024 09:15:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-beta.0
+ Generated: Tue, 17 Dec 2024 08:59:12 GMT
 
  MIT License
 
@@ -98,6 +98,9 @@ function hasProperty(object2, propertyName) {
 
 // src/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];
@@ -481,7 +484,12 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (value) => validateRadioOrSelectOptions(value, options)
+      (castValue, { originalValue }) => {
+        if (castValue !== void 0 && typeof originalValue !== "string") {
+          return false;
+        }
+        return validateRadioOrSelectOptions(castValue, options);
+      }
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -1308,7 +1316,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
- Generated: Wed, 20 Nov 2024 09:15:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-beta.0
+ Generated: Tue, 17 Dec 2024 08:59:12 GMT
 
  MIT License
 
@@ -61,6 +61,9 @@ function hasProperty(object2, propertyName) {
 
 // src/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];
@@ -444,7 +447,12 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (value) => validateRadioOrSelectOptions(value, options)
+      (castValue, { originalValue }) => {
+        if (castValue !== void 0 && typeof originalValue !== "string") {
+          return false;
+        }
+        return validateRadioOrSelectOptions(castValue, options);
+      }
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -1271,7 +1279,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
- Generated: Wed, 20 Nov 2024 09:15:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-beta.0
+ Generated: Tue, 17 Dec 2024 08:59:12 GMT
 
  MIT License
 
@@ -11578,6 +11578,9 @@ function hasProperty(object2, propertyName) {
 
 // src/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];
@@ -11960,7 +11963,12 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (value) => validateRadioOrSelectOptions(value, options)
+      (castValue, { originalValue }) => {
+        if (castValue !== void 0 && typeof originalValue !== "string") {
+          return false;
+        }
+        return validateRadioOrSelectOptions(castValue, options);
+      }
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -12787,7 +12795,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/package.json

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

package/src/tests/checkIfConditionMatches.test.js

@@ -1,5 +1,13 @@
 import { checkIfConditionMatchesProperties } from '../checkIfConditionMatches';
 
+it('True if is always going to be true', () => {
+  expect(checkIfConditionMatchesProperties({ if: true })).toBe(true);
+});
+
+it('False if is always going to be false', () => {
+  expect(checkIfConditionMatchesProperties({ if: false })).toBe(false);
+});
+
 it('Empty if is always going to be true', () => {
   expect(checkIfConditionMatchesProperties({ if: { properties: {} } })).toBe(true);
 });

package/src/tests/conditions.test.js

@@ -479,3 +479,71 @@ describe('Conditional with a minimum value check', () => {
     expect(handleValidation({ salary: 1000, reason: 'reason_one' }).formErrors).toEqual(undefined);
   });
 });
+
+describe('Conditional with literal booleans', () => {
+  it('handles true case', () => {
+    const schema = {
+      properties: {
+        is_full_time: {
+          type: 'boolean',
+        },
+        salary: {
+          type: 'number',
+        },
+      },
+      required: [],
+      if: true,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
+      },
+    };
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: true,
+    });
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: false,
+    });
+  });
+
+  it('handles false case', () => {
+    const schema = {
+      properties: {
+        is_full_time: {
+          type: 'boolean',
+        },
+        salary: {
+          type: 'number',
+        },
+      },
+      required: [],
+      if: false,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
+      },
+    };
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: false,
+    });
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: true,
+    });
+  });
+});

package/src/tests/createHeadlessForm.test.js

@@ -9,6 +9,7 @@ import {
   schemaInputTypeText,
   schemaInputTypeRadioDeprecated,
   schemaInputTypeRadioString,
+  schemaInputTypeRadioStringY,
   schemaInputTypeRadioBoolean,
   schemaInputTypeRadioNumber,
   schemaInputTypeRadioRequiredAndOptional,
@@ -821,6 +822,45 @@ describe('createHeadlessForm', () => {
       });
     });
 
+    // @BUG COD-1859
+    // it should validate when type is string but value is not a boolean
+    it('support "radio" field string-y type', () => {
+      const { fields, handleValidation } = createHeadlessForm(schemaInputTypeRadioStringY);
+
+      const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+      expect(fields).toMatchObject([
+        {
+          description: 'Do you have any siblings?',
+          label: 'Has siblings',
+          name: 'has_siblings',
+          options: [
+            {
+              label: 'Yes',
+              value: 'true',
+            },
+            {
+              label: 'No',
+              value: 'false',
+            },
+          ],
+          required: true,
+          schema: expect.any(Object),
+          type: 'radio',
+        },
+      ]);
+
+      assertOptionsAllowed({
+        handleValidation,
+        fieldName: 'has_siblings',
+        validOptions: ['true', 'false'],
+      });
+
+      expect(validateForm({ has_siblings: false })).toEqual({
+        has_siblings: 'The option "false" is not valid.',
+      });
+    });
+
     it('support "radio" field number type', () => {
       const { fields, handleValidation } = createHeadlessForm(schemaInputTypeRadioNumber);
 

package/src/tests/helpers.js

@@ -163,6 +163,25 @@ export const mockRadioInputBoolean = {
   type: 'boolean',
 };
 
+export const mockRadioInputStringY = {
+  title: 'Has siblings',
+  description: 'Do you have any siblings?',
+  oneOf: [
+    {
+      title: 'Yes',
+      const: 'true',
+    },
+    {
+      title: 'No',
+      const: 'false',
+    },
+  ],
+  'x-jsf-presentation': {
+    inputType: 'radio',
+  },
+  type: 'string',
+};
+
 export const mockRadioInputNumber = {
   title: 'Number of siblings',
   description: 'How many siblings do you have?',
@@ -914,6 +933,13 @@ export const schemaInputTypeRadioString = {
   required: ['has_siblings'],
 };
 
+export const schemaInputTypeRadioStringY = {
+  properties: {
+    has_siblings: mockRadioInputStringY,
+  },
+  required: ['has_siblings'],
+};
+
 export const schemaInputTypeRadioBoolean = {
   properties: {
     over_18: mockRadioInputBoolean,