diff --git a/examples/docs/abstract.schema.md b/examples/docs/abstract.schema.md index 842df19ecd96c5608d295aeeaef3e9ee86983174..c035b2eba6ebcdfb04c45a9aaf271d1e55d242ed 100644 --- a/examples/docs/abstract.schema.md +++ b/examples/docs/abstract.schema.md @@ -13,5 +13,5 @@ This is an abstract schema. It has `definitions`, but does not declare any prope | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| true | true | true | [abstract.schema.json](abstract.schema.json) | +| Cannot be instantiated | Is extensible | true | [abstract.schema.json](abstract.schema.json) | --- \ No newline at end of file diff --git a/examples/docs/definitions.schema.md b/examples/docs/definitions.schema.md index 5bebd8a24a65ad58228c06e5235dba130f76ea66..cc35ca474f57b9901dcfee109bab573d5e4a15e2 100644 --- a/examples/docs/definitions.schema.md +++ b/examples/docs/definitions.schema.md @@ -14,5 +14,5 @@ It is imported using `allOf` and `$ref`. | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| false | true | true | [definitions.schema.json](definitions.schema.json) | +| Can be instantiated | Is extensible | true | [definitions.schema.json](definitions.schema.json) | --- \ No newline at end of file diff --git a/examples/docs/example.schema.md b/examples/docs/example.schema.md index a9d0955ad275a7d72963d08040bc4b5942207c91..add444b6f695b9ed15ed039fad6ec5d20e89adec 100644 --- a/examples/docs/example.schema.md +++ b/examples/docs/example.schema.md @@ -13,5 +13,5 @@ This is an example schema with examples. Too many examples? There can never be t | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| false | false | true | [example.schema.json](example.schema.json) | +| Can be instantiated | Is not extensible | true | [example.schema.json](example.schema.json) | --- \ No newline at end of file diff --git a/examples/docs/extensible.schema.md b/examples/docs/extensible.schema.md index 35d1e74be3494a7a18e6723f23a6dd6f877e616a..1056513d41da29450f36c2e44b65f773eb019e2c 100644 --- a/examples/docs/extensible.schema.md +++ b/examples/docs/extensible.schema.md @@ -13,5 +13,5 @@ This is an extensible schema. It has `definitions`, that can be used in other sc | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| true | true | true | [extensible.schema.json](extensible.schema.json) | +| Cannot be instantiated | Is extensible | true | [extensible.schema.json](extensible.schema.json) | --- \ No newline at end of file diff --git a/examples/docs/simple.schema.md b/examples/docs/simple.schema.md index 71311cff8a6ca0e35b4364fc9a79cbcce2982a6a..af3cf5bfe9e62894be9470167e96b92212d2140b 100644 --- a/examples/docs/simple.schema.md +++ b/examples/docs/simple.schema.md @@ -13,5 +13,5 @@ This is a *very* simple example of a JSON schema. There is only one property. | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| false | false | true | [simple.schema.json](simple.schema.json) | +| Can be instantiated | Is not extensible | true | [simple.schema.json](simple.schema.json) | --- \ No newline at end of file diff --git a/examples/docs/subdir/subdir.schema.md b/examples/docs/subdir/subdir.schema.md index 4f05fdadb4b63d2c76d057c6e775f9e99eca74e3..73c5fcfacf0040e19713357f188517541a6aade6 100644 --- a/examples/docs/subdir/subdir.schema.md +++ b/examples/docs/subdir/subdir.schema.md @@ -13,5 +13,5 @@ A schema in a sub directory | Abstract | Extensible | Custom Properties | Defined In | |----------|------------|-------------------|------------| -| true | true | true | [subdir/subdir.schema.json](subdir/subdir.schema.json) | +| Cannot be instantiated | Is extensible | true | [subdir/subdir.schema.json](subdir/subdir.schema.json) | --- \ No newline at end of file diff --git a/lib/markdownWriter.js b/lib/markdownWriter.js index 9d70defbf39d6d48aefbb63e80c25a25ea478c64..79f2a78c38b9826819ae689b204393f35fce84d9 100644 --- a/lib/markdownWriter.js +++ b/lib/markdownWriter.js @@ -33,8 +33,8 @@ function schemaProps(schema, schemaPath, filename) { console.log(_.keys(schema)); return { // if there are definitions, but no properties - abstract: schema.definitions !== undefined && _.keys(schema.properties).length === 0, - extensible: schema.definitions !== undefined || schema['meta:extensible'] === true, + abstract: (schema.definitions !== undefined && _.keys(schema.properties).length === 0) ? 'Cannot be instantiated' : 'Can be instantiated', + extensible: (schema.definitions !== undefined || schema['meta:extensible'] === true) ? 'Yes' : 'No', custom: true, original: filename.substr(schemaPath.length).substr(1), };