@remoteoss/json-schema-form 0.5.0-dev.20230719114157 → 0.5.0-dev.20230719162322

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719114157
- Generated: Wed, 19 Jul 2023 11:42:22 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719162322
+ Generated: Wed, 19 Jul 2023 16:23:38 GMT
 
  MIT License
 
@@ -414,7 +414,12 @@ var yupSchemas = {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: ({ minDate, maxDate }) => {
-    let dateString = (0, import_yup.string)().nullable().trim().matches(
+    let dateString = (0, import_yup.string)().nullable().transform((value) => {
+      if (value === "") {
+        return void 0;
+      }
+      return value === null ? void 0 : value;
+    }).trim().matches(
       /(?:\d){4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9]|3[0-1])/,
       `Must be a valid date in ${DEFAULT_DATE_FORMAT.toLocaleLowerCase()} format. e.g. ${todayDateHint}`
     );

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719114157
- Generated: Wed, 19 Jul 2023 11:42:22 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719162322
+ Generated: Wed, 19 Jul 2023 16:23:38 GMT
 
  MIT License
 
@@ -378,7 +378,12 @@ var yupSchemas = {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: ({ minDate, maxDate }) => {
-    let dateString = string().nullable().trim().matches(
+    let dateString = string().nullable().transform((value) => {
+      if (value === "") {
+        return void 0;
+      }
+      return value === null ? void 0 : value;
+    }).trim().matches(
       /(?:\d){4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9]|3[0-1])/,
       `Must be a valid date in ${DEFAULT_DATE_FORMAT.toLocaleLowerCase()} format. e.g. ${todayDateHint}`
     );

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719114157
- Generated: Wed, 19 Jul 2023 11:42:22 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-dev.20230719162322
+ Generated: Wed, 19 Jul 2023 16:23:38 GMT
 
  MIT License
 
@@ -11354,7 +11354,12 @@ var yupSchemas = {
     return `The option ${JSON.stringify(value)} is not valid.`;
   }),
   date: ({ minDate, maxDate }) => {
-    let dateString = StringSchema().nullable().trim().matches(
+    let dateString = StringSchema().nullable().transform((value) => {
+      if (value === "") {
+        return void 0;
+      }
+      return value === null ? void 0 : value;
+    }).trim().matches(
       /(?:\d){4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9]|3[0-1])/,
       `Must be a valid date in ${DEFAULT_DATE_FORMAT.toLocaleLowerCase()} format. e.g. ${todayDateHint}`
     );

package/package.json

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

@@ -1009,30 +1009,30 @@ describe('createHeadlessForm', () => {
     });
 
     it('support "date" field type', () => {
-      const result = createHeadlessForm(schemaInputTypeDate);
+      const { fields, handleValidation } = createHeadlessForm(schemaInputTypeDate);
 
-      expect(result).toMatchObject({
-        fields: [
-          {
-            label: 'Birthdate',
-            name: 'birthdate',
-            required: true,
-            schema: expect.any(Object),
-            type: 'date',
-            maxLength: 10,
-            minDate: '1922-03-01',
-            maxDate: '2022-03-01',
-          },
-        ],
+      const validateForm = (vals) => friendlyError(handleValidation(vals));
+
+      expect(fields[0]).toMatchObject({
+        label: 'Birthdate',
+        name: 'birthdate',
+        required: true,
+        schema: expect.any(Object),
+        type: 'date',
+        minDate: '1922-03-01',
+        maxDate: '2022-03-01',
       });
 
-      const fieldValidator = result.fields[0].schema;
       const todayDateHint = new Date().toISOString().substring(0, 10);
-      expect(fieldValidator.isValidSync('2020-10-10')).toBe(true);
-      expect(fieldValidator.isValidSync('2020-13-10')).toBe(false);
-      expect(() => fieldValidator.validateSync('')).toThrowError(
-        `Must be a valid date in yyyy-mm-dd format. e.g. ${todayDateHint}`
-      );
+
+      expect(validateForm({})).toEqual({
+        birthdate: 'Required field',
+      });
+
+      expect(validateForm({ birthdate: '2020-10-10' })).toBeUndefined();
+      expect(validateForm({ birthdate: '2020-13-10' })).toEqual({
+        birthdate: `Must be a valid date in yyyy-mm-dd format. e.g. ${todayDateHint}`,
+      });
     });
 
     it('support "date" field type with a minDate', () => {
@@ -1046,7 +1046,6 @@ describe('createHeadlessForm', () => {
         required: true,
         schema: expect.any(Object),
         type: 'date',
-        maxLength: 10,
         minDate: '1922-03-01',
         maxDate: '2022-03-01',
       });
@@ -1065,9 +1064,9 @@ describe('createHeadlessForm', () => {
         birthdate: 'The date must be 1922-03-01 or after.',
       });
 
-      expect(validateForm({ birthdate: '1922-03-01' })).toEqual(undefined);
+      expect(validateForm({ birthdate: '1922-03-01' })).toBeUndefined();
 
-      expect(validateForm({ birthdate: '2021-03-01' })).toEqual(undefined);
+      expect(validateForm({ birthdate: '2021-03-01' })).toBeUndefined();
     });
 
     it('support "date" field type with a maxDate', () => {
@@ -1081,7 +1080,6 @@ describe('createHeadlessForm', () => {
         required: true,
         schema: expect.any(Object),
         type: 'date',
-        maxLength: 10,
         minDate: '1922-03-01',
         maxDate: '2022-03-01',
       });
@@ -1092,8 +1090,8 @@ describe('createHeadlessForm', () => {
         birthdate: `Must be a valid date in yyyy-mm-dd format. e.g. ${todayDateHint}`,
       });
 
-      expect(validateForm({ birthdate: '2022-02-01' })).toEqual(undefined);
-      expect(validateForm({ birthdate: '2022-03-01' })).toEqual(undefined);
+      expect(validateForm({ birthdate: '2022-02-01' })).toBeUndefined();
+      expect(validateForm({ birthdate: '2022-03-01' })).toBeUndefined();
       expect(validateForm({ birthdate: '2022-04-01' })).toEqual({
         birthdate: 'The date must be 2022-03-01 or before.',
       });

package/src/tests/helpers.js

@@ -272,18 +272,6 @@ export const mockSelectInputMultipleOptional = {
   type: ['array', 'null'],
 };
 
-export const mockDateInput = {
-  'x-jsf-presentation': {
-    inputType: 'date',
-    maxDate: '2022-03-01',
-    minDate: '1922-03-01',
-  },
-  title: 'Birthdate',
-  type: 'string',
-  format: 'date',
-  maxLength: 10,
-};
-
 export const mockFileInput = {
   description: 'File Input Description',
   'x-jsf-presentation': {
@@ -998,12 +986,19 @@ export const schemaInputTypeNumberWithPercentage = JSONSchemaBuilder()
   .setRequiredFields(['shares'])
   .build();
 
-export const schemaInputTypeDate = JSONSchemaBuilder()
-  .addInput({
-    birthdate: mockDateInput,
-  })
-  .setRequiredFields(['birthdate'])
-  .build();
+export const schemaInputTypeDate = {
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    birthdate: {
+      'x-jsf-presentation': { inputType: 'date', maxDate: '2022-03-01', minDate: '1922-03-01' },
+      title: 'Birthdate',
+      type: 'string',
+      format: 'date',
+    },
+  },
+  required: ['birthdate'],
+};
 
 export const schemaInputTypeEmail = JSONSchemaBuilder()
   .addInput({