fix: upgrade meta schema to 1.3.2

Author: shanejonas

README.md

@@ -44,9 +44,9 @@ npm install @open-rpc/docs-react @open-rpc/meta-schema --save
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Documentation from "@open-rpc/docs-react";
-import { types } from '@open-rpc/meta-schema';
+import { OpenRPC } from '@open-rpc/meta-schema';
 
-const schema: types.OpenRPC = {
+const schema: OpenRPC = {
   openrpc: "1.0.0-rc1",
   info: {
     "version": "0.0.0-development",

package-lock.json

@@ -13,7 +13,8 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
-    "@open-rpc/meta-schema": "^1.1.0",
+    "@open-rpc/examples": "^1.3.0",
+    "@open-rpc/meta-schema": "^1.3.2",
     "hash-color-material": "^1.1.3",
     "json-schema": "^0.2.3",
     "lodash": "^4.17.11",

package.json

@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 import ContentDescriptor from "./ContentDescriptor";
-import { types } from "@open-rpc/meta-schema";
+import { ContentDescriptorObject } from "@open-rpc/meta-schema";
 
 it("renders without crashing", () => {
   const div = document.createElement("div");
@@ -18,15 +18,15 @@ it("renders empty with no schema", () => {
 
 it("renders empty with empty schema", () => {
   const div = document.createElement("div");
-  const emptyContentDescriptor = {} as types.ContentDescriptorObject;
+  const emptyContentDescriptor = {} as ContentDescriptorObject;
   ReactDOM.render(<ContentDescriptor contentDescriptor={emptyContentDescriptor}/>, div);
   expect(div.innerHTML).toBe("");
   ReactDOM.unmountComponentAtNode(div);
 });
 
 it("renders a name", () => {
   const div = document.createElement("div");
-  ReactDOM.render(<ContentDescriptor contentDescriptor={{name: "foo"}}/>, div);
+  ReactDOM.render(<ContentDescriptor contentDescriptor={{name: "foo", schema: {}}}/>, div);
   expect(div.innerHTML.includes("foo")).toBe(true);
   ReactDOM.unmountComponentAtNode(div);
 });

src/ContentDescriptor/ContentDescriptor.test.tsx

@@ -6,7 +6,7 @@ import ExpansionPanelDetails from "@material-ui/core/ExpansionPanelDetails";
 import JSONSchema from "../JSONSchema/JSONSchema";
 import ExpandMoreIcon from "@material-ui/icons/ExpandMore";
 import ReactMarkdown from "react-markdown";
-import { types } from "@open-rpc/meta-schema";
+import { ContentDescriptorObject } from "@open-rpc/meta-schema";
 
 const styles = (theme: Theme) => ({
   heading: {
@@ -22,7 +22,7 @@ const styles = (theme: Theme) => ({
 });
 
 interface IProps extends WithStyles<typeof styles> {
-  contentDescriptor?: types.ContentDescriptorObject;
+  contentDescriptor?: ContentDescriptorObject;
   hideIcon?: boolean;
   hideRequired?: boolean;
   uiSchema?: any;

src/ContentDescriptor/ContentDescriptor.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 import ContentDescriptors from "./ContentDescriptors";
-import { types } from "@open-rpc/meta-schema";
+import { OpenRPC } from "@open-rpc/meta-schema";
 
 it("renders without crashing", () => {
   const div = document.createElement("div");
@@ -18,7 +18,7 @@ it("renders empty with no schema", () => {
 
 it("renders empty with empty schema", () => {
   const div = document.createElement("div");
-  const emptySchema = {} as types.OpenRPC;
+  const emptySchema = {} as OpenRPC;
   ReactDOM.render(<ContentDescriptors schema={emptySchema}/>, div);
   expect(div.innerHTML).toBe("");
   ReactDOM.unmountComponentAtNode(div);

src/ContentDescriptors/ContentDescriptors.test.tsx

@@ -1,11 +1,10 @@
 import React, { Component } from "react";
 import ContentDescriptor from "../ContentDescriptor/ContentDescriptor";
 import { Typography } from "@material-ui/core";
-import { types } from "@open-rpc/meta-schema";
-import { ContentDescriptorObject } from "@open-rpc/meta-schema/build/src/types";
+import { OpenRPC, ContentDescriptorObject } from "@open-rpc/meta-schema";
 
 interface IProps {
-  schema?: types.OpenRPC;
+  schema?: OpenRPC;
   uiSchema?: any;
 }
 

src/ContentDescriptors/ContentDescriptors.tsx

@@ -3,10 +3,10 @@ import Info from "./Info/Info";
 import Servers from "./Servers/Servers";
 import Methods from "./Methods/Methods";
 import ContentDescriptors from "./ContentDescriptors/ContentDescriptors";
-import { types } from "@open-rpc/meta-schema";
+import { OpenRPC } from "@open-rpc/meta-schema";
 
 interface IProps {
-  schema: types.OpenRPC;
+  schema: OpenRPC;
   uiSchema?: any;
   reactJsonOptions?: any;
 }
@@ -22,10 +22,10 @@ export default class Documentation extends React.Component<IProps> {
     }
     return (
       <>
-          <Info schema={schema} />
-          <Servers servers={schema.servers} reactJsonOptions={reactJsonOptions}/>
-          <Methods schema={schema} uiSchema={uiSchema} reactJsonOptions={reactJsonOptions}/>
-          <ContentDescriptors schema={schema} uiSchema={uiSchema}></ContentDescriptors>
+        <Info schema={schema} />
+        <Servers servers={schema.servers} reactJsonOptions={reactJsonOptions} />
+        <Methods schema={schema} uiSchema={uiSchema} reactJsonOptions={reactJsonOptions} />
+        <ContentDescriptors schema={schema} uiSchema={uiSchema}></ContentDescriptors>
       </>
     );
   }

src/Documentation.tsx

@@ -9,7 +9,7 @@ import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
 import { Typography, Grid } from "@material-ui/core";
 import ReactJson from "react-json-view";
-import { types } from "@open-rpc/meta-schema";
+import { ErrorObject } from "@open-rpc/meta-schema";
 
 const styles = (theme: Theme) => ({
   code: {
@@ -18,7 +18,7 @@ const styles = (theme: Theme) => ({
 });
 
 interface IProps extends WithStyles<typeof styles> {
-  errors?: types.ErrorObject[];
+  errors?: ErrorObject[];
   reactJsonOptions?: any;
 }