@remoteoss/json-schema-form 0.7.5-dev.20231115020835 → 0.7.7-dev.20240129180839

package/CHANGELOG.md

@@ -1,8 +1,22 @@
+#### 0.7.6-beta.0 (2024-01-23)
+
+##### Chores
+
+BREAKING CHANGES:
+
+- **select:** Remove creatable logic ([#62](https://github.com/remoteoss/json-schema-form/pull/62)) ([0a6273c6](https://github.com/remoteoss/json-schema-form/commit/0a6273c63049a2f03bcf0b212dec6455ab48b5e5)) Added in 0.7.1
+
+#### 0.7.5-beta.0 (2023-11-15)
+
+##### Chores
+
+- Follow-up of #57. Ignore internal attributes from conditional attributes removal (`visibilityCondition`) ([#59](https://github.com/remoteoss/json-schema-form/pull/59)) ([57fe4468](https://github.com/remoteoss/json-schema-form/commit/57fe446834636d727a5da5a91f7e5f3cc4eab8f8))
+
 #### 0.7.4-beta.0 (2023-11-07)
 
 ##### Chores
 
-- Follow-up of #57. Ignore internal attributes from conditional attributes removal ([#58](https://github.com/remoteoss/json-schema-form/pull/58)) ([ee762c2e](https://github.com/remoteoss/json-schema-form/commit/ee762c2e90834a9ec0d7b88af47cefe1e3a03dd1))
+- Follow-up of #57. Ignore internal attributes from conditional attributes removal (`Component`, `calculateDynamicProperties`) ([#58](https://github.com/remoteoss/json-schema-form/pull/58)) ([ee762c2e](https://github.com/remoteoss/json-schema-form/commit/ee762c2e90834a9ec0d7b88af47cefe1e3a03dd1))
 
 #### 0.7.3-beta.0 (2023-11-07)
 

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.5-dev.20231115020835
- Generated: Wed, 15 Nov 2023 02:08:43 GMT
+ Copyright (c) 2024 Remote Technology, Inc.
+ NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
+ Generated: Mon, 29 Jan 2024 18:09:02 GMT
 
  MIT License
 
@@ -461,10 +461,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options, isString) => {
-    if (isString) {
-      return (0, import_yup.string)().nullable();
-    }
+  radioOrSelect: (options) => {
     return (0, import_yup.string)().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -568,9 +565,8 @@ var getOptions = (field) => {
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const isString = field.options?.findIndex((option) => option.type === "string") > -1;
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues, isString);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1671,7 +1667,7 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
     fields = getFieldsFromJSONSchema(
       fieldProperties,
       {
-        customProperties: (0, import_get3.default)(config, `customProperties.${name}`, {}),
+        customProperties: (0, import_get3.default)(config, `customProperties.${name}.customProperties`, {}),
         parentID: name
       },
       logic

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.5-dev.20231115020835
- Generated: Wed, 15 Nov 2023 02:08:43 GMT
+ Copyright (c) 2024 Remote Technology, Inc.
+ NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
+ Generated: Mon, 29 Jan 2024 18:09:02 GMT
 
  MIT License
 
@@ -425,10 +425,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options, isString) => {
-    if (isString) {
-      return string().nullable();
-    }
+  radioOrSelect: (options) => {
     return string().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -532,9 +529,8 @@ var getOptions = (field) => {
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const isString = field.options?.findIndex((option) => option.type === "string") > -1;
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues, isString);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1635,7 +1631,7 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
     fields = getFieldsFromJSONSchema(
       fieldProperties,
       {
-        customProperties: get3(config, `customProperties.${name}`, {}),
+        customProperties: get3(config, `customProperties.${name}.customProperties`, {}),
         parentID: name
       },
       logic

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
- Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.5-dev.20231115020835
- Generated: Wed, 15 Nov 2023 02:08:43 GMT
+ Copyright (c) 2024 Remote Technology, Inc.
+ NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
+ Generated: Mon, 29 Jan 2024 18:09:02 GMT
 
  MIT License
 
@@ -11779,10 +11779,7 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options, isString2) => {
-    if (isString2) {
-      return StringSchema().nullable();
-    }
+  radioOrSelect: (options) => {
     return StringSchema().nullable().transform((value) => {
       if (value === "") {
         return void 0;
@@ -11886,9 +11883,8 @@ var getOptions = (field) => {
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
-    const isString2 = field.options?.findIndex((option) => option.type === "string") > -1;
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues, isString2);
+    return yupSchemas.radioOrSelect(optionValues);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -12989,7 +12985,7 @@ function buildFieldParameters(name, fieldProperties, required2 = [], config = {}
     fields = getFieldsFromJSONSchema(
       fieldProperties,
       {
-        customProperties: (0, import_get4.default)(config, `customProperties.${name}`, {}),
+        customProperties: (0, import_get4.default)(config, `customProperties.${name}.customProperties`, {}),
         parentID: name
       },
       logic

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.7.5-dev.20231115020835",
+  "version": "0.7.7-dev.20240129180839",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

package/src/tests/createHeadlessForm.customValidations.test.jsx

@@ -357,17 +357,23 @@ describe('createHeadlessForm() - custom validations', () => {
               minimum: 24,
               maximum: 28,
             },
-            second_gen: {
-              cub_age: {
+            second_gen: { 
+              customProperties: {
+                cub_age: {
                 minimum: 18,
-                maximum: 21,
+                maximum: 21
+              },
+              third_gen: { 
+                customProperties: {
+                  grandcub_age: {
+                    minimum: 10,
+                    maximum: 15,
+                  },
+                }
+                
               },
-              third_gen: {
-                grandcub_age: {
-                  minimum: 10,
-                  maximum: 15,
-                },
               },
+            
             },
           },
         },

package/src/tests/createHeadlessForm.test.js

@@ -15,7 +15,6 @@ import {
   schemaInputTypeRadioOptionsWithDetails,
   schemaInputTypeSelectSoloDeprecated,
   schemaInputTypeSelectSolo,
-  schemaInputTypeSelectString,
   schemaInputTypeSelectMultipleDeprecated,
   schemaInputTypeSelectMultiple,
   schemaInputTypeSelectMultipleOptional,
@@ -432,7 +431,7 @@ describe('createHeadlessForm', () => {
   });
 
   describe('field support', () => {
-    function assertOptionsAllowed({ handleValidation, fieldName, validOptions, isString = false }) {
+    function assertOptionsAllowed({ handleValidation, fieldName, validOptions }) {
       const validateForm = (vals) => friendlyError(handleValidation(vals));
 
       // All allowed options are valid
@@ -440,34 +439,27 @@ describe('createHeadlessForm', () => {
         expect(validateForm({ [fieldName]: value })).toBeUndefined();
       });
 
-      if (!isString) {
-        // Any other arbitrary value is not valid.
-        expect(validateForm({ [fieldName]: 'blah-blah' })).toEqual({
-          [fieldName]: 'The option "blah-blah" is not valid.',
-        });
-
-        // Given undefined, it says it's a required field.
-        expect(validateForm({})).toEqual({
-          [fieldName]: 'Required field',
-        });
+      // Any other arbitrary value is not valid.
+      expect(validateForm({ [fieldName]: 'blah-blah' })).toEqual({
+        [fieldName]: 'The option "blah-blah" is not valid.',
+      });
 
-        // As required field, empty string ("") is also considered empty. @BUG RMT-518
-        // Expectation: The error to be "The option '' is not valid."
-        expect(validateForm({ [fieldName]: '' })).toEqual({
-          [fieldName]: 'Required field',
-        });
+      // Given undefined, it says it's a required field.
+      expect(validateForm({})).toEqual({
+        [fieldName]: 'Required field',
+      });
 
-        // As required field, null is also considered empty @BUG RMT-518
-        // Expectation: The error to be "The option null is not valid."
-        expect(validateForm({ [fieldName]: null })).toEqual({
-          [fieldName]: 'Required field',
-        });
-      }
+      // As required field, empty string ("") is also considered empty. @BUG RMT-518
+      // Expectation: The error to be "The option '' is not valid."
+      expect(validateForm({ [fieldName]: '' })).toEqual({
+        [fieldName]: 'Required field',
+      });
 
-      if (isString) {
-        // Any other arbitrary value is valid.
-        expect(validateForm({ [fieldName]: 'blah-blah' })).toBeUndefined();
-      }
+      // As required field, null is also considered empty @BUG RMT-518
+      // Expectation: The error to be "The option null is not valid."
+      expect(validateForm({ [fieldName]: null })).toEqual({
+        [fieldName]: 'Required field',
+      });
     }
 
     it('support "text" field type', () => {
@@ -639,41 +631,6 @@ describe('createHeadlessForm', () => {
       });
     });
 
-    it('supports "select" field type with string option', () => {
-      const { fields, handleValidation } = createHeadlessForm(schemaInputTypeSelectString);
-      const fieldSelect = fields[0];
-      expect(fieldSelect).toMatchObject({
-        name: 'browsers',
-        label: 'Browsers (solo)',
-        description: 'This solo select also includes a disabled option.',
-        options: [
-          {
-            value: 'chr',
-            label: 'Chrome',
-          },
-          {
-            value: 'ff',
-            label: 'Firefox',
-          },
-          {
-            value: 'ie',
-            label: 'Internet Explorer',
-            disabled: true,
-          },
-          { value: undefined, type: 'string', label: '{Create another}' },
-        ],
-      });
-
-      expect(fieldSelect).not.toHaveProperty('multiple');
-
-      assertOptionsAllowed({
-        handleValidation,
-        fieldName: 'browsers',
-        validOptions: ['chr', 'ff', 'ie'],
-        isString: true,
-      });
-    });
-
     it('supports "select" field type with multiple options @deprecated', () => {
       const result = createHeadlessForm(schemaInputTypeSelectMultipleDeprecated);
       expect(result).toMatchObject({
@@ -3720,11 +3677,17 @@ describe('createHeadlessForm', () => {
           customProperties: {
             id_number: { 'data-field': 'field' },
             fieldset: {
-              id_number: { 'data-fieldset': 'fieldset' },
+              customProperties: {
+                id_number: { 'data-fieldset': 'fieldset' },
+              },
             },
             nestedFieldset: {
-              innerFieldset: {
-                id_number: { 'data-nested-fieldset': 'nested-fieldset' },
+              customProperties: {
+                innerFieldset: {
+                  customProperties: {
+                    id_number: { 'data-nested-fieldset': 'nested-fieldset' },
+                  },
+                },
               },
             },
           },

package/src/tests/helpers.js

@@ -238,11 +238,6 @@ export const mockSelectInputSolo = {
   },
 };
 
-export const mockSelectInputSoloCreatable = {
-  ...mockSelectInputSolo,
-  oneOf: [...mockSelectInputSolo.oneOf, { type: 'string', title: '{Create another}' }],
-};
-
 export const mockSelectInputMultiple = {
   title: 'Browsers (multiple)',
   description: 'This multi-select also includes a disabled option.',
@@ -942,10 +937,6 @@ export const schemaInputTypeSelectSolo = JSONSchemaBuilder()
   .setRequiredFields(['browsers'])
   .build();
 
-export const schemaInputTypeSelectString = JSONSchemaBuilder().addInput({
-  browsers: mockSelectInputSoloCreatable,
-});
-
 /** @deprecated */
 export const schemaInputTypeSelectMultipleDeprecated = JSONSchemaBuilder()
   .addInput({