@@ -2388,6 +2907,23 @@ exports[`HTML Output should match ref/original.json 1`] = `
"
`;
+exports[`HTML Output should match references/nullish.json 1`] = `
+"
@@ -2694,147 +3230,3 @@ exports[`HTML Output should match tickets.schema.json 1`] = `
"
`;
-
-exports[`HTML Output should match todo-allof.schema.json 1`] = `
-"
-
-
-
-
-
-
-
completed
-
- boolean
- or
- null
-
-
-
-
-
-
-
-
-
-
-
-
completed_at
-
- string
- or
- null
-
-
<date-time>
-
-
-
-
-
-
-
-
-
-
created_at
-
string
-
<date-time>
-
-
-
-
-
-
-
-
-
-
updated_at
-
string
-
<date-time>
-
-
-
-
-
-
-
-
-
-
-
name
-
string
-
-
- The user's full name.
-
-
-
-
required
-
-
-
-
-
-
-
-
-
-
- required
- +2
-
-
-
-
-
-
-
-"
-`;
diff --git a/src/__tests__/index.spec.tsx b/src/__tests__/index.spec.tsx
index 9b2d524e..ad034fbe 100644
--- a/src/__tests__/index.spec.tsx
+++ b/src/__tests__/index.spec.tsx
@@ -1,3 +1,6 @@
+import 'jest-enzyme';
+
+import * as fastGlob from 'fast-glob';
import * as fs from 'fs';
import { JSONSchema4 } from 'json-schema';
import * as path from 'path';
@@ -8,21 +11,12 @@ import { ViewMode } from '../types';
import { dumpDom } from './utils/dumpDom';
describe('HTML Output', () => {
- it.each([
- 'ref/original.json',
- 'allof-with-type.json',
- 'array-of-allofs.json',
- 'array-of-objects.json',
- 'array-of-refs.json',
- 'combiner-schema.json',
- 'complex-allOf-model.json',
- 'default-schema.json',
- 'formats-schema.json',
- 'nullish-ref.schema.json',
- 'oneof-with-array-type.json',
- 'todo-allof.schema.json',
- 'tickets.schema.json',
- ])('should match %s', filename => {
+ it.each(
+ fastGlob.sync('**/*.json', {
+ cwd: path.join(__dirname, '../__fixtures__'),
+ ignore: ['stress-schema.json'],
+ }),
+ )('should match %s', filename => {
const schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../__fixtures__/', filename), 'utf8'));
expect(dumpDom(
)).toMatchSnapshot();
@@ -186,3 +180,59 @@ describe('HTML Output', () => {
expect(dumpDom(
)).toMatchSnapshot();
});
});
+
+describe('$ref resolving', () => {
+ it('should render caret for schema with top-level $ref pointing at complex type', () => {
+ const schema: JSONSchema4 = {
+ $ref: '#/definitions/foo',
+ definitions: {
+ foo: {
+ type: 'string',
+ },
+ },
+ };
+
+ expect(dumpDom(
)).toMatchInlineSnapshot(`
+ "
+
+
+
+
+
+
+
#/definitions/foo
+
+
+
+
+
+ "
+ `);
+ });
+
+ it('should render caret for top-level array with $ref items', () => {
+ const schema: JSONSchema4 = {
+ type: 'array',
+ items: {
+ $ref: '#/foo',
+ },
+ };
+
+ expect(dumpDom(
)).toMatchInlineSnapshot(`
+ "
+
+
+
+
+
+
+
$ref(#/foo)[]
+
+
+
+
+
+ "
+ `);
+ });
+});
diff --git a/src/tree/__tests__/__snapshots__/tree.spec.ts.snap b/src/tree/__tests__/__snapshots__/tree.spec.ts.snap
index a5b08bf7..8dc55655 100644
--- a/src/tree/__tests__/__snapshots__/tree.spec.ts.snap
+++ b/src/tree/__tests__/__snapshots__/tree.spec.ts.snap
@@ -369,7 +369,7 @@ exports[`SchemaTree tree correctness given oneOf combiner placed next to allOf g
"
`;
-exports[`SchemaTree tree correctness should match array-of-allofs.json 1`] = `
+exports[`SchemaTree tree correctness should match arrays/of-allofs.json 1`] = `
"└─ #
├─ type: object
└─ children
diff --git a/src/tree/__tests__/tree.spec.ts b/src/tree/__tests__/tree.spec.ts
index 28c421ab..f8fd469d 100644
--- a/src/tree/__tests__/tree.spec.ts
+++ b/src/tree/__tests__/tree.spec.ts
@@ -775,7 +775,7 @@ describe('SchemaTree', () => {
});
it('given very complex model with circular references, should bail out and display unmerged allOf', () => {
- const schema = require('../../__fixtures__/complex-allOf-model.json');
+ const schema = require('../../__fixtures__/combiners/allOfs/complex.json');
const tree = new SchemaTree(schema, new SchemaTreeState(), {
expandedDepth: Infinity,
@@ -1595,7 +1595,7 @@ describe('SchemaTree', () => {
expect(tree.count).toEqual(mode === 'standalone' ? 3 : 2);
});
- it.each(['array-of-allofs.json'])('should match %s', filename => {
+ it.each(['arrays/of-allofs.json'])('should match %s', filename => {
const schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../__fixtures__', filename), 'utf8'));
const tree = new SchemaTree(schema, new SchemaTreeState(), {
expandedDepth: Infinity,
diff --git a/yarn.lock b/yarn.lock
index 89a623fd..78fb9870 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1784,11 +1784,10 @@
safe-stable-stringify "^1.1"
"@stoplight/lifecycle@^2.2.1":
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/@stoplight/lifecycle/-/lifecycle-2.2.1.tgz#bfa837d1dd3bd97eab96d8c8cf1bc3ea5ddcd263"
- integrity sha512-XOyfoJyWp5tXRFWq43mvnOoYTvkupwqGjDQnQ2o1qRNnfTrE70bjNK5ptD9A6m3zajAXgbl0puFa7P2CMg7+ew==
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/@stoplight/lifecycle/-/lifecycle-2.3.2.tgz#d61dff9ba20648241432e2daaef547214dc8976e"
+ integrity sha512-v0u8p27FA/eg04b4z6QXw4s0NeeFcRzyvseBW0+k/q4jtpg7EhVCqy42EbbbU43NTNDpIeQ81OcvkFz+6CYshw==
dependencies:
- strict-event-emitter-types "^2.0.0"
wolfy87-eventemitter "~5.2.8"
"@stoplight/markdown-viewer@^4.3.2":
@@ -6977,6 +6976,18 @@ fast-glob@^3.1.1:
merge2 "^1.3.0"
micromatch "^4.0.2"
+fast-glob@^3.2.4:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+ integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.2"
+ "@nodelib/fs.walk" "^1.2.3"
+ glob-parent "^5.1.0"
+ merge2 "^1.3.0"
+ micromatch "^4.0.2"
+ picomatch "^2.2.1"
+
fast-json-parse@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
@@ -9175,7 +9186,7 @@ jest-environment-node@^26.6.2:
jest-mock "^26.6.2"
jest-util "^26.6.2"
-jest-enzyme@7.1.2:
+jest-enzyme@^7.1.2:
version "7.1.2"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-7.1.2.tgz#91a10b2d3be1b56c0d65b34286e5bdc41ab4ba3d"
integrity sha512-j+jkph3t5hGBS12eOldpfsnERYRCHi4c/0KWPMnqRPoJJXvCpLIc5th1MHl0xDznQDXVU0AHUXg3rqMrf8vGpA==
@@ -12310,7 +12321,7 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==