feat: integrate @stoplight/json-schema-tree (#91)

BREAKING CHANGE: shouldResolveEagerly prop has been removed

Author: P0lip

package.json

@@ -17,7 +17,7 @@
     "**/*"
   ],
   "engines": {
-    "node": ">=10.0"
+    "node": ">=10.18"
   },
   "scripts": {
     "build": "sl-scripts bundle --sourcemap",
@@ -43,14 +43,12 @@
   },
   "dependencies": {
     "@stoplight/json": "^3.10.0",
-    "@stoplight/json-schema-merge-allof": "^0.7.2",
+    "@stoplight/json-schema-tree": "^1.0.0",
     "@stoplight/react-error-boundary": "^1.0.0",
     "@stoplight/tree-list": "^5.0.3",
-    "classnames": "^2.2.6",
-    "lodash": "^4.17.15"
+    "classnames": "^2.2.6"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-typescript": "^3.1.1",
     "@sambego/storybook-state": "^1.3.6",
     "@stoplight/eslint-config": "^1.2.0",
@@ -63,7 +61,6 @@
     "@types/enzyme": "^3.10.8",
     "@types/jest": "^26.0.18",
     "@types/json-schema": "^7.0.6",
-    "@types/lodash": "^4.14.165",
     "@types/node": "^12.7.2",
     "@types/react": "16.9.2",
     "@types/react-dom": "16.9.0",

rollup.config.js

@@ -1,7 +1,6 @@
-import commonjs from '@rollup/plugin-commonjs';
 import typescript from '@rollup/plugin-typescript';
-import * as path from 'path';
 import { terser } from 'rollup-plugin-terser';
+import * as path from 'path';
 
 const BASE_PATH = process.cwd();
 
@@ -11,7 +10,6 @@ const plugins = [
     include: ['src/**/*.{ts,tsx}'],
   }),
   terser(),
-  commonjs(),
 ];
 
 export default [
@@ -29,14 +27,4 @@ export default [
       },
     ],
   },
-  {
-    input: path.resolve(BASE_PATH, 'src/tree/index.ts'),
-    plugins,
-    output: [
-      {
-        file: path.resolve(BASE_PATH, 'dist/tree/index.js'),
-        format: 'esm',
-      },
-    ],
-  },
 ];

src/__fixtures__/references/nullish.json

@@ -1,3 +1,7 @@
 {
-  "$ref": null
+  "properties": {
+    "empty-ref": {
+      "$ref": null
+    }
+  }
 }

src/__stories__/JsonSchemaViewer.tsx

@@ -8,7 +8,7 @@ import * as React from 'react';
 import { JsonSchemaViewer, RowRenderer, SchemaRow } from '../';
 import { Wrapper } from './utils/Wrapper';
 
-const allOfSchemaResolved = require('../__fixtures__/allOf/allOf-resolved.json');
+const allOfSchema = require('../__fixtures__/combiners/allOfs/base.json');
 const schema = require('../__fixtures__/default-schema.json');
 const stressSchema = require('../__fixtures__/stress-schema.json');
 
@@ -20,7 +20,6 @@ storiesOf('JsonSchemaViewer', module)
       schema={schema as JSONSchema4}
       defaultExpandedDepth={number('defaultExpandedDepth', 0)}
       expanded={boolean('expanded', true)}
-      shouldResolveEagerly={boolean('shouldResolveEagerly', false)}
       onGoToRef={action('onGoToRef')}
       viewMode={select(
         'viewMode',
@@ -36,18 +35,18 @@ storiesOf('JsonSchemaViewer', module)
   .add('custom schema', () => (
     <JsonSchemaViewer
       schema={object('schema', {})}
-      expanded={boolean('expanded', true)}
+      defaultExpandedDepth={number('defaultExpandedDepth', 0)}
+      expanded={boolean('expanded', false)}
       onGoToRef={action('onGoToRef')}
       maxRows={number('maxRows', 5)}
       mergeAllOf={boolean('mergeAllOf', true)}
-      shouldResolveEagerly={boolean('shouldResolveEagerly', false)}
     />
   ))
   .add('custom row renderer', () => {
     const customRowRenderer: RowRenderer = (node, rowOptions) => {
       return (
         <>
-          <SchemaRow node={node} rowOptions={rowOptions} />
+          <SchemaRow treeListNode={node} rowOptions={rowOptions} />
           <div className="flex h-full items-center">
             <Button className="pl-1 mr-1" small minimal icon={<Icon color="grey" iconSize={12} icon="issue" />} />
             <Checkbox className="mb-0" />
@@ -93,7 +92,7 @@ storiesOf('JsonSchemaViewer', module)
   ))
   .add('allOf-schema', () => (
     <JsonSchemaViewer
-      schema={allOfSchemaResolved as JSONSchema4}
+      schema={allOfSchema as JSONSchema4}
       defaultExpandedDepth={number('defaultExpandedDepth', 2)}
       expanded={boolean('expanded', false)}
       mergeAllOf={boolean('mergeAllOf', true)}