Merge pull request #114 from ethdebug/schema-retitle-fix

Fix display of schema extensions that change only title
ethdebug · Oct 31, 2024 · c31265a · c31265a
2 parents 1fddb29 + 9a2060a
commit c31265a
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/packages/web/src/theme/JSONSchemaViewer/components/UnnecessaryComposition.tsx b/packages/web/src/theme/JSONSchemaViewer/components/UnnecessaryComposition.tsx
@@ -96,6 +96,19 @@ export default function UnnecessaryCompositionSchema({
   );
 
   if (onlyExtendsDocumentation) {
+    const onlyChangesTitle = Object.keys(documentation).length === 1 &&
+      "title" in documentation;
+
+    if (onlyChangesTitle) {
+      return <>
+        <SchemaHierarchyComponent
+          innerJsonPointer={`/${unnecessaryCompositionKeyword}/0`}
+        >
+          <CreateNodes schema={unnecessarilyComposedSchema} />
+        </SchemaHierarchyComponent>
+      </>;
+    }
+
     const { description } = documentation;
 
     return <>
@@ -166,7 +179,7 @@ export default function UnnecessaryCompositionSchema({
 
 function separateDocumentationFromSemantics(schema: JSONSchema): {
   documentation: Exclude<JSONSchema, boolean>,
-  semantics: Exclude<JSONSchema, boolean>
+  semantics: JSONSchema
 } {
   if (typeof schema === "boolean") {
     return {
@@ -185,13 +198,19 @@ function separateDocumentationFromSemantics(schema: JSONSchema): {
     ...semantics
   } = schema;
 
+  const documentation = Object.entries({
+    title,
+    description,
+    examples,
+    default: default_
+  }).filter((
+    pair: [string, string | object | undefined]
+  ): pair is [string, string | object] => pair[1] !== undefined).map(
+    ([key, value]) => ({ [key]: value })
+  ).reduce((a, b) => ({ ...a, ...b }), {}) as Partial<Pick<typeof schema, "title" | "description" | "examples" | "default">>;
+
   return {
-    documentation: {
-      title,
-      description,
-      examples,
-      default: default_
-    },
+    documentation,
     semantics
   };
 }