fix: add parseOpenRpcDocument

package.json

@@ -53,7 +53,8 @@
     "@material-ui/icons": "^4.5.1",
     "@monaco-editor/react": "^2.3.0",
     "@open-rpc/client-js": "^1.2.1",
-    "@open-rpc/meta-schema": "^1.5.3",
+    "@open-rpc/meta-schema": "^1.7.0",
+    "@open-rpc/schema-utils-js": "^1.12.0",
     "@rehooks/window-size": "^1.0.2",
     "acorn-dynamic-import": "^4.0.0",
     "monaco-editor": "^0.18.1",

src/containers/Inspector.tsx

@@ -15,6 +15,7 @@ import MonacoEditor from "@etclabscore/react-monaco-editor";
 import useTabs from "../hooks/useTabs";
 import { useDebounce } from "use-debounce";
 import { green } from "@material-ui/core/colors";
+import { parseOpenRPCDocument } from "@open-rpc/schema-utils-js";
 
 const errorToJSON = (error: JSONRPCError | undefined): any => {
   if (!error) {
@@ -189,8 +190,9 @@ const Inspector: React.FC<IProps> = (props) => {
     if (url) {
       try {
         const d = await client.request("rpc.discover", []);
-        setOpenRpcDocument(d);
-        setTabOpenRPCDocument(tabIndex, d);
+        const doc = await parseOpenRPCDocument(d);
+        setOpenRpcDocument(doc);
+        setTabOpenRPCDocument(tabIndex, doc);
       } catch (e) {
         setOpenRpcDocument(undefined);
         setTabOpenRPCDocument(tabIndex, undefined);

src/containers/JSONRPCRequestEditor.tsx

@@ -1,15 +1,15 @@
 import React, { useRef, useEffect } from "react";
 import MonacoEditor from "@etclabscore/react-monaco-editor";
 import * as monaco from "monaco-editor";
-import { MethodObject, ContentDescriptorObject, OpenRPC } from "@open-rpc/meta-schema";
+import { MethodObject, ContentDescriptorObject, OpenrpcDocument } from "@open-rpc/meta-schema";
 import useWindowSize from "@rehooks/window-size";
 import { addDiagnostics } from "@etclabscore/monaco-add-json-schema-diagnostics";
 import openrpcDocumentToJSONRPCSchema from "../helpers/openrpcDocumentToJSONRPCSchema";
 
 interface IProps {
   onChange?: (newValue: any) => void;
   openrpcMethodObject?: MethodObject;
-  openrpcDocument?: OpenRPC;
+  openrpcDocument?: OpenrpcDocument;
   value: any;
 }
 

src/helpers/openrpcDocumentToJSONRPCSchema.ts

@@ -1,4 +1,4 @@
-import { MethodObject, ContentDescriptorObject, OpenRPC, ExampleObject } from "@open-rpc/meta-schema";
+import { MethodObject, ContentDescriptorObject, OpenrpcDocument, ExampleObject } from "@open-rpc/meta-schema";
 
 const schema: any = {
   type: "object",
@@ -23,7 +23,7 @@ const schema: any = {
   },
 };
 
-const openrpcDocumentToJSONRPCSchema = (openrpcDocument: OpenRPC) => {
+const openrpcDocumentToJSONRPCSchema = (openrpcDocument: OpenrpcDocument) => {
   return {
     type: "object",
     properties: {

src/hooks/useTabs.ts

@@ -1,13 +1,13 @@
 import { useState, Dispatch, useEffect } from "react";
-import { OpenRPC } from "@open-rpc/meta-schema";
+import { OpenrpcDocument } from "@open-rpc/meta-schema";
 
 interface ITab {
   name: string;
   content?: any;
   results?: string;
   editing?: boolean;
   url?: string;
-  openrpcDocument?: OpenRPC;
+  openrpcDocument?: OpenrpcDocument;
 }
 
 const emptyJSONRPC = {
@@ -63,7 +63,7 @@ const useTabs = (defaultTabs?: ITab[]) => {
     setTabs(newTabs);
   };
 
-  const setTabOpenRPCDocument = (ti: number, openrpcDocument: OpenRPC | undefined) => {
+  const setTabOpenRPCDocument = (ti: number, openrpcDocument: OpenrpcDocument | undefined) => {
     const newTabs = tabs.map((innerTab, i) => {
       if (i === ti) {
         if (!openrpcDocument) {