@remoteoss/json-schema-form 0.11.12-dev.20250313084704 → 0.11.12-dev.20250411165200

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250313084704
- Generated: Thu, 13 Mar 2025 08:47:14 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -613,8 +613,6 @@ var getYupSchema = ({ inputType, ...field }) => {
     switch (type) {
       case "number":
         return yupSchemas.radioOrSelectNumber(optionValues);
-      case "integer":
-        return yupSchemas.radioOrSelectNumber(optionValues);
       case "boolean":
         return yupSchemas.radioOrSelectBoolean(optionValues);
       default:
@@ -775,8 +773,7 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
-  const hasOptions = field.options?.length > 0;
-  if (jsonType === "integer" && !hasOptions) {
+  if (jsonType === "integer") {
     validators.push(withInteger);
   }
   if (typeof propertyFields.minimum !== "undefined") {
@@ -1311,12 +1308,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1333,7 +1342,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -1343,7 +1353,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -1360,20 +1371,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -1388,6 +1385,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250313084704
- Generated: Thu, 13 Mar 2025 08:47:14 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -576,8 +576,6 @@ var getYupSchema = ({ inputType, ...field }) => {
     switch (type) {
       case "number":
         return yupSchemas.radioOrSelectNumber(optionValues);
-      case "integer":
-        return yupSchemas.radioOrSelectNumber(optionValues);
       case "boolean":
         return yupSchemas.radioOrSelectBoolean(optionValues);
       default:
@@ -738,8 +736,7 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
-  const hasOptions = field.options?.length > 0;
-  if (jsonType === "integer" && !hasOptions) {
+  if (jsonType === "integer") {
     validators.push(withInteger);
   }
   if (typeof propertyFields.minimum !== "undefined") {
@@ -1274,12 +1271,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1296,7 +1305,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -1306,7 +1316,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -1323,20 +1334,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -1351,6 +1348,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250313084704
- Generated: Thu, 13 Mar 2025 08:47:14 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.12-dev.20250411165200
+ Generated: Fri, 11 Apr 2025 16:52:23 GMT
 
  MIT License
 
@@ -12092,8 +12092,6 @@ var getYupSchema = ({ inputType, ...field }) => {
     switch (type) {
       case "number":
         return yupSchemas.radioOrSelectNumber(optionValues);
-      case "integer":
-        return yupSchemas.radioOrSelectNumber(optionValues);
       case "boolean":
         return yupSchemas.radioOrSelectBoolean(optionValues);
       default:
@@ -12254,8 +12252,7 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
-  const hasOptions = field.options?.length > 0;
-  if (jsonType === "integer" && !hasOptions) {
+  if (jsonType === "integer") {
     validators.push(withInteger);
   }
   if (typeof propertyFields.minimum !== "undefined") {
@@ -12790,12 +12787,24 @@ function processNode({
   formFields,
   accRequired = /* @__PURE__ */ new Set(),
   parentID = "root",
-  logic
+  logic,
+  processingConditional = false
 }) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const nestedNode = node.properties[fieldName];
+    const isFieldset = field.inputType === supportedTypes.FIELDSET;
+    if (isFieldset && processingConditional) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -12812,7 +12821,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
@@ -12822,7 +12832,8 @@ function processNode({
         formFields,
         accRequired: requiredFields,
         parentID,
-        logic
+        logic,
+        processingConditional: true
       });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
@@ -12839,20 +12850,6 @@ function processNode({
       });
     });
   }
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        logic
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
   if (node.properties) {
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
@@ -12867,6 +12864,20 @@ function processNode({
       }
     });
   }
+  if (node.allOf) {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
+      allOfItemRequired.forEach(requiredFields.add, requiredFields);
+    });
+  }
   if (node["x-jsf-logic"]) {
     const { required: requiredFromLogic } = processJSONLogicNode({
       node: node["x-jsf-logic"],

package/package.json

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

@@ -63,7 +63,7 @@ import {
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
   schemaInputTypeFile,
-  schemaWithSelectInteger,
+  schemaWithRootFieldsetsConditionals,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -658,27 +658,6 @@ describe('createHeadlessForm', () => {
           ],
         });
       });
-
-      it('supports "select" field with integer values', async () => {
-        const { handleValidation } = createHeadlessForm(schemaWithSelectInteger);
-        const validateForm = (vals) => friendlyError(handleValidation(vals));
-
-        // Check for invalid option
-        expect(
-          validateForm({
-            account_type: 4,
-          })
-        ).toEqual({
-          account_type: 'The option 4 is not valid.',
-        });
-
-        // Check for valid option
-        expect(
-          validateForm({
-            account_type: 1,
-          })
-        ).toBeUndefined();
-      });
     });
     describe('support "radio" field type', () => {
       it('support "radio" field type @deprecated', () => {
@@ -2184,6 +2163,47 @@ describe('createHeadlessForm', () => {
           ).toBeUndefined();
         });
       });
+
+      describe('supports root fieldsets conditionals', () => {
+        it('Given a basic retirement, the perks.has_pension is hidden', async () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithRootFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(validateForm({})).toEqual({
+            perks: {
+              retirement: 'Required field',
+            },
+          });
+
+          // has_pension is not visible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(false);
+
+          expect(
+            validateForm({
+              perks: { retirement: 'plus' },
+            })
+          ).toEqual({
+            perks: {
+              has_pension: 'Required field',
+            },
+          });
+
+          // field becomes visible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(true);
+
+          expect(
+            validateForm({
+              perks: { retirement: 'basic' },
+            })
+          ).toBeUndefined();
+
+          // field becomes invisible
+          expect(getField(fields, 'perks', 'has_pension').isVisible).toBe(false);
+        });
+      });
     });
 
     it('support "email" field type', () => {

package/src/tests/helpers.js

@@ -1973,6 +1973,90 @@ export const schemaWithConditionalToFieldset = {
   required: ['perks', 'work_hours_per_week'],
 };
 
+export const schemaWithRootFieldsetsConditionals = {
+  additionalProperties: false,
+  type: 'object',
+  properties: {
+    perks: {
+      additionalProperties: false,
+      properties: {
+        retirement: {
+          oneOf: [
+            {
+              const: 'basic',
+              title: 'Basic',
+            },
+            {
+              const: 'plus',
+              title: 'Plus',
+            },
+          ],
+          title: 'Retirement',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+        has_pension: {
+          oneOf: [
+            {
+              const: 'yes',
+              title: 'Yes',
+            },
+            {
+              const: 'no',
+              title: 'No',
+            },
+          ],
+          title: 'Has pension',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+      },
+      required: ['retirement'],
+      title: 'Perks',
+      type: 'object',
+      'x-jsf-presentation': {
+        inputType: 'fieldset',
+      },
+    },
+  },
+  required: ['perks'],
+  allOf: [
+    {
+      if: {
+        properties: {
+          perks: {
+            properties: {
+              retirement: {
+                const: 'basic',
+              },
+            },
+          },
+        },
+      },
+      then: {
+        properties: {
+          perks: {
+            properties: {
+              has_pension: false,
+            },
+          },
+        },
+      },
+      else: {
+        properties: {
+          perks: {
+            required: ['has_pension'],
+          },
+        },
+      },
+    },
+  ],
+};
+
 export const schemaWorkSchedule = {
   type: 'object',
   properties: {
@@ -2327,24 +2411,3 @@ export const schemaWithCustomValidationsAndConditionals = {
     },
   ],
 };
-
-export const schemaWithSelectInteger = {
-  additionalProperties: false,
-  type: 'object',
-  properties: {
-    account_type: {
-      title: 'Select an account type',
-      description: '',
-      'x-jsf-presentation': {
-        inputType: 'select',
-      },
-      oneOf: [
-        { title: 'Normal User', const: 0 },
-        { title: 'Business', const: 1 },
-        { title: 'Services Provider', const: 2 },
-      ],
-      type: 'integer',
-    },
-  },
-  required: [],
-};

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

@@ -34,6 +34,7 @@ import {
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
   badSchemaThatWillNotSetAForcedValue,
+  schemaWithReduceAccumulator,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -243,6 +244,23 @@ describe('jsonLogic: cross-values validations', () => {
     });
   });
 
+  // TODO: Implement this test.
+  describe.skip('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({