727 fix conditions in allOf accidentally merged for parents with allOf (#728)

* fix if multiple conditions are in child property allOf, they get accidentally merged by mergeAllOfs of parent if parent also has allOfs

* show allOfs in schema diagram by default

* show required but otherwise not defined schema properties in the schema diagram view

* apply formatting changes

---------

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

Author: Logende

meta_configurator/src/schema/mergeAllOfs.ts

@@ -2,13 +2,13 @@ import type {JsonSchemaType} from '@/schema/jsonSchemaType';
 // @ts-ignore
 import mergeAllOf from 'json-schema-merge-allof';
 
-export function mergeAllOfs(schema: JsonSchemaType): JsonSchemaType {
+export function mergeAllOfs(schema: JsonSchemaType, deep: boolean = true): JsonSchemaType {
   if (typeof schema !== 'object') {
     return schema;
   }
 
   return mergeAllOf(schema, {
-    deep: true,
+    deep: deep,
     resolvers: {
       defaultResolver: mergeAllOf.options.resolvers.title,
       // add additional resolvers here, most of the keywords are NOT supported by default

meta_configurator/src/schema/oneTimeSchemaPreprocessor.ts

@@ -73,6 +73,9 @@ function preprocessOneTimeRecursive(schema: JsonSchemaType | undefined, schemaPa
   preprocessOneTimeRecursive(schema.unevaluatedItems, `${schemaPath}/unevaluatedItems`);
   preprocessOneTimeRecursive(schema.unevaluatedProperties, `${schemaPath}/unevaluatedProperties`);
   preprocessOneTimeRecursive(schema.contentSchema, `${schemaPath}/contentSchema`);
+
+  // this is useful for the schema diagram, because then it can render required properties even if there is no further definition
+  createEmptyPropertiesIfRequiredButMissing(schema);
 }
 
 function preprocessSchemaArray(
@@ -152,3 +155,23 @@ function injectTypesOfEnum(schema: JsonSchemaObjectType): void {
     schema.type = [...foundTypes];
   }
 }
+
+function createEmptyPropertiesIfRequiredButMissing(schema: JsonSchemaObjectType): void {
+  if (schema.required) {
+    for (const propertyName of schema.required) {
+      createEmptyPropertyIfRequiredButMissing(schema, propertyName);
+    }
+  }
+}
+
+function createEmptyPropertyIfRequiredButMissing(
+  schema: JsonSchemaObjectType,
+  propertyName: string
+): void {
+  if (schema.properties === undefined) {
+    schema.properties = {};
+  }
+  if (schema.properties[propertyName] === undefined) {
+    schema.properties[propertyName] = {};
+  }
+}

meta_configurator/src/schema/schemaLazyResolver.ts

@@ -66,7 +66,8 @@ function handleAllOfs(schema: JsonSchemaType, mode: SessionMode) {
     schema.allOf = schema.allOf!.map(subSchema => resolveAndTransform(subSchema, mode));
 
     schema = extractIfsOfAllOfs(schema, mode);
-    schema = mergeAllOfs(schema);
+    // do not merge deeply, as this could merge and mess up conditions of children properties
+    schema = mergeAllOfs(schema, false);
   }
   return schema;
 }

meta_configurator/src/settings/defaultSettingsData.ts

@@ -30,7 +30,7 @@ export const SETTINGS_DATA_DEFAULT = {
     moveViewToSelectedElement: false,
     automaticZoomMaxValue: 1,
     automaticZoomMinValue: 0.5,
-    mergeAllOfs: true,
+    mergeAllOfs: false,
   },
   metaSchema: {
     allowBooleanSchema: false,