diff --git a/package.json b/package.json index a54d0b0a..b115b9be 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "dependencies": { "@fortawesome/free-solid-svg-icons": "^5.15.2", "@stoplight/json": "^3.10.0", - "@stoplight/json-schema-tree": "^1.1.2", + "@stoplight/json-schema-tree": "^1.1.3", "@stoplight/mosaic": "^1.0.0-beta.36", "@stoplight/react-error-boundary": "^1.0.0", "classnames": "^2.2.6", diff --git a/src/__fixtures__/references/nested.json b/src/__fixtures__/references/nested.json new file mode 100644 index 00000000..a318cec4 --- /dev/null +++ b/src/__fixtures__/references/nested.json @@ -0,0 +1,21 @@ +{ + "$ref": "#/__bundled__/repo", + "__bundled__": { + "repo": { + "properties": { + "parent": { + "allOf": [ + { + "$ref": "#/__bundled__/repo" + }, + { + "description": "something" + } + ] + } + }, + "type": "object" + } + } +} + \ No newline at end of file diff --git a/src/__tests__/__snapshots__/index.spec.tsx.snap b/src/__tests__/__snapshots__/index.spec.tsx.snap index 2d6dbe75..65daf60e 100644 --- a/src/__tests__/__snapshots__/index.spec.tsx.snap +++ b/src/__tests__/__snapshots__/index.spec.tsx.snap @@ -3249,6 +3249,65 @@ exports[`HTML Output should match references/base.json 1`] = ` " `; +exports[`HTML Output should match references/nested.json 1`] = ` +"
+
+
+
+
+
+
+
+
object
+
+
+
+
+
+
+
+
+
+
+
+
+
+
parent
+ object +
+
+
something
+
+
+
+
+
+
+
+
+
+
+
+
+
parent
+ object +
+
+
something
+
+
+
+
+
+
+
+
+
+
+
+" +`; + exports[`HTML Output should match references/nullish.json 1`] = ` "
diff --git a/yarn.lock b/yarn.lock index d41907a9..5c261c1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2265,10 +2265,10 @@ json-schema-compare "^0.2.2" lodash "^4.17.4" -"@stoplight/json-schema-tree@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@stoplight/json-schema-tree/-/json-schema-tree-1.1.2.tgz#c781de4322f286b296fe82233dd4b895cedb10a7" - integrity sha512-GgEJApU2/JKVd3XwjPP52gI9EGCi1nFz4fPUTw1gafpAnEqQcjVF14RFlJ+YjMx15ggwsUPCDEZIypDEoYvdoA== +"@stoplight/json-schema-tree@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@stoplight/json-schema-tree/-/json-schema-tree-1.1.3.tgz#c2aafa1b10c506e7ebec7a4904ff3bd325f7102f" + integrity sha512-n/mmhLEu4qrZO/UxQBYyPNid2v4Zq6fuzUK9pBMpNxQtxXmmge62lFWDnc3Q8nzXwRio0OPuMmZS9RO0Q0hmOg== dependencies: "@stoplight/json" "^3.10.0" "@stoplight/json-schema-merge-allof" "^0.7.5"