@remoteoss/json-schema-form 0.12.0-beta.0 → 0.12.1-dev.20250929100600

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2025 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.12.0-beta.0
- Generated: Wed, 25 Jun 2025 12:45:39 GMT
+ NPM Package: @remoteoss/json-schema-form@0.12.1-dev.20250929100600
+ Generated: Mon, 29 Sep 2025 10:07:37 GMT
 
  MIT License
 
@@ -27,6 +27,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 */ 
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -736,9 +737,7 @@ function buildYupSchema(field, config, logic) {
     const fieldSetShape = {};
     innerFields.forEach((fieldSetfield) => {
       if (fieldSetfield.fields) {
-        fieldSetShape[fieldSetfield.name] = (0, import_yup.object)().shape(
-          buildFieldSetSchema(fieldSetfield.fields)
-        );
+        fieldSetShape[fieldSetfield.name] = (0, import_yup.object)().shape(buildFieldSetSchema(fieldSetfield.fields)).nullable();
       } else {
         fieldSetShape[fieldSetfield.name] = buildYupSchema(
           {
@@ -1065,20 +1064,26 @@ function validateInlineRules(jsonSchema, sampleEmptyObject) {
     });
   });
 }
-function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`) {
+function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`, inReduceOrMap = false) {
   Object.entries(rule ?? {}).map(([operator, subRule]) => {
     if (!Array.isArray(subRule) && subRule !== null && subRule !== void 0)
       return;
     throwIfUnknownOperator(operator, subRule, id);
+    const isReduceOrMap = inReduceOrMap || operator === "reduce" || operator === "map";
+    const validationData = isReduceOrMap ? {
+      ...data,
+      accumulator: 0,
+      current: null
+    } : data;
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
+        const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, validationData);
         if (exists === null) {
           throw Error(errorMessage(item));
         }
       } else {
-        checkRuleIntegrity(item, id, data);
+        checkRuleIntegrity(item, id, data, errorMessage, isReduceOrMap);
       }
     });
   });
@@ -1259,6 +1264,30 @@ function getPrefillValues(fields, initialValues = {}) {
   });
   return initialValues;
 }
+function preserveNestedFieldsVisibility(field, parentPath = "") {
+  return field.fields?.reduce?.((acc, f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    if (!(0, import_isNil.default)(f.isVisible)) {
+      acc[path] = f.isVisible;
+    }
+    if (f.fields) {
+      Object.assign(acc, preserveNestedFieldsVisibility(f, path));
+    }
+    return acc;
+  }, {});
+}
+function restoreNestedFieldsVisibility(field, nestedFieldsVisibility, parentPath = "") {
+  field.fields.forEach((f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    const visibility = (0, import_get2.default)(nestedFieldsVisibility, path);
+    if (!(0, import_isNil.default)(visibility)) {
+      f.isVisible = visibility;
+    }
+    if (f.fields) {
+      restoreNestedFieldsVisibility(f, nestedFieldsVisibility, path);
+    }
+  });
+}
 function updateField(field, requiredFields, node, formValues, logic, config) {
   if (!field) {
     return;
@@ -1270,9 +1299,13 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   if (fieldIsRequired) {
     field.isVisible = true;
   }
+  const nestedFieldsVisibility = preserveNestedFieldsVisibility(field);
   const updateAttributes = (fieldAttrs) => {
     Object.entries(fieldAttrs).forEach(([key, value]) => {
       field[key] = value;
+      if (key === "fields" && !(0, import_isNil.default)(nestedFieldsVisibility)) {
+        restoreNestedFieldsVisibility(field, nestedFieldsVisibility);
+      }
       if (key === "schema" && typeof value === "function") {
         field[key] = value();
       }
@@ -1324,9 +1357,19 @@ function processNode({
   logic
 }) {
   const requiredFields = new Set(accRequired);
-  Object.keys(node.properties ?? []).forEach((fieldName) => {
+  Object.entries(node.properties ?? []).forEach(([fieldName, nestedNode]) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const isFieldset = field?.inputType === supportedTypes.FIELDSET;
+    if (isFieldset) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1384,20 +1427,6 @@ function processNode({
       allOfItemRequired.forEach(requiredFields.add, requiredFields);
     });
   }
-  if (node.properties) {
-    Object.entries(node.properties).forEach(([name, nestedNode]) => {
-      const inputType = getInputType(nestedNode);
-      if (inputType === supportedTypes.FIELDSET) {
-        processNode({
-          node: nestedNode,
-          formValues: formValues[name] || {},
-          formFields: getField(name, formFields).fields,
-          parentID: name,
-          logic
-        });
-      }
-    });
-  }
   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.12.0-beta.0
- Generated: Wed, 25 Jun 2025 12:45:39 GMT
+ NPM Package: @remoteoss/json-schema-form@0.12.1-dev.20250929100600
+ Generated: Mon, 29 Sep 2025 10:07:37 GMT
 
  MIT License
 
@@ -699,9 +699,7 @@ function buildYupSchema(field, config, logic) {
     const fieldSetShape = {};
     innerFields.forEach((fieldSetfield) => {
       if (fieldSetfield.fields) {
-        fieldSetShape[fieldSetfield.name] = object().shape(
-          buildFieldSetSchema(fieldSetfield.fields)
-        );
+        fieldSetShape[fieldSetfield.name] = object().shape(buildFieldSetSchema(fieldSetfield.fields)).nullable();
       } else {
         fieldSetShape[fieldSetfield.name] = buildYupSchema(
           {
@@ -1028,20 +1026,26 @@ function validateInlineRules(jsonSchema, sampleEmptyObject) {
     });
   });
 }
-function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`) {
+function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`, inReduceOrMap = false) {
   Object.entries(rule ?? {}).map(([operator, subRule]) => {
     if (!Array.isArray(subRule) && subRule !== null && subRule !== void 0)
       return;
     throwIfUnknownOperator(operator, subRule, id);
+    const isReduceOrMap = inReduceOrMap || operator === "reduce" || operator === "map";
+    const validationData = isReduceOrMap ? {
+      ...data,
+      accumulator: 0,
+      current: null
+    } : data;
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        const exists = jsonLogic.apply({ var: removeIndicesFromPath(item.var) }, data);
+        const exists = jsonLogic.apply({ var: removeIndicesFromPath(item.var) }, validationData);
         if (exists === null) {
           throw Error(errorMessage(item));
         }
       } else {
-        checkRuleIntegrity(item, id, data);
+        checkRuleIntegrity(item, id, data, errorMessage, isReduceOrMap);
       }
     });
   });
@@ -1222,6 +1226,30 @@ function getPrefillValues(fields, initialValues = {}) {
   });
   return initialValues;
 }
+function preserveNestedFieldsVisibility(field, parentPath = "") {
+  return field.fields?.reduce?.((acc, f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    if (!isNil(f.isVisible)) {
+      acc[path] = f.isVisible;
+    }
+    if (f.fields) {
+      Object.assign(acc, preserveNestedFieldsVisibility(f, path));
+    }
+    return acc;
+  }, {});
+}
+function restoreNestedFieldsVisibility(field, nestedFieldsVisibility, parentPath = "") {
+  field.fields.forEach((f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    const visibility = get2(nestedFieldsVisibility, path);
+    if (!isNil(visibility)) {
+      f.isVisible = visibility;
+    }
+    if (f.fields) {
+      restoreNestedFieldsVisibility(f, nestedFieldsVisibility, path);
+    }
+  });
+}
 function updateField(field, requiredFields, node, formValues, logic, config) {
   if (!field) {
     return;
@@ -1233,9 +1261,13 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   if (fieldIsRequired) {
     field.isVisible = true;
   }
+  const nestedFieldsVisibility = preserveNestedFieldsVisibility(field);
   const updateAttributes = (fieldAttrs) => {
     Object.entries(fieldAttrs).forEach(([key, value]) => {
       field[key] = value;
+      if (key === "fields" && !isNil(nestedFieldsVisibility)) {
+        restoreNestedFieldsVisibility(field, nestedFieldsVisibility);
+      }
       if (key === "schema" && typeof value === "function") {
         field[key] = value();
       }
@@ -1287,9 +1319,19 @@ function processNode({
   logic
 }) {
   const requiredFields = new Set(accRequired);
-  Object.keys(node.properties ?? []).forEach((fieldName) => {
+  Object.entries(node.properties ?? []).forEach(([fieldName, nestedNode]) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const isFieldset = field?.inputType === supportedTypes.FIELDSET;
+    if (isFieldset) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -1347,20 +1389,6 @@ function processNode({
       allOfItemRequired.forEach(requiredFields.add, requiredFields);
     });
   }
-  if (node.properties) {
-    Object.entries(node.properties).forEach(([name, nestedNode]) => {
-      const inputType = getInputType(nestedNode);
-      if (inputType === supportedTypes.FIELDSET) {
-        processNode({
-          node: nestedNode,
-          formValues: formValues[name] || {},
-          formFields: getField(name, formFields).fields,
-          parentID: name,
-          logic
-        });
-      }
-    });
-  }
   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.12.0-beta.0
- Generated: Wed, 25 Jun 2025 12:45:39 GMT
+ NPM Package: @remoteoss/json-schema-form@0.12.1-dev.20250929100600
+ Generated: Mon, 29 Sep 2025 10:07:37 GMT
 
  MIT License
 
@@ -12215,9 +12215,7 @@ function buildYupSchema(field, config, logic) {
     const fieldSetShape = {};
     innerFields.forEach((fieldSetfield) => {
       if (fieldSetfield.fields) {
-        fieldSetShape[fieldSetfield.name] = ObjectSchema().shape(
-          buildFieldSetSchema(fieldSetfield.fields)
-        );
+        fieldSetShape[fieldSetfield.name] = ObjectSchema().shape(buildFieldSetSchema(fieldSetfield.fields)).nullable();
       } else {
         fieldSetShape[fieldSetfield.name] = buildYupSchema(
           {
@@ -12544,20 +12542,26 @@ function validateInlineRules(jsonSchema, sampleEmptyObject) {
     });
   });
 }
-function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`) {
+function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-schema-form] json-logic error: rule "${id}" has no variable "${item.var}".`, inReduceOrMap = false) {
   Object.entries(rule ?? {}).map(([operator, subRule]) => {
     if (!Array.isArray(subRule) && subRule !== null && subRule !== void 0)
       return;
     throwIfUnknownOperator(operator, subRule, id);
+    const isReduceOrMap = inReduceOrMap || operator === "reduce" || operator === "map";
+    const validationData = isReduceOrMap ? {
+      ...data,
+      accumulator: 0,
+      current: null
+    } : data;
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
+        const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, validationData);
         if (exists === null) {
           throw Error(errorMessage(item));
         }
       } else {
-        checkRuleIntegrity(item, id, data);
+        checkRuleIntegrity(item, id, data, errorMessage, isReduceOrMap);
       }
     });
   });
@@ -12738,6 +12742,30 @@ function getPrefillValues(fields, initialValues = {}) {
   });
   return initialValues;
 }
+function preserveNestedFieldsVisibility(field, parentPath = "") {
+  return field.fields?.reduce?.((acc, f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    if (!(0, import_isNil.default)(f.isVisible)) {
+      acc[path] = f.isVisible;
+    }
+    if (f.fields) {
+      Object.assign(acc, preserveNestedFieldsVisibility(f, path));
+    }
+    return acc;
+  }, {});
+}
+function restoreNestedFieldsVisibility(field, nestedFieldsVisibility, parentPath = "") {
+  field.fields.forEach((f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    const visibility = (0, import_get3.default)(nestedFieldsVisibility, path);
+    if (!(0, import_isNil.default)(visibility)) {
+      f.isVisible = visibility;
+    }
+    if (f.fields) {
+      restoreNestedFieldsVisibility(f, nestedFieldsVisibility, path);
+    }
+  });
+}
 function updateField(field, requiredFields, node, formValues, logic, config) {
   if (!field) {
     return;
@@ -12749,9 +12777,13 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   if (fieldIsRequired) {
     field.isVisible = true;
   }
+  const nestedFieldsVisibility = preserveNestedFieldsVisibility(field);
   const updateAttributes = (fieldAttrs) => {
     Object.entries(fieldAttrs).forEach(([key, value]) => {
       field[key] = value;
+      if (key === "fields" && !(0, import_isNil.default)(nestedFieldsVisibility)) {
+        restoreNestedFieldsVisibility(field, nestedFieldsVisibility);
+      }
       if (key === "schema" && typeof value === "function") {
         field[key] = value();
       }
@@ -12803,9 +12835,19 @@ function processNode({
   logic
 }) {
   const requiredFields = new Set(accRequired);
-  Object.keys(node.properties ?? []).forEach((fieldName) => {
+  Object.entries(node.properties ?? []).forEach(([fieldName, nestedNode]) => {
     const field = getField(fieldName, formFields);
     updateField(field, requiredFields, node, formValues, logic, { parentID });
+    const isFieldset = field?.inputType === supportedTypes.FIELDSET;
+    if (isFieldset) {
+      processNode({
+        node: nestedNode,
+        formValues: formValues[fieldName] || {},
+        formFields: field.fields,
+        parentID,
+        logic
+      });
+    }
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
@@ -12863,20 +12905,6 @@ function processNode({
       allOfItemRequired.forEach(requiredFields.add, requiredFields);
     });
   }
-  if (node.properties) {
-    Object.entries(node.properties).forEach(([name, nestedNode]) => {
-      const inputType = getInputType(nestedNode);
-      if (inputType === supportedTypes.FIELDSET) {
-        processNode({
-          node: nestedNode,
-          formValues: formValues[name] || {},
-          formFields: getField(name, formFields).fields,
-          parentID: name,
-          logic
-        });
-      }
-    });
-  }
   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.12.0-beta.0",
+  "version": "0.12.1-dev.20250929100600",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",
@@ -27,26 +27,23 @@
     "test:watch": "jest --watchAll",
     "lint": "eslint \"src/**/*.{js,ts}\"",
     "format": "npm run format:prettier && npm run format:eslint",
-    "prepare": "husky install",
+    "prepare": "cd .. && husky install",
     "format:eslint": "eslint --fix \"src/**/*.{js,ts}\"",
     "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"
   },
   "lint-staged": {
     "*.{js,jsx}": [
-      "npm run format"
+      "npm run format --prefix ./v0"
     ]
   },
   "dependencies": {

package/src/tests/createHeadlessForm.test.js

@@ -63,6 +63,7 @@ import {
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
   schemaInputTypeFile,
+  schemaWithNestedFieldsetsConditionals,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 import { createHeadlessForm } from '@/createHeadlessForm';
@@ -2200,6 +2201,112 @@ describe('createHeadlessForm', () => {
           ).toBeUndefined();
         });
       });
+
+      describe('supports conditionals over nested fieldsets', () => {
+        it('retirement_plan fieldset is hidden when no values are provided', () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithNestedFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(getField(fields, 'perks', 'retirement_plan').isVisible).toBe(false);
+
+          expect(validateForm({ perks: {} })).toEqual({
+            perks: {
+              benefits_package: 'Required field',
+              has_retirement_plan: 'Required field',
+            },
+          });
+
+          expect(getField(fields, 'perks', 'retirement_plan').isVisible).toBe(false);
+        });
+
+        it("submits without retirement_plan when user selects 'no' for has_retirement_plan", () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithNestedFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(
+            validateForm({ perks: { benefits_package: 'basic', has_retirement_plan: 'no' } })
+          ).toBeUndefined();
+
+          expect(getField(fields, 'perks', 'retirement_plan').isVisible).toBe(false);
+        });
+
+        it("retirement_plan fieldset is visible when user selects 'yes' for has_retirement_plan", () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithNestedFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(
+            validateForm({
+              perks: {
+                benefits_package: 'basic',
+                has_retirement_plan: 'yes',
+                declare_amount: 'yes',
+                retirement_plan: { plan_name: 'test', year: 2025 },
+              },
+            })
+          ).toEqual({
+            perks: {
+              retirement_plan: {
+                amount: 'Required field',
+              },
+            },
+          });
+
+          expect(getField(fields, 'perks', 'retirement_plan').isVisible).toBe(true);
+          expect(getField(fields, 'perks', 'declare_amount').isVisible).toBe(true);
+          expect(getField(fields, 'perks', 'declare_amount').default).toBe('yes');
+          expect(getField(fields, 'perks', 'retirement_plan', 'amount').isVisible).toBe(true);
+        });
+
+        it("retirement_plan's amount field is hidden when user selects 'no' for declare_amount", () => {
+          const { fields, handleValidation } = createHeadlessForm(
+            schemaWithNestedFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(
+            validateForm({
+              perks: {
+                benefits_package: 'basic',
+                has_retirement_plan: 'yes',
+                declare_amount: 'no',
+                retirement_plan: { plan_name: 'test', year: 2025 },
+              },
+            })
+          ).toBeUndefined();
+
+          expect(getField(fields, 'perks', 'retirement_plan').isVisible).toBe(true);
+          expect(getField(fields, 'perks', 'declare_amount').isVisible).toBe(true);
+          expect(getField(fields, 'perks', 'retirement_plan', 'amount').isVisible).toBe(false);
+        });
+
+        it('submits with valid retirement_plan', async () => {
+          const { handleValidation } = createHeadlessForm(
+            schemaWithNestedFieldsetsConditionals,
+            {}
+          );
+          const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+          expect(
+            validateForm({
+              perks: {
+                benefits_package: 'plus',
+                has_retirement_plan: 'yes',
+                retirement_plan: { plan_name: 'test', year: 2025, amount: 1000 },
+              },
+            })
+          ).toBeUndefined();
+        });
+      });
     });
 
     it('support "email" field type', () => {

package/src/tests/helpers.js

@@ -1939,7 +1939,6 @@ export const schemaWithConditionalToFieldset = {
       then: {
         properties: {
           pto: {
-            $comment: '@BUG: This description does not disappear once activated.',
             description: 'Above 30 hours, the PTO needs to be at least 20 days.',
             minimum: 20,
           },
@@ -1972,6 +1971,178 @@ export const schemaWithConditionalToFieldset = {
   required: ['perks', 'work_hours_per_week'],
 };
 
+export const schemaWithNestedFieldsetsConditionals = {
+  additionalProperties: false,
+  type: 'object',
+  properties: {
+    perks: {
+      additionalProperties: false,
+      properties: {
+        benefits_package: {
+          oneOf: [
+            {
+              const: 'basic',
+              title: 'Basic',
+            },
+            {
+              const: 'plus',
+              title: 'Plus',
+            },
+          ],
+          title: 'Benefits package',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+        has_retirement_plan: {
+          oneOf: [
+            {
+              const: 'yes',
+              title: 'Yes',
+            },
+            {
+              const: 'no',
+              title: 'No',
+            },
+          ],
+          title: 'Has retirement plan?',
+          type: 'string',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+        declare_amount: {
+          oneOf: [
+            {
+              const: 'yes',
+              title: 'Yes',
+            },
+            {
+              const: 'no',
+              title: 'No',
+            },
+          ],
+          title: 'Declare retirement amount?',
+          type: 'string',
+          default: 'yes',
+          'x-jsf-presentation': {
+            inputType: 'radio',
+          },
+        },
+        retirement_plan: {
+          type: 'object',
+          title: 'Retirement plan',
+          properties: {
+            plan_name: {
+              type: 'string',
+              title: 'Plan name',
+            },
+            year: {
+              type: 'number',
+              title: 'Year',
+            },
+            amount: {
+              type: 'number',
+              title: 'Amount',
+            },
+          },
+          required: ['plan_name', 'year'],
+          'x-jsf-presentation': {
+            inputType: 'fieldset',
+          },
+        },
+      },
+      required: ['benefits_package', 'has_retirement_plan'],
+      title: 'Perks',
+      type: 'object',
+      'x-jsf-presentation': {
+        inputType: 'fieldset',
+      },
+    },
+  },
+  allOf: [
+    {
+      if: {
+        properties: {
+          perks: {
+            properties: {
+              has_retirement_plan: {
+                const: 'no',
+              },
+            },
+          },
+        },
+      },
+      then: {
+        properties: {
+          perks: {
+            properties: {
+              retirement_plan: false,
+              declare_amount: false,
+            },
+          },
+        },
+      },
+    },
+    {
+      if: {
+        properties: {
+          perks: {
+            properties: {
+              declare_amount: {
+                const: 'no',
+              },
+            },
+            required: ['declare_amount'],
+          },
+        },
+      },
+      then: {
+        properties: {
+          perks: {
+            properties: {
+              retirement_plan: {
+                properties: {
+                  amount: false,
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    {
+      if: {
+        properties: {
+          perks: {
+            properties: {
+              has_retirement_plan: {
+                const: 'yes',
+              },
+              declare_amount: {
+                const: 'yes',
+              },
+            },
+            required: ['has_retirement_plan', 'declare_amount'],
+          },
+        },
+      },
+      then: {
+        properties: {
+          perks: {
+            properties: {
+              retirement_plan: {
+                required: ['amount'],
+              },
+            },
+          },
+        },
+      },
+    },
+  ],
+};
+
 export const schemaWorkSchedule = {
   type: 'object',
   properties: {

package/src/tests/jsonLogic.fixtures.js

@@ -1061,7 +1061,7 @@ export const schemaWithReduceAccumulator = {
       type: 'number',
       'x-jsf-logic-computedAttrs': {
         const: 'computed_work_hours_per_week',
-        defaultValue: 'computed_work_hours_per_week',
+        default: 'computed_work_hours_per_week',
         title: '{{computed_work_hours_per_week}} hours per week',
       },
     },
@@ -1073,7 +1073,7 @@ export const schemaWithReduceAccumulator = {
           '*': [
             { var: 'working_hours_per_day' },
             {
-              reduce: [{ var: 'work_days' }, { '+': [{ var: ['accumulator', 0] }, 1] }, 0],
+              reduce: [{ var: 'work_days' }, { '+': [{ var: 'accumulator' }, 1] }, 0],
             },
           ],
         },
@@ -1081,3 +1081,51 @@ export const schemaWithReduceAccumulator = {
     },
   },
 };
+
+export const schemaWithReduceAccumulatorAndMerge = {
+  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',
+        default: 'computed_work_hours_per_week',
+        title: '{{computed_work_hours_per_week}} hours per week',
+      },
+    },
+  },
+  'x-jsf-logic': {
+    computedValues: {
+      computed_work_hours_per_week: {
+        rule: {
+          reduce: [
+            { var: 'work_days' },
+            { merge: [{ var: 'accumulator' }, [{ var: 'current' }]] },
+            // note we use the wrong accumulator type
+            0,
+          ],
+        },
+      },
+    },
+  },
+};

package/src/tests/jsonLogic.test.js

@@ -35,6 +35,7 @@ import {
   schemaWithValidationThatDoesNotExistOnProperty,
   badSchemaThatWillNotSetAForcedValue,
   schemaWithReduceAccumulator,
+  schemaWithReduceAccumulatorAndMerge,
   schemaWithComputedPresentationAttributes,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
@@ -245,8 +246,7 @@ describe('jsonLogic: cross-values validations', () => {
     });
   });
 
-  // TODO: Implement this test.
-  describe.skip('Reduce', () => {
+  describe('Reduce', () => {
     it('reduce: working_hours_per_day * work_days', () => {
       const { fields, handleValidation } = createHeadlessForm(schemaWithReduceAccumulator, {
         strictInputType: false,
@@ -260,6 +260,18 @@ describe('jsonLogic: cross-values validations', () => {
       expect(field.default).toEqual(16);
       expect(field.label).toEqual('16 hours per week');
     });
+
+    it('reduce: handles when operator is non numerical', () => {
+      const { fields, handleValidation } = createHeadlessForm(schemaWithReduceAccumulatorAndMerge, {
+        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([0, 'monday', 'tuesday']);
+    });
   });
 
   describe('Logical: ||, &&', () => {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Remote Technology, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/README.md

@@ -1,44 +0,0 @@
-<p align="center">
-<img src=".github/media/jsf_logo_dark.png"  width="600" alt="json-schema-form">
-</p>
-
-<p align="center">
-  <code>json-schema-form</code> is a headless UI form library powered by <a href="https://json-schema.org/">JSON Schemas</a>. 
-<br/>
-  It transforms JSON schemas into Javascript `fields` to be more easily consumed by your UI libraries.
-</p>
-
----
-
-### Why JSON Schemas for forms?
-
-JSON Schemas are the SSoT (Single Source of Truth) that allows you to share form's data _structure_ and _validations_ between the server (backend) and the client (frontend), regardless of the language used.
-
-You can use it beyond UI Forms, like lists, tables, and any other UI that needs structured JSON data.
-
-## Installation
-
-Available on [NPM](https://www.npmjs.com/package/@remoteoss/json-schema-form).
-
-```bash
-npm install @remoteoss/json-schema-form
-# or
-
-yarn install @remoteoss/json-schema-form
-```
-
-## Getting Started
-
-Check the 📚 **[JSF website](https://json-schema-form.vercel.app/)** for documentation.
-
-### Playground
-
-Check the 🕹️ **[JSF Playground](https://json-schema-form.vercel.app/?path=/docs/playground--docs)** for demos.
-
-## Contributing
-
-Read [CONTRIBUTING](CONTRIBUTING.md) to get started.
-
-We are working on the [next version v1.0](/next). A rewrite in TypeScript with major bugfixes and missing features. It aims to support the latest JSON Schema dialect 2020-12.
-
-_Backed by [Remote.com](https://remote.com/)_

package/json-schema-form.schema.json

@@ -1,188 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "JSON json-schema-form-Schema",
-  "definitions": {
-    "schemaArray": {
-      "allOf": [
-        {
-          "$ref": "http://json-schema.org/draft-07/schema#/definitions/schemaArray"
-        },
-        {
-          "items": { "$ref": "#" }
-        }
-      ]
-    }
-  },
-  "allOf": [{ "$ref": "http://json-schema.org/draft-07/schema#" }],
-  "properties": {
-    "additionalItems": { "$ref": "#" },
-    "additionalProperties": { "$ref": "#" },
-    "dependencies": {
-      "additionalProperties": {
-        "anyOf": [{ "$ref": "#" }, { "type": "array" }]
-      }
-    },
-    "items": {
-      "anyOf": [{ "$ref": "#" }, { "$ref": "#/definitions/schemaArray" }]
-    },
-    "definitions": {
-      "additionalProperties": { "$ref": "#" }
-    },
-    "patternProperties": {
-      "additionalProperties": { "$ref": "#" }
-    },
-    "properties": {
-      "additionalProperties": { "$ref": "#" }
-    },
-    "if": { "$ref": "#" },
-    "then": { "$ref": "#" },
-    "else": { "$ref": "#" },
-    "allOf": { "$ref": "#/definitions/schemaArray" },
-    "anyOf": { "$ref": "#/definitions/schemaArray" },
-    "oneOf": { "$ref": "#/definitions/schemaArray" },
-    "not": { "$ref": "#" },
-    "contains": { "$ref": "#" },
-    "propertyNames": { "$ref": "#" },
-    "x-jsf-order": {
-      "description": "This keyword defines the order of fields for a given form or fieldset. It's placed at the schema root and inside of each fieldset.",
-      "$ref": "http://json-schema.org/draft-07/schema#/definitions/stringArray"
-    },
-    "x-jsf-errorMessage": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "type": {
-          "type": "string",
-          "description": "Message shown when the value is not of the correct type."
-        },
-        "required": {
-          "type": "string",
-          "description": "Message shown when the value is required and not provided."
-        },
-        "minimum": {
-          "type": "string",
-          "description": "Message shown when the value is less than the minimum value."
-        },
-        "minLength": {
-          "type": "string",
-          "description": "Message shown when the value is less than the minimum length."
-        },
-        "maximum": {
-          "type": "string",
-          "description": "Message shown when the value is greater than the maximum value."
-        },
-        "maxLength": {
-          "type": "string",
-          "description": "Message shown when the value is greater than the maximum length."
-        },
-        "pattern": {
-          "type": "string",
-          "description": "Message shown when the value is not the correct format and does not match the pattern property."
-        },
-        "maxFileSize": {
-          "type": "string",
-          "description": "Message shown when the file size is greater than the maximum file size."
-        },
-        "accept": {
-          "type": "string",
-          "description": "Message shown when the file type is not accepted."
-        }
-      }
-    },
-    "x-jsf-presentation": {
-      "type": "object",
-      "description": "Presentation overrides for the schema",
-      "properties": {
-        "inputType": {
-          "description": "Input type for the generated UI field",
-          "type": "string",
-          "anyOf": [
-            {
-              "const": "text",
-              "description": "Similar to the native HTML input with text type."
-            },
-            {
-              "const": "select",
-              "description": "Similar to the native HTML select element."
-            },
-            {
-              "const": "radio",
-              "description": "Similar to a native HTML input with radio type."
-            },
-            {
-              "const": "number",
-              "description": "Similar to the native HTML input with number type."
-            },
-            {
-              "const": "date",
-              "description": "Expects a value with format YYY-MM-DD."
-            },
-            {
-              "const": "checkbox",
-              "description": "Similar to the native HTML input with checkbox type."
-            },
-            {
-              "const": "email",
-              "description": "Similar to the native HTML input with email type."
-            },
-            {
-              "const": "file",
-              "description": "Similar to the native HTML input with file type."
-            },
-            {
-              "const": "fieldset",
-              "description": "Groups multiple Fields inside. Its expected value is a nested object."
-            },
-            {
-              "const": "group-array",
-              "description": "A list of inputs that can be repeated. Its expected value is an array."
-            },
-            {
-              "type": "string",
-              "description": "Any arbitrary custom inputType you might want to represent your UI Field."
-            }
-          ]
-        },
-        "accept": {
-          "description": "For `inputType: \"file\"`. The accepted file types, as a comma separated string.",
-          "type": "string"
-        },
-        "description": {
-          "description": "Field description with HTML. If you don't need HTML, please use the native description keyword.",
-          "type": "string"
-        },
-        "statement": {
-          "description": "Special message about the field. Useful in cases where this message is based on the field value.",
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "string"
-            },
-            "description": {
-              "description": "The sentence itself. Might include HTML.",
-              "type": "string"
-            },
-            "severity": {
-              "description": "Defines the type of message.",
-              "anyOf": [
-                { "type": "string", "const": "info" },
-                { "type": "string", "const": "warning" },
-                { "type": "string", "const": "error" },
-                { "type": "string", "const": "success" },
-                {}
-              ]
-            }
-          }
-        },
-        "maxFileSize": {
-          "description": "For `inputType: \"file\"`. The maximum file size in KB. It's used to enhanced Yup validation.",
-          "type": "number"
-        },
-        "addFieldText": {
-          "description": "Used in `group-array` fields. The button text to add a new field.",
-          "type": "string"
-        }
-      }
-    }
-  }
-}