feat: add merge-all-of back (main thread only)

Author: P0lip

src/components/JsonSchemaViewer.tsx

@@ -7,6 +7,7 @@ import * as React from 'react';
 import { JSONSchema4 } from 'json-schema';
 import { SchemaTree } from '../tree/tree';
 import { GoToRefHandler, RowRenderer } from '../types';
+import { mergeAllOf } from '../utils';
 import { isSchemaViewerEmpty } from '../utils/isSchemaViewerEmpty';
 import { SchemaTree as SchemaTreeComponent } from './SchemaTree';
 
@@ -35,7 +36,11 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
     super(props);
 
     this.treeState = new TreeState();
-    this.tree = new SchemaTree(this.schema, this.treeState, this.expandedDepth);
+    this.tree = new SchemaTree(
+      props.mergeAllOf ? mergeAllOf(props.schema) : props.schema,
+      this.treeState,
+      this.expandedDepth,
+    );
     this.treeStore = new TreeStore(this.tree, this.treeState, {
       defaultExpandedDepth: this.expandedDepth,
     });
@@ -53,10 +58,6 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
     return 1;
   }
 
-  protected get schema() {
-    return this.props.schema;
-  }
-
   protected renderSchema() {
     if (this.tree.count > 1) {
       for (const child of this.tree) {
@@ -78,7 +79,7 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
       this.tree.expandedDepth = this.expandedDepth;
       this.renderSchema();
     } else if (prevProps.schema !== this.props.schema || prevProps.mergeAllOf !== this.props.mergeAllOf) {
-      this.tree.schema = this.props.schema;
+      this.tree.schema = this.props.mergeAllOf ? mergeAllOf(this.props.schema) : this.props.schema;
       this.renderSchema();
     }
   }

src/utils/mergeAllOf.ts

@@ -1,9 +1,10 @@
 import { JSONSchema4 } from 'json-schema';
 // @ts-ignore
 import resolveAllOf from 'json-schema-merge-allof';
+import { cloneDeep } from 'lodash-es';
 
 export const mergeAllOf = (schema: JSONSchema4) => {
-  return resolveAllOf(schema, {
+  return resolveAllOf(cloneDeep(schema), {
     resolvers: {
       defaultResolver(values: any) {
         return Object.assign({}, ...values);