@remoteoss/json-schema-form 0.11.9-dev.20241210213029 → 0.11.9-dev.20241213082826

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
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 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];
@@ -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
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 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];
@@ -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
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 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];
@@ -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.9-dev.20241213082826",
   "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

@@ -480,116 +480,70 @@ describe('Conditional with a minimum value check', () => {
   });
 });
 
-describe('Multiple conditions affecting the same field', () => {
-  it('Should apply all conditions', () => {
+describe('Conditional with literal booleans', () => {
+  it('handles true case', () => {
     const schema = {
       properties: {
-        answer: { type: 'string' },
-        number: { type: 'number' },
-      },
-      allOf: [
-        {
-          if: { properties: { answer: { const: 'yes' } } },
-          then: { properties: { number: { minimum: 10 } } },
+        is_full_time: {
+          type: 'boolean',
         },
-        {
-          if: { properties: { answer: { const: 'yes' } } },
-          then: { properties: { number: { maximum: 20 } } },
-        },
-      ],
-    };
-
-    const { handleValidation } = createHeadlessForm(schema, { strictInputType: false });
-    expect(handleValidation({ answer: 'yes', number: 15 }).formErrors).toEqual(undefined);
-    expect(handleValidation({ answer: 'yes', number: 9 }).formErrors).toEqual({
-      number: 'Must be greater or equal to 10',
-    });
-    expect(handleValidation({ answer: 'yes', number: 21 }).formErrors).toEqual({
-      number: 'Must be smaller or equal to 20',
-    });
-    expect(handleValidation({ answer: 'no', number: 9 }).formErrors).toBeUndefined();
-    expect(handleValidation({ answer: 'no', number: 15 }).formErrors).toBeUndefined();
-    expect(handleValidation({ answer: 'no', number: 21 }).formErrors).toBeUndefined();
-  });
-
-  it('Accepts unsatisfiable conflicting conditions', () => {
-    const unsatisfiableSchema = {
-      properties: {
-        has_books: { type: 'string' },
-        books: {
+        salary: {
           type: 'number',
-          const: 4,
         },
       },
-      required: ['books'],
-      allOf: [
-        {
-          if: { properties: { has_books: { const: 'yes' } } },
-          then: {
-            properties: {
-              books: {
-                minimum: 5,
-              },
-            },
-          },
-        },
-      ],
+      required: [],
+      if: true,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
+      },
     };
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
 
-    // This is intentionally not able to be satisfied.
-    const { handleValidation } = createHeadlessForm(unsatisfiableSchema, {
-      strictInputType: false,
-    });
-    expect(handleValidation({ has_books: 'yes', books: 4 }).formErrors).toEqual({
-      books: 'Must be greater or equal to 5',
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: true,
     });
-    expect(handleValidation({ has_books: 'yes', books: 5 }).formErrors).toEqual({
-      books: 'The only accepted value is 4.',
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: false,
     });
   });
 
-  it('Computed attributes also get the same treatment for unsatisfiable conflicting conditions', () => {
-    const unsatisfiableSchema = {
+  it('handles false case', () => {
+    const schema = {
       properties: {
-        has_books: { type: 'string' },
-        books: {
+        is_full_time: {
+          type: 'boolean',
+        },
+        salary: {
           type: 'number',
-          'x-jsf-logic-computedAttrs': {
-            const: 'book_space',
-          },
         },
       },
-      required: ['books'],
-      allOf: [
-        {
-          if: { properties: { has_books: { const: 'yes' } } },
-          then: {
-            properties: {
-              books: {
-                minimum: 5,
-              },
-            },
-          },
-        },
-      ],
-      'x-jsf-logic': {
-        computedValues: {
-          book_space: {
-            rule: {
-              '*': [2, 2],
-            },
-          },
-        },
+      required: [],
+      if: false,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
       },
     };
-    const { handleValidation } = createHeadlessForm(unsatisfiableSchema, {
-      strictInputType: false,
-    });
-    expect(handleValidation({ has_books: 'yes', books: 4 }).formErrors).toEqual({
-      books: 'Must be greater or equal to 5',
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: false,
     });
-    expect(handleValidation({ has_books: 'yes', books: 5 }).formErrors).toEqual({
-      books: 'The only accepted value is 4.',
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: true,
     });
   });
 });

package/src/tests/createHeadlessForm.test.js

@@ -2009,8 +2009,6 @@ describe('createHeadlessForm', () => {
         });
 
         it('When changing back to low work hours, the perks.food goes back to the original state', () => {
-          // HACK FOR NOW THAT IS CAUSING THIS EXTRA VALIDATION. Fix me!!
-          validateForm({});
           expect(
             validateForm({
               work_hours_per_week: 10,
@@ -2021,7 +2019,6 @@ describe('createHeadlessForm', () => {
               food: 'Required field',
               retirement: 'Required field',
             },
-            // pto_minimum: 20 would appear if not for the extra validation above.
             // ...pto is minimum error is gone! (sanity-check)
           });