Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use reference to the json-schema draft-07 in monaco editor #159

Merged
merged 3 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 173 additions & 0 deletions src/services/json-schema.draft-07.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
/* eslint-disable sonarjs/no-duplicate-string */
export default {
$schema: 'http://json-schema.org/draft-07/schema#',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for reference, I suggested this asyncapi/spec-json-schemas#120 for the future.

$id: 'http://json-schema.org/draft-07/schema#',
title: 'Core schema meta-schema',
definitions: {
schemaArray: {
type: 'array',
minItems: 1,
items: { $ref: '#' }
},
nonNegativeInteger: {
type: 'integer',
minimum: 0
},
nonNegativeIntegerDefault0: {
allOf: [
{ $ref: '#/definitions/nonNegativeInteger' },
{ default: 0 }
]
},
simpleTypes: {
enum: [
'array',
'boolean',
'integer',
'null',
'number',
'object',
'string'
]
},
stringArray: {
type: 'array',
items: { type: 'string' },
uniqueItems: true,
default: []
}
},
type: ['object', 'boolean'],
properties: {
$id: {
type: 'string',
format: 'uri-reference'
},
$schema: {
type: 'string',
format: 'uri'
},
$ref: {
type: 'string',
format: 'uri-reference'
},
$comment: {
type: 'string'
},
title: {
type: 'string'
},
description: {
type: 'string'
},
default: true,
readOnly: {
type: 'boolean',
default: false
},
writeOnly: {
type: 'boolean',
default: false
},
examples: {
type: 'array',
items: true
},
multipleOf: {
type: 'number',
exclusiveMinimum: 0
},
maximum: {
type: 'number'
},
exclusiveMaximum: {
type: 'number'
},
minimum: {
type: 'number'
},
exclusiveMinimum: {
type: 'number'
},
maxLength: { $ref: '#/definitions/nonNegativeInteger' },
minLength: { $ref: '#/definitions/nonNegativeIntegerDefault0' },
pattern: {
type: 'string',
format: 'regex'
},
additionalItems: { $ref: '#' },
items: {
anyOf: [
{ $ref: '#' },
{ $ref: '#/definitions/schemaArray' }
],
default: true
},
maxItems: { $ref: '#/definitions/nonNegativeInteger' },
minItems: { $ref: '#/definitions/nonNegativeIntegerDefault0' },
uniqueItems: {
type: 'boolean',
default: false
},
contains: { $ref: '#' },
maxProperties: { $ref: '#/definitions/nonNegativeInteger' },
minProperties: { $ref: '#/definitions/nonNegativeIntegerDefault0' },
required: { $ref: '#/definitions/stringArray' },
additionalProperties: { $ref: '#' },
definitions: {
type: 'object',
additionalProperties: { $ref: '#' },
default: {}
},
properties: {
type: 'object',
additionalProperties: { $ref: '#' },
default: {}
},
patternProperties: {
type: 'object',
additionalProperties: { $ref: '#' },
propertyNames: { format: 'regex' },
default: {}
},
dependencies: {
type: 'object',
additionalProperties: {
anyOf: [
{ $ref: '#' },
{ $ref: '#/definitions/stringArray' }
]
}
},
propertyNames: { $ref: '#' },
const: true,
enum: {
type: 'array',
items: true,
minItems: 1,
uniqueItems: true
},
type: {
anyOf: [
{ $ref: '#/definitions/simpleTypes' },
{
type: 'array',
items: { $ref: '#/definitions/simpleTypes' },
minItems: 1,
uniqueItems: true
}
]
},
format: { type: 'string' },
contentMediaType: { type: 'string' },
contentEncoding: { type: 'string' },
if: { $ref: '#' },
then: { $ref: '#' },
else: { $ref: '#' },
allOf: { $ref: '#/definitions/schemaArray' },
anyOf: { $ref: '#/definitions/schemaArray' },
oneOf: { $ref: '#/definitions/schemaArray' },
not: { $ref: '#' }
},
default: true
};
9 changes: 8 additions & 1 deletion src/services/monaco.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import * as monacoAPI from 'monaco-editor/esm/vs/editor/editor.api';
import { SpecificationService } from './specification.service';
import state from '../state';

import jsonSchemaDraft07 from './json-schema.draft-07';

export class MonacoService {
private static actualVersion = 'X.X.X';
private static Monaco: any = null;
Expand Down Expand Up @@ -45,10 +47,15 @@ export class MonacoService {
completion: true,
schemas: [
{
uri: 'https://www.asyncapi.com/', // id of the schema
uri: 'https://www.asyncapi.com/', // id of the AsyncAPI spec schema
fileMatch: ['*'], // associate with all models
schema: specs[String(asyncAPIVersion)],
},
{
uri: jsonSchemaDraft07.$id, // id of the draft-07 schema
fileMatch: ['*'], // associate with all models
schema: jsonSchemaDraft07,
}
],
} as any;
}
Expand Down