@remoteoss/json-schema-form 0.4.1-dev.20230702181843 → 0.4.1-dev.20230703161935

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230702181843
- Generated: Sun, 02 Jul 2023 18:19:05 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
+ Generated: Mon, 03 Jul 2023 16:19:50 GMT
 
  MIT License
 
@@ -422,18 +422,30 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
 var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
 var getOptionsAllowed = (field) => {
   const onlyValues = field.options?.map((option) => option.value);
-  const optionsBroken = [...onlyValues, ""];
+  const optionsBroken = [
+    ...onlyValues,
+    ""
+    // [1]
+  ];
   if (field.required) {
-    return optionsBroken;
+    return [
+      ...optionsBroken,
+      null
+      // [2]
+    ];
   }
-  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null" option
-  // but we don't have direct access at this point. Otherwise
-  // the JSON Schema validator will fail because setting jsonType is not enough.
+  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null"
+  // option but we don't have direct access at this point.
+  // Otherwise the JSON Schema validator will fail as explained in PR#18
   field.jsonType.includes("null");
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230702181843
- Generated: Sun, 02 Jul 2023 18:19:05 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
+ Generated: Mon, 03 Jul 2023 16:19:50 GMT
 
  MIT License
 
@@ -386,18 +386,30 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
 var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
 var getOptionsAllowed = (field) => {
   const onlyValues = field.options?.map((option) => option.value);
-  const optionsBroken = [...onlyValues, ""];
+  const optionsBroken = [
+    ...onlyValues,
+    ""
+    // [1]
+  ];
   if (field.required) {
-    return optionsBroken;
+    return [
+      ...optionsBroken,
+      null
+      // [2]
+    ];
   }
-  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null" option
-  // but we don't have direct access at this point. Otherwise
-  // the JSON Schema validator will fail because setting jsonType is not enough.
+  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null"
+  // option but we don't have direct access at this point.
+  // Otherwise the JSON Schema validator will fail as explained in PR#18
   field.jsonType.includes("null");
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230702181843
- Generated: Sun, 02 Jul 2023 18:19:05 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
+ Generated: Mon, 03 Jul 2023 16:19:50 GMT
 
  MIT License
 
@@ -11362,18 +11362,30 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
 var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
 var getOptionsAllowed = (field) => {
   const onlyValues = field.options?.map((option) => option.value);
-  const optionsBroken = [...onlyValues, ""];
+  const optionsBroken = [
+    ...onlyValues,
+    ""
+    // [1]
+  ];
   if (field.required) {
-    return optionsBroken;
+    return [
+      ...optionsBroken,
+      null
+      // [2]
+    ];
   }
-  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null" option
-  // but we don't have direct access at this point. Otherwise
-  // the JSON Schema validator will fail because setting jsonType is not enough.
+  const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null"
+  // option but we don't have direct access at this point.
+  // Otherwise the JSON Schema validator will fail as explained in PR#18
   field.jsonType.includes("null");
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/package.json

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

package/src/tests/createHeadlessForm.test.js

@@ -461,11 +461,14 @@ describe('createHeadlessForm', () => {
       });
 
       // As required field, empty string ("") is also considered empty. @BUG RMT-518
-      expect(
-        validateForm({
-          [fieldName]: '',
-        })
-      ).toEqual({
+      // Expectation: The error to be "The option '' is not valid."
+      expect(validateForm({ [fieldName]: '' })).toEqual({
+        [fieldName]: 'Required field',
+      });
+
+      // As required field, null is also considered empty @BUG RMT-518
+      // Expectation: The error to be "The option null is not valid."
+      expect(validateForm({ [fieldName]: null })).toEqual({
         [fieldName]: 'Required field',
       });
     }
@@ -849,26 +852,31 @@ describe('createHeadlessForm', () => {
         expect(validateForm({ has_car: '' })).toBeUndefined();
       }
 
-      it('with null option (as Remote)', () => {
-        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalNull);
+      it('normal optional (conventional way)', () => {
+        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalConventional);
         const validateForm = (vals) => friendlyError(handleValidation(vals));
 
         assertCommonBehavior(validateForm);
 
-        // Accepts null value
+        // Accepts null, even though it shoudln't @BUG RMT-518
+        // This is for cases where we (Remote) still have incorrect
+        // JSON Schemas in our Platform.
         expect(validateForm({ has_car: null })).toBeUndefined();
+        // Expected:
+        // // Does NOT accept null value
+        // expect(validateForm({ has_car: null })).toEqual({
+        //   has_car: 'The option null is not valid.',
+        // });
       });
 
-      it('without null option (conventional way)', () => {
-        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalConventional);
+      it('with null option (as Remote does)', () => {
+        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalNull);
         const validateForm = (vals) => friendlyError(handleValidation(vals));
 
         assertCommonBehavior(validateForm);
 
-        // Does NOT accept null value
-        expect(validateForm({ has_car: null })).toEqual({
-          has_car: 'The option null is not valid.',
-        });
+        // Accepts null value
+        expect(validateForm({ has_car: null })).toBeUndefined();
       });
     });
 

package/src/tests/helpers.custom.js

@@ -200,7 +200,7 @@ export const schemaInputTypeHidden = {
       ...mockSelectInputSolo,
       title: 'Select hidden',
       'x-jsf-presentation': { inputType: 'hidden' },
-      default: 'Travel Bonus',
+      default: 'chr',
     },
     a_hidden_select_multiple: {
       ...schemaInputTypeCountriesMultiple.properties.nationality,

package/src/tests/helpers.js

@@ -1696,7 +1696,7 @@ export const schemaWithConditionalToFieldset = {
   properties: {
     work_hours_per_week: {
       title: 'Hours per week',
-      type: 'string',
+      type: 'number',
       description: 'Above 30 hours, the Perk>Food options change, and PTO is required.',
       'x-jsf-presentation': {
         inputType: 'number',
@@ -1704,7 +1704,7 @@ export const schemaWithConditionalToFieldset = {
     },
     pto: {
       title: 'Time-off (days)',
-      type: 'string',
+      type: 'number',
       'x-jsf-presentation': {
         inputType: 'number',
       },