@remoteoss/json-schema-form 0.11.9-dev.20241210213029 → 0.11.10-beta.0

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+#### 0.11.10-beta.0 (2025-01-22)
+
+##### Bug Fixes
+
+* **checkbox:**  Boolean - allow nullable values, and throw friendly error message ([#109](https://github.com/remoteoss/json-schema-form/pull/109)) ([63286eee](https://github.com/remoteoss/json-schema-form/commit/63286eee57591b97c9c5bbbcfbf9231cfabde864))
+
+##### Chores
+
+* **conditionals:**  Highlight bugs related to validations and conditional fields  ([#107](https://github.com/remoteoss/json-schema-form/pull/107)) ([85dc3d6d](https://github.com/remoteoss/json-schema-form/commit/85dc3d6dbb0a0483a32479563ef9cd65cd36a210))
+*  Update eslint dependencies  ([#99](https://github.com/remoteoss/json-schema-form/pull/99)) ([ff2e6ed5](https://github.com/remoteoss/json-schema-form/commit/ff2e6ed56ba96d911ccc36dc50485d8cb6ec764b))
+
+
+
+##### Build System / Dependencies
+
+* **next:**
+  *  Add build step ([#110](https://github.com/remoteoss/json-schema-form/pull/110)) ([6c00ce32](https://github.com/remoteoss/json-schema-form/commit/6c00ce32f6e5edba328d5cdede38a82c330f5f14))
+  *  Set up lint ([#108](https://github.com/remoteoss/json-schema-form/pull/108)) ([038efcfc](https://github.com/remoteoss/json-schema-form/commit/038efcfcda6cb7b31852e7bc80c9524bffdb94f5))
+
+
+#### 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

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241210213029
- Generated: Tue, 10 Dec 2024 21:31:03 GMT
+ 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
 
  MIT License
 
@@ -96,8 +96,11 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
-// src/checkIfConditionMatches.js
+// src/internals/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];
@@ -554,7 +557,7 @@ var yupSchemas = {
   email: (0, import_yup.string)().trim().email("Please enter a valid email address").nullable(),
   fieldset: (0, import_yup.object)().nullable(),
   checkbox: (0, import_yup.string)().trim().nullable(),
-  checkboxBool: (0, import_yup.boolean)(),
+  checkboxBool: (0, import_yup.boolean)().typeError('The value must be a boolean, but received "${value}"').nullable(),
   multiple: {
     select: (0, import_yup.array)().nullable(),
     "group-array": (0, import_yup.array)().nullable()
@@ -1278,9 +1281,6 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   }
   if (field.calculateConditionalProperties) {
     const { rootFieldAttrs, newAttributes } = field.calculateConditionalProperties({
-      dynamicAttributes: Object.fromEntries(
-        (field.dynamicAttributes ?? []).map((attr) => [attr, field[attr]])
-      ),
       isRequired: fieldIsRequired,
       conditionBranch: node,
       formValues
@@ -1316,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({
@@ -1597,18 +1597,15 @@ function rebuildFieldset(fields, property) {
   }));
 }
 function calculateConditionalProperties({ fieldParams, customProperties, logic, config }) {
-  return ({ dynamicAttributes, isRequired, conditionBranch, formValues }) => {
+  return ({ isRequired, conditionBranch, formValues }) => {
     const conditionalProperty = conditionBranch?.properties?.[fieldParams.name];
     if (conditionalProperty) {
       const presentation = pickXKey(conditionalProperty, "presentation") ?? {};
       const fieldDescription = getFieldDescription(conditionalProperty, customProperties);
-      const newFieldParams = extractParametersFromNode(
-        {
-          ...conditionalProperty,
-          ...fieldDescription
-        },
-        Object.keys(dynamicAttributes)
-      );
+      const newFieldParams = extractParametersFromNode({
+        ...conditionalProperty,
+        ...fieldDescription
+      });
       let fieldSetFields;
       if (fieldParams.inputType === supportedTypes.FIELDSET) {
         fieldSetFields = rebuildFieldset(fieldParams.fields, conditionalProperty);
@@ -1628,7 +1625,6 @@ function calculateConditionalProperties({ fieldParams, customProperties, logic,
         ...calculatedComputedAttributes.value ? { value: calculatedComputedAttributes.value } : { value: void 0 },
         schema: buildYupSchema(
           {
-            ...dynamicAttributes,
             ...fieldParams,
             ...restNewFieldParams,
             ...calculatedComputedAttributes,
@@ -1771,32 +1767,11 @@ function convertJSONSchemaPropertiesToFieldParameters({ properties, required, "x
   return Object.entries(properties).filter(([, value]) => typeof value === "object").map(([key, value]) => buildFieldParameters(key, value, required, config)).sort(sortFields).map(({ position, ...fieldParams }) => fieldParams);
 }
 function applyFieldsDependencies(fieldsParameters, node) {
-  if (node?.properties) {
-    Object.entries(node.properties ?? {}).forEach(([key, value]) => {
-      if (value["x-jsf-logic-computedAttrs"]) {
-        const property = fieldsParameters.find(({ name }) => name === key);
-        property.isDynamic = true;
-        property.dynamicAttributes = [
-          ...property.dynamicAttributes ?? [],
-          ...Object.keys(value["x-jsf-logic-computedAttrs"])
-        ];
-      }
-    });
-  }
   if (node?.then) {
     fieldsParameters.filter(
       ({ name }) => node.then?.properties?.[name] || node.then?.required?.includes(name) || node.else?.properties?.[name] || node.else?.required?.includes(name)
     ).forEach((property) => {
-      const dynamicAttributes = [
-        ...Object.keys(node.then?.properties?.[property.name] ?? {}),
-        ...Object.keys(node.else?.properties?.[property.name] ?? {})
-      ];
       property.isDynamic = true;
-      if (property.dynamicAttributes) {
-        property.dynamicAttributes.push(...dynamicAttributes);
-      } else {
-        property.dynamicAttributes = dynamicAttributes;
-      }
     });
     applyFieldsDependencies(fieldsParameters, node.then);
   }

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241210213029
- Generated: Tue, 10 Dec 2024 21:31:03 GMT
+ 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
 
  MIT License
 
@@ -59,8 +59,11 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
-// src/checkIfConditionMatches.js
+// src/internals/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];
@@ -517,7 +520,7 @@ var yupSchemas = {
   email: string().trim().email("Please enter a valid email address").nullable(),
   fieldset: object().nullable(),
   checkbox: string().trim().nullable(),
-  checkboxBool: boolean(),
+  checkboxBool: boolean().typeError('The value must be a boolean, but received "${value}"').nullable(),
   multiple: {
     select: array().nullable(),
     "group-array": array().nullable()
@@ -1241,9 +1244,6 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   }
   if (field.calculateConditionalProperties) {
     const { rootFieldAttrs, newAttributes } = field.calculateConditionalProperties({
-      dynamicAttributes: Object.fromEntries(
-        (field.dynamicAttributes ?? []).map((attr) => [attr, field[attr]])
-      ),
       isRequired: fieldIsRequired,
       conditionBranch: node,
       formValues
@@ -1279,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({
@@ -1560,18 +1560,15 @@ function rebuildFieldset(fields, property) {
   }));
 }
 function calculateConditionalProperties({ fieldParams, customProperties, logic, config }) {
-  return ({ dynamicAttributes, isRequired, conditionBranch, formValues }) => {
+  return ({ isRequired, conditionBranch, formValues }) => {
     const conditionalProperty = conditionBranch?.properties?.[fieldParams.name];
     if (conditionalProperty) {
       const presentation = pickXKey(conditionalProperty, "presentation") ?? {};
       const fieldDescription = getFieldDescription(conditionalProperty, customProperties);
-      const newFieldParams = extractParametersFromNode(
-        {
-          ...conditionalProperty,
-          ...fieldDescription
-        },
-        Object.keys(dynamicAttributes)
-      );
+      const newFieldParams = extractParametersFromNode({
+        ...conditionalProperty,
+        ...fieldDescription
+      });
       let fieldSetFields;
       if (fieldParams.inputType === supportedTypes.FIELDSET) {
         fieldSetFields = rebuildFieldset(fieldParams.fields, conditionalProperty);
@@ -1591,7 +1588,6 @@ function calculateConditionalProperties({ fieldParams, customProperties, logic,
         ...calculatedComputedAttributes.value ? { value: calculatedComputedAttributes.value } : { value: void 0 },
         schema: buildYupSchema(
           {
-            ...dynamicAttributes,
             ...fieldParams,
             ...restNewFieldParams,
             ...calculatedComputedAttributes,
@@ -1734,32 +1730,11 @@ function convertJSONSchemaPropertiesToFieldParameters({ properties, required, "x
   return Object.entries(properties).filter(([, value]) => typeof value === "object").map(([key, value]) => buildFieldParameters(key, value, required, config)).sort(sortFields).map(({ position, ...fieldParams }) => fieldParams);
 }
 function applyFieldsDependencies(fieldsParameters, node) {
-  if (node?.properties) {
-    Object.entries(node.properties ?? {}).forEach(([key, value]) => {
-      if (value["x-jsf-logic-computedAttrs"]) {
-        const property = fieldsParameters.find(({ name }) => name === key);
-        property.isDynamic = true;
-        property.dynamicAttributes = [
-          ...property.dynamicAttributes ?? [],
-          ...Object.keys(value["x-jsf-logic-computedAttrs"])
-        ];
-      }
-    });
-  }
   if (node?.then) {
     fieldsParameters.filter(
       ({ name }) => node.then?.properties?.[name] || node.then?.required?.includes(name) || node.else?.properties?.[name] || node.else?.required?.includes(name)
     ).forEach((property) => {
-      const dynamicAttributes = [
-        ...Object.keys(node.then?.properties?.[property.name] ?? {}),
-        ...Object.keys(node.else?.properties?.[property.name] ?? {})
-      ];
       property.isDynamic = true;
-      if (property.dynamicAttributes) {
-        property.dynamicAttributes.push(...dynamicAttributes);
-      } else {
-        property.dynamicAttributes = dynamicAttributes;
-      }
     });
     applyFieldsDependencies(fieldsParameters, node.then);
   }

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241210213029
- Generated: Tue, 10 Dec 2024 21:31:03 GMT
+ 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
 
  MIT License
 
@@ -11576,8 +11576,11 @@ function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
 
-// src/checkIfConditionMatches.js
+// src/internals/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];
@@ -12033,7 +12036,7 @@ var yupSchemas = {
   email: StringSchema().trim().email("Please enter a valid email address").nullable(),
   fieldset: ObjectSchema().nullable(),
   checkbox: StringSchema().trim().nullable(),
-  checkboxBool: boolean2(),
+  checkboxBool: boolean2().typeError('The value must be a boolean, but received "${value}"').nullable(),
   multiple: {
     select: array_default().nullable(),
     "group-array": array_default().nullable()
@@ -12757,9 +12760,6 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   }
   if (field.calculateConditionalProperties) {
     const { rootFieldAttrs, newAttributes } = field.calculateConditionalProperties({
-      dynamicAttributes: Object.fromEntries(
-        (field.dynamicAttributes ?? []).map((attr) => [attr, field[attr]])
-      ),
       isRequired: fieldIsRequired,
       conditionBranch: node,
       formValues
@@ -12795,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({
@@ -13076,18 +13076,15 @@ function rebuildFieldset(fields, property2) {
   }));
 }
 function calculateConditionalProperties({ fieldParams, customProperties, logic, config }) {
-  return ({ dynamicAttributes, isRequired, conditionBranch, formValues }) => {
+  return ({ isRequired, conditionBranch, formValues }) => {
     const conditionalProperty = conditionBranch?.properties?.[fieldParams.name];
     if (conditionalProperty) {
       const presentation = pickXKey(conditionalProperty, "presentation") ?? {};
       const fieldDescription = getFieldDescription(conditionalProperty, customProperties);
-      const newFieldParams = extractParametersFromNode(
-        {
-          ...conditionalProperty,
-          ...fieldDescription
-        },
-        Object.keys(dynamicAttributes)
-      );
+      const newFieldParams = extractParametersFromNode({
+        ...conditionalProperty,
+        ...fieldDescription
+      });
       let fieldSetFields;
       if (fieldParams.inputType === supportedTypes.FIELDSET) {
         fieldSetFields = rebuildFieldset(fieldParams.fields, conditionalProperty);
@@ -13107,7 +13104,6 @@ function calculateConditionalProperties({ fieldParams, customProperties, logic,
         ...calculatedComputedAttributes.value ? { value: calculatedComputedAttributes.value } : { value: void 0 },
         schema: buildYupSchema(
           {
-            ...dynamicAttributes,
             ...fieldParams,
             ...restNewFieldParams,
             ...calculatedComputedAttributes,
@@ -13250,32 +13246,11 @@ function convertJSONSchemaPropertiesToFieldParameters({ properties, required: re
   return Object.entries(properties).filter(([, value]) => typeof value === "object").map(([key, value]) => buildFieldParameters(key, value, required2, config)).sort(sortFields2).map(({ position, ...fieldParams }) => fieldParams);
 }
 function applyFieldsDependencies(fieldsParameters, node) {
-  if (node?.properties) {
-    Object.entries(node.properties ?? {}).forEach(([key, value]) => {
-      if (value["x-jsf-logic-computedAttrs"]) {
-        const property2 = fieldsParameters.find(({ name }) => name === key);
-        property2.isDynamic = true;
-        property2.dynamicAttributes = [
-          ...property2.dynamicAttributes ?? [],
-          ...Object.keys(value["x-jsf-logic-computedAttrs"])
-        ];
-      }
-    });
-  }
   if (node?.then) {
     fieldsParameters.filter(
       ({ name }) => node.then?.properties?.[name] || node.then?.required?.includes(name) || node.else?.properties?.[name] || node.else?.required?.includes(name)
     ).forEach((property2) => {
-      const dynamicAttributes = [
-        ...Object.keys(node.then?.properties?.[property2.name] ?? {}),
-        ...Object.keys(node.else?.properties?.[property2.name] ?? {})
-      ];
       property2.isDynamic = true;
-      if (property2.dynamicAttributes) {
-        property2.dynamicAttributes.push(...dynamicAttributes);
-      } else {
-        property2.dynamicAttributes = dynamicAttributes;
-      }
     });
     applyFieldsDependencies(fieldsParameters, node.then);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.9-dev.20241210213029",
+  "version": "0.11.10-beta.0",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",
@@ -54,8 +54,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.5",
+    "@babel/eslint-parser": "^7.25.9",
     "@babel/preset-env": "^7.21.5",
-    "babel-eslint": "^10.1.0",
     "babel-jest": "^29.5.0",
     "child-process-promise": "^2.2.1",
     "esbuild": "^0.17.15",

package/src/tests/checkIfConditionMatches.test.js

@@ -1,51 +1,65 @@
-import { checkIfConditionMatchesProperties } from '../checkIfConditionMatches';
+import { checkIfConditionMatchesProperties } from '../internals/checkIfConditionMatches';
 
-it('Empty if is always going to be true', () => {
-  expect(checkIfConditionMatchesProperties({ if: { properties: {} } })).toBe(true);
-});
+describe('checkIfConditionMatchesProperties()', () => {
+  it('True if is always going to be true', () => {
+    expect(checkIfConditionMatchesProperties({ if: true })).toBe(true);
+  });
 
-it('Basic if check passes with correct value', () => {
-  expect(
-    checkIfConditionMatchesProperties(
-      { if: { properties: { a: { const: 'hello' } } } },
-      {
-        a: 'hello',
-      }
-    )
-  ).toBe(true);
-});
+  it('False if is always going to be false', () => {
+    expect(checkIfConditionMatchesProperties({ if: false })).toBe(false);
+  });
 
-it('Basic if check fails with incorrect value', () => {
-  expect(
-    checkIfConditionMatchesProperties(
-      { if: { properties: { a: { const: 'hello' } } } },
-      {
-        a: 'goodbye',
-      }
-    )
-  ).toBe(false);
-});
+  it('Empty if is always going to be true', () => {
+    expect(checkIfConditionMatchesProperties({ if: { properties: {} } })).toBe(true);
+  });
 
-it('Nested properties check passes with correct value', () => {
-  expect(
-    checkIfConditionMatchesProperties(
-      { if: { properties: { parent: { properties: { child: { const: 'hello from child' } } } } } },
-      {
-        parent: { child: 'hello from child' },
-      },
-      [{ name: 'parent', fields: [] }]
-    )
-  ).toBe(true);
-});
+  it('Basic if check passes with correct value', () => {
+    expect(
+      checkIfConditionMatchesProperties(
+        { if: { properties: { a: { const: 'hello' } } } },
+        {
+          a: 'hello',
+        }
+      )
+    ).toBe(true);
+  });
+
+  it('Basic if check fails with incorrect value', () => {
+    expect(
+      checkIfConditionMatchesProperties(
+        { if: { properties: { a: { const: 'hello' } } } },
+        {
+          a: 'goodbye',
+        }
+      )
+    ).toBe(false);
+  });
+
+  it('Nested properties check passes with correct value', () => {
+    expect(
+      checkIfConditionMatchesProperties(
+        {
+          if: { properties: { parent: { properties: { child: { const: 'hello from child' } } } } },
+        },
+        {
+          parent: { child: 'hello from child' },
+        },
+        [{ name: 'parent', fields: [] }]
+      )
+    ).toBe(true);
+  });
 
-it('Nested properties check passes with correct value', () => {
-  expect(
-    checkIfConditionMatchesProperties(
-      { if: { properties: { parent: { properties: { child: { const: 'hello from child' } } } } } },
-      {
-        parent: { child: 'goodbye from child' },
-      },
-      [{ name: 'parent', fields: [] }]
-    )
-  ).toBe(false);
+  it('Nested properties check passes with correct value', () => {
+    expect(
+      checkIfConditionMatchesProperties(
+        {
+          if: { properties: { parent: { properties: { child: { const: 'hello from child' } } } } },
+        },
+        {
+          parent: { child: 'goodbye from child' },
+        },
+        [{ name: 'parent', fields: [] }]
+      )
+    ).toBe(false);
+  });
 });