@remoteoss/json-schema-form 0.11.5-dev.20240821091937 → 0.11.5-dev.20240821134012

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821091937
- Generated: Wed, 21 Aug 2024 09:19:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
+ Generated: Wed, 21 Aug 2024 13:40:24 GMT
 
  MIT License
 
@@ -673,24 +673,24 @@ function buildYupSchema(field, config, logic) {
       () => errorMessage.pattern ?? errorMessageFromConfig.pattern ?? `Must have a valid format. E.g. ${randomPlaceholder}`
     );
   }
-  function isFile(files) {
-    return Array.isArray(files) ? files.every((file) => file instanceof File) : files instanceof File;
+  function isValidFileInput(files) {
+    return files === void 0 || files === null || files.every((file) => file instanceof File);
   }
   function withFile(yupSchema) {
-    return yupSchema.test("isValidFile", "Not a valid file.", isFile);
+    return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
   }
   function withMaxFileSize(yupSchema) {
     return yupSchema.test(
       "isValidFileSize",
       errorMessage.maxFileSize ?? errorMessageFromConfig.maxFileSize ?? `File size too large. The limit is ${convertKbBytesToMB(propertyFields.maxFileSize)} MB.`,
-      (files) => isFile(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
+      (files) => isValidFileInput(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
     );
   }
   function withFileFormat(yupSchema) {
     return yupSchema.test(
       "isSupportedFormat",
       errorMessage.accept ?? errorMessageFromConfig.accept ?? `Unsupported file format. The acceptable formats are ${propertyFields.accept}.`,
-      (files) => isFile(files) && files.length > 0 ? files.some((file) => {
+      (files) => isValidFileInput(files) && files?.length > 0 ? files.some((file) => {
         const fileType = file.name.split(".").pop();
         return propertyFields.accept.includes(fileType.toLowerCase());
       }) : true
@@ -745,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.5-dev.20240821091937
- Generated: Wed, 21 Aug 2024 09:19:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
+ Generated: Wed, 21 Aug 2024 13:40:24 GMT
 
  MIT License
 
@@ -636,24 +636,24 @@ function buildYupSchema(field, config, logic) {
       () => errorMessage.pattern ?? errorMessageFromConfig.pattern ?? `Must have a valid format. E.g. ${randomPlaceholder}`
     );
   }
-  function isFile(files) {
-    return Array.isArray(files) ? files.every((file) => file instanceof File) : files instanceof File;
+  function isValidFileInput(files) {
+    return files === void 0 || files === null || files.every((file) => file instanceof File);
   }
   function withFile(yupSchema) {
-    return yupSchema.test("isValidFile", "Not a valid file.", isFile);
+    return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
   }
   function withMaxFileSize(yupSchema) {
     return yupSchema.test(
       "isValidFileSize",
       errorMessage.maxFileSize ?? errorMessageFromConfig.maxFileSize ?? `File size too large. The limit is ${convertKbBytesToMB(propertyFields.maxFileSize)} MB.`,
-      (files) => isFile(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
+      (files) => isValidFileInput(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
     );
   }
   function withFileFormat(yupSchema) {
     return yupSchema.test(
       "isSupportedFormat",
       errorMessage.accept ?? errorMessageFromConfig.accept ?? `Unsupported file format. The acceptable formats are ${propertyFields.accept}.`,
-      (files) => isFile(files) && files.length > 0 ? files.some((file) => {
+      (files) => isValidFileInput(files) && files?.length > 0 ? files.some((file) => {
         const fileType = file.name.split(".").pop();
         return propertyFields.accept.includes(fileType.toLowerCase());
       }) : true
@@ -708,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.5-dev.20240821091937
- Generated: Wed, 21 Aug 2024 09:19:48 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
+ Generated: Wed, 21 Aug 2024 13:40:24 GMT
 
  MIT License
 
@@ -12152,24 +12152,24 @@ function buildYupSchema(field, config, logic) {
       () => errorMessage.pattern ?? errorMessageFromConfig.pattern ?? `Must have a valid format. E.g. ${randomPlaceholder}`
     );
   }
-  function isFile(files) {
-    return Array.isArray(files) ? files.every((file) => file instanceof File) : files instanceof File;
+  function isValidFileInput(files) {
+    return files === void 0 || files === null || files.every((file) => file instanceof File);
   }
   function withFile(yupSchema) {
-    return yupSchema.test("isValidFile", "Not a valid file.", isFile);
+    return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
   }
   function withMaxFileSize(yupSchema) {
     return yupSchema.test(
       "isValidFileSize",
       errorMessage.maxFileSize ?? errorMessageFromConfig.maxFileSize ?? `File size too large. The limit is ${convertKbBytesToMB(propertyFields.maxFileSize)} MB.`,
-      (files) => isFile(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
+      (files) => isValidFileInput(files) && !files?.some((file) => convertBytesToKB(file.size) > propertyFields.maxFileSize)
     );
   }
   function withFileFormat(yupSchema) {
     return yupSchema.test(
       "isSupportedFormat",
       errorMessage.accept ?? errorMessageFromConfig.accept ?? `Unsupported file format. The acceptable formats are ${propertyFields.accept}.`,
-      (files) => isFile(files) && files.length > 0 ? files.some((file) => {
+      (files) => isValidFileInput(files) && files?.length > 0 ? files.some((file) => {
         const fileType = file.name.split(".").pop();
         return propertyFields.accept.includes(fileType.toLowerCase());
       }) : true
@@ -12224,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.5-dev.20240821091937",
+  "version": "0.11.5-dev.20240821134012",
   "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

@@ -61,6 +61,7 @@ import {
   schemaInputTypeNumberWithPercentage,
   schemaForErrorMessageSpecificity,
   jsfConfigForErrorMessageSpecificity,
+  schemaInputTypeFile,
 } from './helpers';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -2773,6 +2774,35 @@ describe('createHeadlessForm', () => {
           .validate(emptyFile)
       ).resolves.toEqual(emptyFile);
     });
+
+    it('it validates missing file correctly', () => {
+      const { handleValidation } = createHeadlessForm(
+        JSONSchemaBuilder().addInput({ fileInput: mockFileInput }).build()
+      );
+      const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+      expect(validateForm({})).toBeUndefined();
+      expect(validateForm({ fileInput: null })).toBeUndefined();
+    });
+  });
+
+  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', () => {