@remoteoss/json-schema-form 0.11.4-dev.20240820134847 → 0.11.5-dev.20240821121440

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+#### 0.11.4-beta.0 (2024-08-20)
+
+##### Bug Fixes
+
+* **file:**  Validate the value is an instance of File ([#87](https://github.com/remoteoss/json-schema-form/pull/87)) ([8361df0d](https://github.com/remoteoss/json-schema-form/commit/8361df0d4e9f7d83342cdc91c41efb493e391307))
+
+##### Chores
+
+* **tests:**  Move code in global test scope to inside beforeAll ([#90](https://github.com/remoteoss/json-schema-form/pull/90)) ([88f7d3c9](https://github.com/remoteoss/json-schema-form/commit/88f7d3c95330c828fc2539962b878c43b61ca8a0))
+
 #### 0.11.3-beta.0 (2024-08-19)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.4-dev.20240820134847
- Generated: Tue, 20 Aug 2024 13:49:16 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821121440
+ Generated: Wed, 21 Aug 2024 12:15:00 GMT
 
  MIT License
 
@@ -553,7 +553,12 @@ var yupSchemas = {
   multiple: {
     select: (0, import_yup.array)().nullable(),
     "group-array": (0, import_yup.array)().nullable()
-  }
+  },
+  null: (0, import_yup.mixed)().typeError("The value must be null").test(
+    "matchesNullValue",
+    ({ value }) => `The value ${JSON.stringify(value)} is not valid.`,
+    (value) => value === void 0 || value === null
+  )
 };
 var yupSchemasToJsonTypes = {
   string: yupSchemas.text,
@@ -562,7 +567,7 @@ var yupSchemasToJsonTypes = {
   object: yupSchemas.fieldset,
   array: yupSchemas.multiple.select,
   boolean: yupSchemas.checkboxBool,
-  null: import_noop.default
+  null: yupSchemas.null
 };
 function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   if (inlineError)
@@ -740,12 +745,13 @@ function buildYupSchema(field, config, logic) {
     validators[0] = () => withBaseSchema().of(buildGroupArraySchema());
   } else if (inputType === supportedTypes.FIELDSET) {
     validators[0] = () => withBaseSchema().shape(buildFieldSetSchema(propertyFields.fields));
-  } else if (inputType === supportedTypes.FILE) {
-    validators.push(withFile);
   }
   if (propertyFields.required) {
     validators.push(withRequired);
   }
+  if (inputType === supportedTypes.FILE) {
+    validators.push(withFile);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.4-dev.20240820134847
- Generated: Tue, 20 Aug 2024 13:49:16 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821121440
+ Generated: Wed, 21 Aug 2024 12:15:00 GMT
 
  MIT License
 
@@ -516,7 +516,12 @@ var yupSchemas = {
   multiple: {
     select: array().nullable(),
     "group-array": array().nullable()
-  }
+  },
+  null: mixed().typeError("The value must be null").test(
+    "matchesNullValue",
+    ({ value }) => `The value ${JSON.stringify(value)} is not valid.`,
+    (value) => value === void 0 || value === null
+  )
 };
 var yupSchemasToJsonTypes = {
   string: yupSchemas.text,
@@ -525,7 +530,7 @@ var yupSchemasToJsonTypes = {
   object: yupSchemas.fieldset,
   array: yupSchemas.multiple.select,
   boolean: yupSchemas.checkboxBool,
-  null: noop
+  null: yupSchemas.null
 };
 function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   if (inlineError)
@@ -703,12 +708,13 @@ function buildYupSchema(field, config, logic) {
     validators[0] = () => withBaseSchema().of(buildGroupArraySchema());
   } else if (inputType === supportedTypes.FIELDSET) {
     validators[0] = () => withBaseSchema().shape(buildFieldSetSchema(propertyFields.fields));
-  } else if (inputType === supportedTypes.FILE) {
-    validators.push(withFile);
   }
   if (propertyFields.required) {
     validators.push(withRequired);
   }
+  if (inputType === supportedTypes.FILE) {
+    validators.push(withFile);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.4-dev.20240820134847
- Generated: Tue, 20 Aug 2024 13:49:16 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821121440
+ Generated: Wed, 21 Aug 2024 12:15:00 GMT
 
  MIT License
 
@@ -12032,7 +12032,12 @@ var yupSchemas = {
   multiple: {
     select: array_default().nullable(),
     "group-array": array_default().nullable()
-  }
+  },
+  null: SchemaType().typeError("The value must be null").test(
+    "matchesNullValue",
+    ({ value }) => `The value ${JSON.stringify(value)} is not valid.`,
+    (value) => value === void 0 || value === null
+  )
 };
 var yupSchemasToJsonTypes = {
   string: yupSchemas.text,
@@ -12041,7 +12046,7 @@ var yupSchemasToJsonTypes = {
   object: yupSchemas.fieldset,
   array: yupSchemas.multiple.select,
   boolean: yupSchemas.checkboxBool,
-  null: import_noop.default
+  null: yupSchemas.null
 };
 function getRequiredErrorMessage(inputType, { inlineError, configError }) {
   if (inlineError)
@@ -12219,12 +12224,13 @@ function buildYupSchema(field, config, logic) {
     validators[0] = () => withBaseSchema().of(buildGroupArraySchema());
   } else if (inputType === supportedTypes.FIELDSET) {
     validators[0] = () => withBaseSchema().shape(buildFieldSetSchema(propertyFields.fields));
-  } else if (inputType === supportedTypes.FILE) {
-    validators.push(withFile);
   }
   if (propertyFields.required) {
     validators.push(withRequired);
   }
+  if (inputType === supportedTypes.FILE) {
+    validators.push(withFile);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.4-dev.20240820134847",
+  "version": "0.11.5-dev.20240821121440",
   "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

@@ -29,6 +29,7 @@ import {
   schemaInputWithStatement,
   schemaInputTypeCheckbox,
   schemaInputTypeCheckboxBooleans,
+  schemaInputTypeNull,
   schemaWithOrderKeyword,
   schemaWithPositionDeprecated,
   schemaDynamicValidationConst,
@@ -60,6 +61,7 @@ import {
   schemaInputTypeNumberWithPercentage,
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
+  schemaInputTypeFile,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -1578,6 +1580,48 @@ describe('createHeadlessForm', () => {
       });
     });
 
+    it('supports "null" field type', () => {
+      const { handleValidation, fields } = createHeadlessForm(schemaInputTypeNull, {
+        strictInputType: false,
+      });
+
+      expect(fields).toMatchObject([
+        {
+          name: 'name',
+          label: '(Optional) Name',
+          type: undefined,
+          jsonType: 'null',
+          schema: expect.any(Object),
+        },
+        {
+          name: 'username',
+          label: 'Username',
+          type: 'text',
+          jsonType: 'string',
+          inputType: 'text',
+          maxLength: 4,
+          schema: expect.any(Object),
+        },
+      ]);
+
+      // jsonType `null` fields do not have a corresponding inputType
+      expect(fields[0].inputType).toBeUndefined();
+
+      const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+      expect(validateForm({})).toEqual({
+        username: 'Required field',
+      });
+
+      expect(validateForm({ username: 'hello', name: 'John' })).toEqual({
+        username: 'Please insert up to 4 characters',
+        name: 'The value "John" is not valid.',
+      });
+
+      expect(validateForm({ username: 'john' })).toBeUndefined();
+      expect(validateForm({ username: 'john', name: null })).toBeUndefined();
+    });
+
     it('supports oneOf pattern validation', () => {
       const result = createHeadlessForm(mockTelWithPattern);
 
@@ -2732,6 +2776,25 @@ describe('createHeadlessForm', () => {
     });
   });
 
+  describe('when a field file is required', () => {
+    it('it validates missing file correctly', () => {
+      const { handleValidation } = createHeadlessForm(schemaInputTypeFile);
+      const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+      expect(validateForm({})).toEqual({
+        a_file: 'Required field',
+      });
+
+      expect(
+        validateForm({
+          a_file: null,
+        })
+      ).toEqual({
+        a_file: 'Required field',
+      });
+    });
+  });
+
   describe('when a field has accepted extensions', () => {
     let fields;
     beforeEach(() => {

package/src/tests/helpers.js

@@ -1141,6 +1141,23 @@ export const schemaInputTypeCheckboxBooleans = JSONSchemaBuilder()
   .setRequiredFields(['boolean_required'])
   .build();
 
+export const schemaInputTypeNull = {
+  additionalProperties: false,
+  type: 'object',
+  properties: {
+    name: {
+      type: 'null',
+      title: '(Optional) Name',
+    },
+    username: {
+      type: 'string',
+      title: 'Username',
+      maxLength: 4,
+    },
+  },
+  required: ['username'],
+};
+
 export const schemaCustomErrorMessageByField = {
   properties: {
     tabs: {