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

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
- Generated: Mon, 03 Jul 2023 16:19:50 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703203242
+ Generated: Mon, 03 Jul 2023 20:32:50 GMT
 
  MIT License
 
@@ -383,7 +383,15 @@ var validateOnlyStrings = (0, import_yup.string)().trim().nullable().test(
 );
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => (0, import_yup.string)().nullable().oneOf(options, ({ value }) => {
+  radioOrSelect: (options) => (0, import_yup.string)().nullable().transform((value) => {
+    if (value === "") {
+      return void 0;
+    }
+    if (options?.includes(null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).oneOf(options, ({ value }) => {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: (0, import_yup.string)().nullable().trim().matches(
@@ -420,38 +428,19 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   return "Required field";
 }
 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,
-    ""
-    // [1]
-  ];
-  if (field.required) {
-    return [
-      ...optionsBroken,
-      null
-      // [2]
-    ];
-  }
+var getOptions = (field) => {
+  const allValues = field.options?.map((option) => option.value);
   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,
-    null
-    // [3]
-  ];
+  return isOptionalWithNull ? [...allValues, null] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const optionsAllowed = getOptionsAllowed(field);
-    return yupSchemas.radioOrSelect(optionsAllowed);
+    const optionValues = getOptions(field);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   return yupSchemas[inputType] || yupSchemasToJsonTypes[jsonType];
 };
@@ -665,8 +654,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        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
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
- Generated: Mon, 03 Jul 2023 16:19:50 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703203242
+ Generated: Mon, 03 Jul 2023 20:32:50 GMT
 
  MIT License
 
@@ -347,7 +347,15 @@ var validateOnlyStrings = string().trim().nullable().test(
 );
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => string().nullable().oneOf(options, ({ value }) => {
+  radioOrSelect: (options) => string().nullable().transform((value) => {
+    if (value === "") {
+      return void 0;
+    }
+    if (options?.includes(null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).oneOf(options, ({ value }) => {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: string().nullable().trim().matches(
@@ -384,38 +392,19 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   return "Required field";
 }
 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,
-    ""
-    // [1]
-  ];
-  if (field.required) {
-    return [
-      ...optionsBroken,
-      null
-      // [2]
-    ];
-  }
+var getOptions = (field) => {
+  const allValues = field.options?.map((option) => option.value);
   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,
-    null
-    // [3]
-  ];
+  return isOptionalWithNull ? [...allValues, null] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const optionsAllowed = getOptionsAllowed(field);
-    return yupSchemas.radioOrSelect(optionsAllowed);
+    const optionValues = getOptions(field);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   return yupSchemas[inputType] || yupSchemasToJsonTypes[jsonType];
 };
@@ -629,8 +618,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        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
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703161935
- Generated: Mon, 03 Jul 2023 16:19:50 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703203242
+ Generated: Mon, 03 Jul 2023 20:32:50 GMT
 
  MIT License
 
@@ -11323,7 +11323,15 @@ var validateOnlyStrings = StringSchema().trim().nullable().test(
 );
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => StringSchema().nullable().oneOf(options, ({ value }) => {
+  radioOrSelect: (options) => StringSchema().nullable().transform((value) => {
+    if (value === "") {
+      return void 0;
+    }
+    if (options?.includes(null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).oneOf(options, ({ value }) => {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: StringSchema().nullable().trim().matches(
@@ -11360,38 +11368,19 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   return "Required field";
 }
 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,
-    ""
-    // [1]
-  ];
-  if (field.required) {
-    return [
-      ...optionsBroken,
-      null
-      // [2]
-    ];
-  }
+var getOptions = (field) => {
+  const allValues = field.options?.map((option) => option.value);
   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,
-    null
-    // [3]
-  ];
+  return isOptionalWithNull ? [...allValues, null] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const optionsAllowed = getOptionsAllowed(field);
-    return yupSchemas.radioOrSelect(optionsAllowed);
+    const optionValues = getOptions(field);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   return yupSchemas[inputType] || yupSchemasToJsonTypes[jsonType];
 };
@@ -11605,8 +11594,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    const field = getField(name, formFields);
+    return validateFieldSchema(
+      {
+        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
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/package.json

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