Try fix object types comfort feature to not cause issues with other s… (#853)

* Try fix object types comfort feature to not cause issues with other schema features and enable it by default

* apply formatting changes

---------

Co-authored-by: Logende <[email protected]>

Author: Logende

meta_configurator/src/schema/metaSchemaBuilder.ts

@@ -63,18 +63,8 @@ export function buildMetaSchema(metaSchemaSettings: SettingsInterfaceMetaSchema)
 
   if (metaSchemaSettings.objectTypesComfort) {
     metaSchema.$defs.enumProperty.allOf = ALL_OF_ENUM_PROPERTY;
+    metaSchema.$defs.constProperty.allOf = ALL_OF_CONST_PROPERTY;
     metaSchema.$defs['meta-data'].allOf = ALL_OF_META_DATA;
-
-    // delete properties that are not compatible with this option
-    delete metaSchema.$defs.schemaComposition.properties.not;
-    metaSchema.$defs.conditionalSchema = {};
-    delete metaSchema.$defs.objectProperty.properties.additionalProperties;
-    delete metaSchema.$defs.objectProperty.properties.propertyNames;
-    delete metaSchema.$defs.objectProperty.properties.dependentRequired;
-    delete metaSchema.$defs.objectProperty.properties.dependentSchemas;
-    delete metaSchema.$defs.objectProperty.properties.unevaluatedProperties;
-    delete metaSchema.$defs.arrayProperty.properties.unevaluatedItems;
-    delete metaSchema.$defs.arrayProperty.properties.items;
   }
 
   if (metaSchemaSettings.showJsonLdFields) {
@@ -124,6 +114,79 @@ const DEF_TYPE_DEFINITION_WITHOUT_MULTIPLE_TYPES = {
 };
 
 const ALL_OF_ENUM_PROPERTY = [
+  {
+    if: {
+      $ref: '#/$defs/hasTypeArray',
+    },
+    then: {
+      properties: {
+        enum: {
+          items: {
+            type: 'array',
+          },
+        },
+      },
+    },
+  },
+  {
+    if: {
+      $ref: '#/$defs/hasTypeObject',
+    },
+    then: {
+      properties: {
+        enum: {
+          items: {
+            type: 'object',
+          },
+        },
+      },
+    },
+  },
+  {
+    if: {
+      $ref: '#/$defs/hasTypeString',
+    },
+    then: {
+      properties: {
+        enum: {
+          items: {
+            type: 'string',
+          },
+        },
+      },
+    },
+  },
+  {
+    if: {
+      $ref: '#/$defs/hasTypeNumberOrInteger',
+    },
+    then: {
+      properties: {
+        enum: {
+          items: {
+            type: 'number',
+          },
+        },
+      },
+    },
+  },
+  {
+    if: {
+      $ref: '#/$defs/hasTypeBoolean',
+    },
+    then: {
+      properties: {
+        enum: {
+          items: {
+            type: 'boolean',
+          },
+        },
+      },
+    },
+  },
+];
+
+const ALL_OF_CONST_PROPERTY = [
   {
     if: {
       $ref: '#/$defs/hasTypeArray',

meta_configurator/src/settings/defaultSettingsData.ts

@@ -52,7 +52,7 @@ export const SETTINGS_DATA_DEFAULT = {
   metaSchema: {
     allowBooleanSchema: false,
     allowMultipleTypes: false,
-    objectTypesComfort: false,
+    objectTypesComfort: true,
     markMoreFieldsAsAdvanced: true,
     showAdditionalPropertiesButton: false,
     showJsonLdFields: false,

meta_configurator/src/settings/settingsSchema.ts

@@ -326,11 +326,9 @@ export const SETTINGS_SCHEMA: TopLevelSchema = {
         },
         objectTypesComfort: {
           type: 'boolean',
-          $comment:
-            "Warning: due to incompatibility, this option will disable schema editor support for defining the items of an array, as well as support for many advanced keywords, such as conditionals and 'not'.",
           description:
             'This is a comfort feature: the original JSON Meta Schema allows properties of a particular type to have example values, constant values, default values or enum values of different types. For example, a field for numbers could have a string as a default value. This meta schema option forces the same type for all these values. This enables the tool to auto-select the corresponding type in the schema editor, avoiding the need for the user to manually select the types. ',
-          default: false,
+          default: true,
           metaConfigurator: {
             advanced: true,
           },