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

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 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-dev.20241127210659
+ Generated: Wed, 27 Nov 2024 21:07:13 GMT
 
  MIT License
 
@@ -481,7 +481,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 }) => {
@@ -1047,6 +1052,8 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
+        if (Array.isArray(item.var))
+          return;
         const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));

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-dev.20241127210659
+ Generated: Wed, 27 Nov 2024 21:07:13 GMT
 
  MIT License
 
@@ -444,7 +444,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 }) => {
@@ -1010,6 +1015,8 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
+        if (Array.isArray(item.var))
+          return;
         const exists = jsonLogic.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));

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-dev.20241127210659
+ Generated: Wed, 27 Nov 2024 21:07:13 GMT
 
  MIT License
 
@@ -11960,7 +11960,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 }) => {
@@ -12526,6 +12531,8 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
+        if (Array.isArray(item.var))
+          return;
         const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));

package/package.json

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

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,

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

@@ -36,6 +36,7 @@ import {
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
   badSchemaThatWillNotSetAForcedValue,
+  schemaWithReduceAccumulator,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -244,6 +245,22 @@ describe('jsonLogic: cross-values validations', () => {
     });
   });
 
+  describe('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({