@remoteoss/json-schema-form 0.9.1-dev.20240320153711 → 0.9.1-dev.20240321210726

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320153711
- Generated: Wed, 20 Mar 2024 15:37:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240321210726
+ Generated: Thu, 21 Mar 2024 21:07:37 GMT
 
  MIT License
 
@@ -509,12 +509,21 @@ var yupSchemas = {
     }
     return dateString;
   },
-  radioOrSelectNumber: (options) => (0, import_yup.number)().strict().typeError("The value must be a number").test(
+  radioOrSelectNumber: (options) => (0, import_yup.mixed)().typeError("The value must be a number").transform((value) => {
+    if (options?.some((option) => option.value === null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).test(
     "matchesOptionOrPattern",
     ({ value }) => {
       return `The option ${JSON.stringify(value)} is not valid.`;
     },
-    (value) => validateRadioOrSelectOptions(value, options)
+    (value) => {
+      if (value !== void 0 && typeof value !== "number")
+        return false;
+      return validateRadioOrSelectOptions(value, options);
+    }
   ).nullable(),
   number: (0, import_yup.number)().typeError("The value must be a number").nullable(),
   file: (0, import_yup.array)().nullable(),

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320153711
- Generated: Wed, 20 Mar 2024 15:37:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240321210726
+ Generated: Thu, 21 Mar 2024 21:07:37 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);
@@ -473,12 +473,21 @@ var yupSchemas = {
     }
     return dateString;
   },
-  radioOrSelectNumber: (options) => number().strict().typeError("The value must be a number").test(
+  radioOrSelectNumber: (options) => mixed().typeError("The value must be a number").transform((value) => {
+    if (options?.some((option) => option.value === null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).test(
     "matchesOptionOrPattern",
     ({ value }) => {
       return `The option ${JSON.stringify(value)} is not valid.`;
     },
-    (value) => validateRadioOrSelectOptions(value, options)
+    (value) => {
+      if (value !== void 0 && typeof value !== "number")
+        return false;
+      return validateRadioOrSelectOptions(value, options);
+    }
   ).nullable(),
   number: number().typeError("The value must be a number").nullable(),
   file: array().nullable(),

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240320153711
- Generated: Wed, 20 Mar 2024 15:37:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.9.1-dev.20240321210726
+ Generated: Thu, 21 Mar 2024 21:07:37 GMT
 
  MIT License
 
@@ -11827,12 +11827,21 @@ var yupSchemas = {
     }
     return dateString;
   },
-  radioOrSelectNumber: (options) => NumberSchema().strict().typeError("The value must be a number").test(
+  radioOrSelectNumber: (options) => SchemaType().typeError("The value must be a number").transform((value) => {
+    if (options?.some((option) => option.value === null)) {
+      return value;
+    }
+    return value === null ? void 0 : value;
+  }).test(
     "matchesOptionOrPattern",
     ({ value }) => {
       return `The option ${JSON.stringify(value)} is not valid.`;
     },
-    (value) => validateRadioOrSelectOptions(value, options)
+    (value) => {
+      if (value !== void 0 && typeof value !== "number")
+        return false;
+      return validateRadioOrSelectOptions(value, options);
+    }
   ).nullable(),
   number: NumberSchema().typeError("The value must be a number").nullable(),
   file: array_default().nullable(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.9.1-dev.20240320153711",
+  "version": "0.9.1-dev.20240321210726",
   "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

@@ -210,7 +210,7 @@ describe('OneOf const', () => {
     });
     expect(handleValidation({ number: 2 }).formErrors).toBeUndefined();
     expect(handleValidation({ number: '2' }).formErrors).toEqual({
-      number: 'The value must be a number',
+      number: 'The option "2" is not valid.',
     });
   });
 
@@ -229,7 +229,8 @@ describe('OneOf const', () => {
     });
     expect(handleValidation({ number: 2 }).formErrors).toBeUndefined();
     expect(handleValidation({ number: '2' }).formErrors).toEqual({
-      number: 'The value must be a number',
+      number: 'The option "2" is not valid.',
     });
+    expect(handleValidation({ number: null }).formErrors).toEqual(undefined);
   });
 });

package/src/tests/createHeadlessForm.test.js

@@ -2028,6 +2028,45 @@ describe('createHeadlessForm', () => {
     });
   });
 
+  it('supports oneOf number const', () => {
+    const result = createHeadlessForm({
+      type: 'object',
+      additionalProperties: false,
+      properties: {
+        pets: {
+          title: 'How many pets?',
+          oneOf: [
+            {
+              title: 'One',
+              const: 0,
+            },
+            {
+              title: 'Two',
+              const: 2,
+            },
+            {
+              title: 'null',
+              const: 1,
+            },
+          ],
+          'x-jsf-presentation': {
+            inputType: 'select',
+          },
+          type: ['number', 'null'],
+        },
+      },
+      required: [],
+      'x-jsf-order': ['pets'],
+    });
+
+    const fieldValidator = result.fields[0].schema;
+
+    expect(fieldValidator.isValidSync(0)).toBe(true);
+    expect(fieldValidator.isValidSync(1)).toBe(true);
+    expect(() => fieldValidator.validateSync('2')).toThrowError('The option "2" is not valid.');
+    expect(fieldValidator.isValidSync(null)).toBe(true);
+  });
+
   describe('x-jsf-presentation attribute', () => {
     it('support field with "x-jsf-presentation.statement"', () => {
       const result = createHeadlessForm(schemaInputWithStatement);