@remoteoss/json-schema-form 0.8.2-dev.20240213105045 → 0.9.1-dev.20240320135936

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 0.9.0-beta.0 (2024-03-11)
+
+##### Breaking changes
+
+*  Rename `value` -> `forcedValue`. This is in regards to the `json-logic`, where a "forced value" will now be returned in each relevant field (i.e. fields where the schema `const` and `default` are the same) with `forcedValue` over `value`. ([#66](https://github.com/remoteoss/json-schema-form/pull/66)) ([77c445a9](https://github.com/remoteoss/json-schema-form/commit/77c445a9dce657a7648642312f22c18f972187c7))
+
+#### 0.8.2-beta.0 (2024-02-13)
+
+##### Bug Fixes
+
+* **helpers:**  getFieldOptions - return empty array if oneOf missing in radio ([#67](https://github.com/remoteoss/json-schema-form/pull/67)) ([6511330f](https://github.com/remoteoss/json-schema-form/commit/6511330f55a2accedb1c58a61ff915a3a0186dbb))
+
 #### 0.8.1-beta.0 (2024-02-12)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.2-dev.20240213105045
- Generated: Tue, 13 Feb 2024 10:50:54 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320135936
+ Generated: Wed, 20 Mar 2024 13:59:53 GMT
 
  MIT License
 
@@ -459,7 +459,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => {
+  radioOrSelectString: (options) => {
     return (0, import_yup.string)().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -519,6 +519,9 @@ var yupSchemas = {
     }
     return dateString;
   },
+  radioOrSelectNumber: (options) => (0, import_yup.mixed)().typeError("The value must be a number").oneOf(options, ({ value }) => {
+    return `The option ${JSON.stringify(value)} is not valid.`;
+  }).nullable(),
   number: (0, import_yup.number)().typeError("The value must be a number").nullable(),
   file: (0, import_yup.array)().nullable(),
   email: (0, import_yup.string)().trim().email("Please enter a valid email address").nullable(),
@@ -548,7 +551,9 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
     return "Please acknowledge this field";
   return "Required field";
 }
-var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+var getJsonTypeInArray = (jsonType) => {
+  return Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+};
 var getOptions = (field) => {
   const allValues = field.options?.map((option) => ({
     value: option.value,
@@ -562,9 +567,13 @@ var getOptions = (field) => {
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
-  if (field.options?.length > 0) {
+  if (field.options?.length > 0 && field.jsonType !== "number") {
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues);
+    return yupSchemas.radioOrSelectString(optionValues);
+  }
+  if (field.options?.length > 0 && field.jsonType === "number") {
+    const optionValues = getOptions(field).map((i) => i.value);
+    return yupSchemas.radioOrSelectNumber(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1381,7 +1390,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 +1486,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.2-dev.20240213105045
- Generated: Tue, 13 Feb 2024 10:50:54 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320135936
+ Generated: Wed, 20 Mar 2024 13:59:53 GMT
 
  MIT License
 
@@ -386,7 +386,7 @@ import jsonLogic from "json-logic-js";
 import flow from "lodash/flow";
 import noop from "lodash/noop";
 import { randexp } from "randexp";
-import { string, number, boolean, object, array } from "yup";
+import { string, number, boolean, object, array, mixed } from "yup";
 var DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
 var baseString = string().trim();
 var todayDateHint = (/* @__PURE__ */ new Date()).toISOString().substring(0, 10);
@@ -423,7 +423,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => {
+  radioOrSelectString: (options) => {
     return string().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -483,6 +483,9 @@ var yupSchemas = {
     }
     return dateString;
   },
+  radioOrSelectNumber: (options) => mixed().typeError("The value must be a number").oneOf(options, ({ value }) => {
+    return `The option ${JSON.stringify(value)} is not valid.`;
+  }).nullable(),
   number: number().typeError("The value must be a number").nullable(),
   file: array().nullable(),
   email: string().trim().email("Please enter a valid email address").nullable(),
@@ -512,7 +515,9 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
     return "Please acknowledge this field";
   return "Required field";
 }
-var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+var getJsonTypeInArray = (jsonType) => {
+  return Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+};
 var getOptions = (field) => {
   const allValues = field.options?.map((option) => ({
     value: option.value,
@@ -526,9 +531,13 @@ var getOptions = (field) => {
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
-  if (field.options?.length > 0) {
+  if (field.options?.length > 0 && field.jsonType !== "number") {
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues);
+    return yupSchemas.radioOrSelectString(optionValues);
+  }
+  if (field.options?.length > 0 && field.jsonType === "number") {
+    const optionValues = getOptions(field).map((i) => i.value);
+    return yupSchemas.radioOrSelectNumber(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1345,7 +1354,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 +1450,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.2-dev.20240213105045
- Generated: Tue, 13 Feb 2024 10:50:54 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320135936
+ Generated: Wed, 20 Mar 2024 13:59:53 GMT
 
  MIT License
 
@@ -11777,7 +11777,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => {
+  radioOrSelectString: (options) => {
     return StringSchema().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -11837,6 +11837,9 @@ var yupSchemas = {
     }
     return dateString;
   },
+  radioOrSelectNumber: (options) => SchemaType().typeError("The value must be a number").oneOf(options, ({ value }) => {
+    return `The option ${JSON.stringify(value)} is not valid.`;
+  }).nullable(),
   number: NumberSchema().typeError("The value must be a number").nullable(),
   file: array_default().nullable(),
   email: StringSchema().trim().email("Please enter a valid email address").nullable(),
@@ -11866,7 +11869,9 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
     return "Please acknowledge this field";
   return "Required field";
 }
-var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+var getJsonTypeInArray = (jsonType) => {
+  return Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
+};
 var getOptions = (field) => {
   const allValues = field.options?.map((option) => ({
     value: option.value,
@@ -11880,9 +11885,13 @@ var getOptions = (field) => {
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
-  if (field.options?.length > 0) {
+  if (field.options?.length > 0 && field.jsonType !== "number") {
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues);
+    return yupSchemas.radioOrSelectString(optionValues);
+  }
+  if (field.options?.length > 0 && field.jsonType === "number") {
+    const optionValues = getOptions(field).map((i) => i.value);
+    return yupSchemas.radioOrSelectNumber(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -12699,7 +12708,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 +12804,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.2-dev.20240213105045",
+  "version": "0.9.1-dev.20240320135936",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

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,85 @@ 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) });
+  });
+
+  it('Should work numbers with non-standard input types', () => {
+    const { fields, handleValidation } = createHeadlessForm(
+      {
+        properties: {
+          number: {
+            type: 'integer',
+            const: 300,
+            default: 300,
+            'x-jsf-presentation': {
+              inputType: 'money',
+            },
+          },
+        },
+        required: ['number'],
+      },
+      { strictInputType: true }
+    );
+    expect(handleValidation({ number: 0 }).formErrors).toEqual({
+      number: 'The only accepted value is 300.',
+    });
+    expect(handleValidation({ number: 300 }).formErrors).toBeUndefined();
+    expect(fields[0]).toMatchObject({ forcedValue: 300 });
+  });
+});
+
+describe('OneOf const', () => {
+  it('Validates numbers correctly', () => {
+    const { handleValidation } = createHeadlessForm(
+      {
+        properties: {
+          number: { type: 'number', oneOf: [{ const: 0 }, { const: 1 }, { const: 2 }] },
+        },
+      },
+      { strictInputType: false }
+    );
+    expect(handleValidation({}).formErrors).toEqual(undefined);
+    expect(handleValidation({ number: 3 }).formErrors).toEqual({
+      number: 'The option 3 is not valid.',
+    });
+    expect(handleValidation({ number: 2 }).formErrors).toBeUndefined();
+    expect(handleValidation({ number: '2' }).formErrors).toEqual({
+      number: 'The option "2" is not valid.',
+    });
+  });
+
+  it('Validates strings', () => {
+    const { handleValidation } = createHeadlessForm(
+      {
+        properties: {
+          number: { type: 'number', oneOf: [{ const: 'a' }, { const: 'b' }, { const: 'c' }] },
+        },
+      },
+      { strictInputType: false }
+    );
+    expect(handleValidation({}).formErrors).toEqual(undefined);
+    expect(handleValidation({ number: 'd' }).formErrors).toEqual({
+      number: 'The option "d" is not valid.',
+    });
+    expect(handleValidation({ number: 'a' }).formErrors).toBeUndefined();
+    expect(handleValidation({ number: '2' }).formErrors).toEqual({
+      number: 'The option "2" is not valid.',
+    });
+  });
 });

package/src/tests/helpers.js

@@ -93,6 +93,7 @@ export const mockTextMaxLengthInput = {
 export const mockRadioInputDeprecated = {
   title: 'Has siblings',
   description: 'Do you have any siblings?',
+  type: 'string',
   enum: ['yes', 'no'],
   'x-jsf-presentation': {
     inputType: 'radio',
@@ -386,6 +387,7 @@ export const mockGroupArrayInput = {
           ],
         },
         title: 'Child Sex',
+        type: 'string',
       },
     },
     'x-jsf-order': ['full_name', 'birthdate', 'sex'],
@@ -842,7 +844,7 @@ export const mockRadioInputOptionalNull = {
     { const: 'yes', title: 'Yes' },
     { const: 'no', title: 'No' },
     // JSF excludes the null option from the field output
-    // But keepts null as an accepted value
+    // But keeps null as an accepted value
     { const: null, title: 'N/A' },
   ],
   'x-jsf-presentation': { inputType: 'radio' },
@@ -1612,7 +1614,6 @@ export const schemaFieldsetScopedCondition = {
       properties: {
         has_child: {
           description: 'If yes, it will show its age.',
-          maximum: 100,
           'x-jsf-presentation': {
             inputType: 'radio',
             options: [
@@ -1627,7 +1628,7 @@ export const schemaFieldsetScopedCondition = {
             ],
           },
           title: 'Do you have a child?',
-          type: 'number',
+          type: 'string',
         },
         age: {
           description: 'This age is required, but the "age" at the root level is still optional.',

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,