@remoteoss/json-schema-form 0.4.1-dev.20230703195833 → 0.5.0-dev.20230705093926

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+#### 0.4.1-beta.0 (2023-07-03)
+
+##### Bug Fixes
+
+* **fieldset:**  support root conditionals for fieldsets ([#23](https://github.com/remoteoss/json-schema-form/pull/23)) ([65d87b3a](https://github.com/remoteoss/json-schema-form/commit/65d87b3a93018f0729aed565000eb2a2ce1f2ce7))
+* **select/radio:**  Accept just the values in options (plus `''` and `null` for backward-compatibility) ([#18](https://github.com/remoteoss/json-schema-form/pull/18)) ([37501d2d](https://github.com/remoteoss/json-schema-form/commit/37501d2ddafdd5e207b34d2ca3f6b7b7a1006e9d))
+
 #### 0.4.0-beta.0 (2023-06-22)
 
 ##### New Features

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
- Generated: Mon, 03 Jul 2023 19:58:43 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230705093926
+ Generated: Wed, 05 Jul 2023 09:39:42 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];
 };
@@ -925,10 +914,8 @@ function extractParametersFromNode(schemaNode) {
       },
       // Handle [name].presentation
       ...presentation,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
- Generated: Mon, 03 Jul 2023 19:58:43 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230705093926
+ Generated: Wed, 05 Jul 2023 09:39:42 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];
 };
@@ -889,10 +878,8 @@ function extractParametersFromNode(schemaNode) {
       },
       // Handle [name].presentation
       ...presentation,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
- Generated: Mon, 03 Jul 2023 19:58:43 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230705093926
+ Generated: Wed, 05 Jul 2023 09:39:42 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];
 };
@@ -11865,10 +11854,8 @@ function extractParametersFromNode(schemaNode) {
       },
       // Handle [name].presentation
       ...presentation,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.4.1-dev.20230703195833",
+  "version": "0.5.0-dev.20230705093926",
   "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

@@ -439,23 +439,15 @@ describe('createHeadlessForm', () => {
 
       // All allowed options are valid
       validOptions.forEach((value) => {
-        expect(
-          validateForm({
-            [fieldName]: value,
-          })
-        ).toBeUndefined();
+        expect(validateForm({ [fieldName]: value })).toBeUndefined();
       });
 
       // Any other arbitrary value is not valid.
-      expect(
-        validateForm({
-          [fieldName]: 'blah-blah',
-        })
-      ).toEqual({
+      expect(validateForm({ [fieldName]: 'blah-blah' })).toEqual({
         [fieldName]: 'The option "blah-blah" is not valid.',
       });
 
-      // This is a required field:
+      // Given undefined, it says it's a  required field.
       expect(validateForm({})).toEqual({
         [fieldName]: 'Required field',
       });
@@ -831,6 +823,9 @@ describe('createHeadlessForm', () => {
 
     describe('support "radio" optional field - more examples @BUG RMT-518', () => {
       function assertCommonBehavior(validateForm) {
+        // Note: Very similar to assertOptionsAllowed()
+        // We could reuse it in a next iteration.
+
         // Happy path
         expect(validateForm({ has_car: 'yes' })).toBeUndefined();