@remoteoss/json-schema-form 0.8.1-dev.20240208092217 → 0.8.1-dev.20240209164254

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240208092217
- Generated: Thu, 08 Feb 2024 09:22:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
+ Generated: Fri, 09 Feb 2024 16:43:11 GMT
 
  MIT License
 
@@ -130,8 +130,10 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        ...field,
+        options: field.options,
+        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
         ...currentProperty,
+        inputType: field.inputType,
         required: true
       },
       value
@@ -1381,7 +1383,7 @@ function extractParametersFromNode(schemaNode) {
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
   return (0, import_omitBy.default)(
     {
       const: node.const,
@@ -1477,9 +1479,10 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
+  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
   };
 }
 

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240208092217
- Generated: Thu, 08 Feb 2024 09:22:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
+ Generated: Fri, 09 Feb 2024 16:43:11 GMT
 
  MIT License
 
@@ -94,8 +94,10 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        ...field,
+        options: field.options,
+        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
         ...currentProperty,
+        inputType: field.inputType,
         required: true
       },
       value
@@ -1345,7 +1347,7 @@ function extractParametersFromNode(schemaNode) {
   const node = omit(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
   return omitBy(
     {
       const: node.const,
@@ -1441,9 +1443,10 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
+  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
   };
 }
 

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240208092217
- Generated: Thu, 08 Feb 2024 09:22:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
+ Generated: Fri, 09 Feb 2024 16:43:11 GMT
 
  MIT License
 
@@ -11449,8 +11449,10 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        ...field,
+        options: field.options,
+        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
         ...currentProperty,
+        inputType: field.inputType,
         required: true
       },
       value
@@ -12699,7 +12701,7 @@ function extractParametersFromNode(schemaNode) {
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
   return (0, import_omitBy.default)(
     {
       const: node.const,
@@ -12795,9 +12797,10 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values2) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
+  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
   };
 }
 

package/package.json

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

package/src/tests/conditions.test.js

@@ -423,59 +423,3 @@ describe('Conditional attributes updated', () => {
     expect(fields[1].visibilityCondition).toEqual(expect.any(Function));
   });
 });
-
-describe('Conditional with a minimum value check', () => {
-  it('Should handle a maximum as a property field check', () => {
-    const schema = {
-      additionalProperties: false,
-      allOf: [
-        {
-          if: {
-            properties: {
-              salary: {
-                maximum: 119999,
-              },
-            },
-            required: ['salary'],
-          },
-          then: {
-            required: ['reason'],
-          },
-          else: {
-            properties: {
-              reason: false,
-            },
-          },
-        },
-      ],
-      properties: {
-        salary: {
-          type: 'number',
-          'x-jsf-presentation': {
-            inputType: 'money',
-          },
-        },
-        reason: {
-          oneOf: [
-            {
-              const: 'reason_one',
-            },
-            {
-              const: 'reason_two',
-            },
-          ],
-          type: 'string',
-        },
-      },
-      required: ['salary'],
-      type: 'object',
-    };
-
-    const { handleValidation } = createHeadlessForm(schema, { strictInputType: false });
-    expect(handleValidation({ salary: 120000 }).formErrors).toEqual(undefined);
-    expect(handleValidation({ salary: 1000 }).formErrors).toEqual({
-      reason: 'Required field',
-    });
-    expect(handleValidation({ salary: 1000, reason: 'reason_one' }).formErrors).toEqual(undefined);
-  });
-});

package/src/tests/const.test.js

@@ -112,7 +112,7 @@ describe('validations: const', () => {
       },
       { strictInputType: false }
     );
-    expect(fields[0]).toMatchObject({ value: 10, const: 10, default: 10 });
+    expect(fields[0]).toMatchObject({ forcedValue: 10, const: 10, default: 10 });
   });
 });
 
@@ -130,7 +130,7 @@ describe('const/default with forced values', () => {
     expect(handleValidation({ zero_only: 1 }).formErrors).toEqual({
       zero_only: 'The only accepted value is 0.',
     });
-    expect(fields[0]).toMatchObject({ value: 0, const: 0, default: 0 });
+    expect(fields[0]).toMatchObject({ forcedValue: 0, const: 0, default: 0 });
     expect(handleValidation({ zero_only: 0 }).formErrors).toBeUndefined();
     // null is also considered valid until we fix @BUG RMT-518
     // Expectation: To fail with error "The only accepted value is 0."
@@ -151,9 +151,21 @@ describe('const/default with forced values', () => {
       ten_only: 'The only accepted value is 10.',
     });
     expect(handleValidation({ ten_only: 10 }).formErrors).toBeUndefined();
-    expect(fields[0]).toMatchObject({ value: 10, const: 10, default: 10 });
+    expect(fields[0]).toMatchObject({ forcedValue: 10, const: 10, default: 10 });
     // null is also considered valid until we fix @BUG RMT-518
     // Expectation: To fail with error "The only accepted value is 10."
     expect(handleValidation({ ten_only: null }).formErrors).toBeUndefined();
   });
+
+  it('do not set a forced value if const and default do not equal', () => {
+    const { fields } = createHeadlessForm(
+      {
+        properties: {
+          bad_field_for_number: { type: 'number', const: 10, default: 20 },
+        },
+      },
+      { strictInputType: false }
+    );
+    expect(fields[0]).not.toMatchObject({ forcedValue: expect.any(Number) });
+  });
 });

package/src/tests/jsonLogic.fixtures.js

@@ -227,6 +227,35 @@ export const schemaWithComputedAttributes = {
   },
 };
 
+export const badSchemaThatWillNotSetAForcedValue = {
+  properties: {
+    field_a: {
+      type: 'number',
+    },
+    field_b: {
+      type: 'number',
+      'x-jsf-logic-computedAttrs': {
+        const: 'a_times_three',
+        default: 'a_times_two',
+      },
+    },
+  },
+  'x-jsf-logic': {
+    computedValues: {
+      a_times_two: {
+        rule: {
+          '*': [{ var: 'field_a' }, 2],
+        },
+      },
+      a_times_three: {
+        rule: {
+          '*': [{ var: 'field_a' }, 3],
+        },
+      },
+    },
+  },
+};
+
 export const schemaWithInlineRuleForComputedAttributeWithoutCopy = {
   properties: {
     field_a: {

package/src/tests/jsonLogic.test.js

@@ -35,6 +35,7 @@ import {
   schemaWithUnknownVariableInComputedValues,
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
+  badSchemaThatWillNotSetAForcedValue,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -335,12 +336,21 @@ describe('jsonLogic: cross-values validations', () => {
         'This field is 2 times bigger than field_a with value of 4.'
       );
       expect(fieldB.default).toEqual(4);
-      expect(fieldB.value).toEqual(4);
+      expect(fieldB.forcedValue).toEqual(4);
       handleValidation({ field_a: 4 });
       expect(fieldB.default).toEqual(8);
       expect(fieldB.label).toEqual('This is 8!');
     });
 
+    it('A forced value will not be set when const and default are not equal', () => {
+      const { fields } = createHeadlessForm(badSchemaThatWillNotSetAForcedValue, {
+        strictInputType: false,
+        initialValues: { field_a: 2 },
+      });
+      expect(fields[1]).toMatchObject({ const: 6, default: 4 });
+      expect(fields[1]).not.toMatchObject({ forcedValue: expect.any(Number) });
+    });
+
     it('Derived errorMessages and statements work', () => {
       const { fields, handleValidation } = createHeadlessForm(
         schemaWithComputedAttributesAndErrorMessages,