@remoteoss/json-schema-form 0.11.5-dev.20240821134012 → 0.11.6-beta.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+#### 0.11.6-beta.0 (2024-10-15)
+
+##### Bug Fixes
+
+* **modify:**  Support json schemas without allOf ([#93](https://github.com/remoteoss/json-schema-form/pull/93)) ([03795d0a](https://github.com/remoteoss/json-schema-form/commit/03795d0ac1a7ae0d523cd8418b83342676f221cf))
+
+#### 0.11.5-beta.0 (2024-08-22)
+
+##### Bug Fixes
+
+* **validation:**  Validate null field type correctly ([#91](https://github.com/remoteoss/json-schema-form/pull/91)) ([1cb8b61f](https://github.com/remoteoss/json-schema-form/commit/1cb8b61fec06d851832f9e76b3156d6f574b5d41))
+* **files:** accept object value with `name` property ([#91](https://github.com/remoteoss/json-schema-form/pull/91)) ([1cb8b61f](https://github.com/remoteoss/json-schema-form/commit/1cb8b61fec06d851832f9e76b3156d6f574b5d41))
+
+
 #### 0.11.4-beta.0 (2024-08-20)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
- Generated: Wed, 21 Aug 2024 13:40:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.6-beta.0
+ Generated: Tue, 15 Oct 2024 12:38:54 GMT
 
  MIT License
 
@@ -674,7 +674,9 @@ function buildYupSchema(field, config, logic) {
     );
   }
   function isValidFileInput(files) {
-    return files === void 0 || files === null || files.every((file) => file instanceof File);
+    return files === void 0 || files === null || files.every(
+      (file) => file instanceof File || Object.prototype.hasOwnProperty.call(file, "name")
+    );
   }
   function withFile(yupSchema) {
     return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
@@ -2042,7 +2044,7 @@ function pickFields(originalSchema, fieldsToPick) {
     }
   });
   let missingFields = {};
-  newSchema.allOf.forEach((condition) => {
+  newSchema.allOf?.forEach((condition) => {
     const { if: ifCondition, then: thenCondition, else: elseCondition } = condition;
     const index = originalSchema.allOf.indexOf(condition);
     missingFields = {

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
- Generated: Wed, 21 Aug 2024 13:40:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.6-beta.0
+ Generated: Tue, 15 Oct 2024 12:38:54 GMT
 
  MIT License
 
@@ -637,7 +637,9 @@ function buildYupSchema(field, config, logic) {
     );
   }
   function isValidFileInput(files) {
-    return files === void 0 || files === null || files.every((file) => file instanceof File);
+    return files === void 0 || files === null || files.every(
+      (file) => file instanceof File || Object.prototype.hasOwnProperty.call(file, "name")
+    );
   }
   function withFile(yupSchema) {
     return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
@@ -2005,7 +2007,7 @@ function pickFields(originalSchema, fieldsToPick) {
     }
   });
   let missingFields = {};
-  newSchema.allOf.forEach((condition) => {
+  newSchema.allOf?.forEach((condition) => {
     const { if: ifCondition, then: thenCondition, else: elseCondition } = condition;
     const index = originalSchema.allOf.indexOf(condition);
     missingFields = {

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.5-dev.20240821134012
- Generated: Wed, 21 Aug 2024 13:40:24 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.6-beta.0
+ Generated: Tue, 15 Oct 2024 12:38:54 GMT
 
  MIT License
 
@@ -12153,7 +12153,9 @@ function buildYupSchema(field, config, logic) {
     );
   }
   function isValidFileInput(files) {
-    return files === void 0 || files === null || files.every((file) => file instanceof File);
+    return files === void 0 || files === null || files.every(
+      (file) => file instanceof File || Object.prototype.hasOwnProperty.call(file, "name")
+    );
   }
   function withFile(yupSchema) {
     return yupSchema.test("isValidFile", "Not a valid file.", isValidFileInput);
@@ -13521,7 +13523,7 @@ function pickFields(originalSchema, fieldsToPick) {
     }
   });
   let missingFields = {};
-  newSchema.allOf.forEach((condition) => {
+  newSchema.allOf?.forEach((condition) => {
     const { if: ifCondition, then: thenCondition, else: elseCondition } = condition;
     const index = originalSchema.allOf.indexOf(condition);
     missingFields = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.5-dev.20240821134012",
+  "version": "0.11.6-beta.0",
   "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

@@ -2862,8 +2862,39 @@ describe('createHeadlessForm', () => {
             .validate({ fileInput: [file] })
         ).resolves.toEqual(assertObj));
     });
+
     describe('and file is not instance of a File', () => {
-      it('should throw an error', async () =>
+      it('accepts if file object has name property', async () => {
+        expect(
+          object()
+            .shape({
+              fileInput: fields[0].schema,
+            })
+            .validate({ fileInput: [{ name: 'foo.pdf' }] })
+        ).resolves.toEqual({ fileInput: [{ name: 'foo.pdf' }] });
+      });
+
+      it('should validate format', async () =>
+        expect(
+          object()
+            .shape({
+              fileInput: fields[0].schema,
+            })
+            .validate({ fileInput: [{ name: 'foo.txt' }] })
+        ).rejects.toMatchObject({
+          errors: ['Unsupported file format. The acceptable formats are .png,.jpg,.jpeg,.pdf.'],
+        }));
+
+      it('should validate max size', async () =>
+        expect(
+          object()
+            .shape({
+              fileInput: fields[0].schema,
+            })
+            .validate({ fileInput: [{ name: 'foo.txt', size: 1024 * 1024 * 1024 }] })
+        ).rejects.toMatchObject({ errors: ['File size too large. The limit is 20 MB.'] }));
+
+      it('throw an error if invalid file object', async () =>
         expect(
           object()
             .shape({

package/src/tests/helpers.js

@@ -782,6 +782,25 @@ export const schemaInputWithStatement = {
   },
 };
 
+export const schemaHiddenInputWithStatement = {
+  properties: {
+    a_field_statement: {
+      type: 'null',
+      title: 'Company statement',
+      'x-jsf-presentation': {
+        inputType: 'hidden',
+        statement: {
+          title: 'Important statement',
+          description:
+            "This statement message will be shown at all times, irrespective of this field's visibility.",
+          inputType: 'statement',
+          severity: 'warning',
+        },
+      },
+    },
+  },
+};
+
 export const schemaInputWithExtra = {
   properties: {
     bonus: {

package/src/tests/modify.test.js

@@ -608,7 +608,7 @@ const schemaTickets = {
   ],
 };
 
-describe('modify() - reoder fields', () => {
+describe('modify() - reorder fields', () => {
   it('reorder fields - basic usage', () => {
     const baseExample = {
       properties: {
@@ -821,6 +821,32 @@ describe('modify() - pick fields', () => {
     expect(warnings).toHaveLength(0);
   });
 
+  it('basic usage without conditionals', () => {
+    const schemaMinimal = {
+      properties: {
+        age: {
+          title: 'Age',
+          type: 'integer',
+        },
+        quantity: {
+          title: 'Quantity',
+          type: 'integer',
+        },
+      },
+      'x-jsf-order': ['age', 'quantity'],
+    };
+    const { schema, warnings } = modify(schemaMinimal, {
+      pick: ['quantity'],
+    });
+
+    expect(schema.properties.quantity).toBeDefined();
+    expect(schema.properties.age).toBeUndefined();
+    // `allOf` conditionals were not defined, and continue to be so.
+    // This test guards against a regression where lack of `allOf` caused a TypeError.
+    expect(schema.allOf).toBeUndefined();
+    expect(warnings).toHaveLength(0);
+  });
+
   it('related conditionals are kept - (else)', () => {
     const { schema, warnings } = modify(schemaTickets, {
       pick: ['has_premium'],