From 6f9bb65368b980db270f8cf5f1a44248989587ca Mon Sep 17 00:00:00 2001 From: Matatjahu Date: Tue, 27 Sep 2022 10:41:51 +0200 Subject: [PATCH 1/2] feat: support AsyncAPI 2.5.0 --- components/Servers.js | 5 +++++ test/components/Servers.test.js | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/components/Servers.js b/components/Servers.js index 92a5c17f5..9da5ac225 100644 --- a/components/Servers.js +++ b/components/Servers.js @@ -2,6 +2,7 @@ import { IndentationTypes, Text } from '@asyncapi/generator-react-sdk'; import { Bindings } from './Bindings'; import { Extensions } from './Extensions'; +import { Tags } from './Tags'; import { Header, ListItem, Link, Table, NewLine } from './common'; import { ServerHelpers } from '../helpers/server'; @@ -36,6 +37,10 @@ function Server({ serverName, server, asyncapi }) { + {server.hasTags() && ( + + )} + { url: 'development.gigantic-server.com', description: 'Development server', protocol: 'amqp', - protocolVersion: '0.9.1' + protocolVersion: '0.9.1', + tags: [ + { name: 'env:development' }, + ], }, staging: { url: 'staging.gigantic-server.com', description: 'Staging server', protocol: 'amqp', - protocolVersion: '0.9.1' + protocolVersion: '0.9.1', + tags: [ + { name: 'env:staging' }, + ], }, production: { url: 'api.gigantic-server.com', @@ -37,6 +43,12 @@ describe('Servers component', () => { Development server +##### Server tags + +| Name | Description | Documentation | +|---|---|---| +| env:development | - | - | + ### \`staging\` Server @@ -45,6 +57,12 @@ Development server Staging server +##### Server tags + +| Name | Description | Documentation | +|---|---|---| +| env:staging | - | - | + ### \`production\` Server From 72d07e019ab5e0c1949ea5b578b266aaf13780ef Mon Sep 17 00:00:00 2001 From: Matatjahu Date: Thu, 29 Sep 2022 10:45:32 +0200 Subject: [PATCH 2/2] update deps --- package-lock.json | 76 ++++++++++++++++----------------- package.json | 6 +-- test/components/Servers.test.js | 2 + 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89d964fe3..d7ea1ef60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,11 @@ "dependencies": { "@asyncapi/generator-filters": "^2.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", - "@asyncapi/parser": "^1.15.1", + "@asyncapi/parser": "^1.17.0", "yaml": "^1.10.2" }, "devDependencies": { - "@asyncapi/generator": "^1.9.6", + "@asyncapi/generator": "^1.9.12", "@babel/preset-env": "^7.15.8", "@babel/preset-react": "^7.14.5", "@semantic-release/commit-analyzer": "^8.0.1", @@ -44,24 +44,24 @@ } }, "node_modules/@asyncapi/avro-schema-parser": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-1.0.1.tgz", - "integrity": "sha512-j3JWLDkzWARlo2v/olOAgJ1aB9HNsvUUUHPKkx54ZNHUUbyVcDpQhBNSdvm8OBNKVa53QxLoDK7g59jhgUJZ9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-1.1.0.tgz", + "integrity": "sha512-7J7pzSw0/jF2bXy/Mf+80VKJfXRRfyLTJz413MkKLbLXbbz9rV4sVpYfp31ofqXgyZ9bhfmHJzunbi0Bt7Jcww==", "dev": true, "dependencies": { "avsc": "^5.7.3" } }, "node_modules/@asyncapi/generator": { - "version": "1.9.6", - "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.9.6.tgz", - "integrity": "sha512-vs7+rieyj1O3nFU3PViCi3EFw0Xt6y/+MfLp1+9G/0EK7GIiRJ3nLLu5h+D3d9f6YUGByveDJYPR9XW4r5usng==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.9.12.tgz", + "integrity": "sha512-pWXb3UMdY3bRW2vtVZffR4RJ0STatAIhXTSveIzda56OL/oNGCrSu/ce7SbOuHVxEvYOY7j6AjtGsjNkBEIyaw==", "dev": true, "dependencies": { - "@asyncapi/avro-schema-parser": "^1.0.0", + "@asyncapi/avro-schema-parser": "^1.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", "@asyncapi/openapi-schema-parser": "^2.0.1", - "@asyncapi/parser": "^1.15.1", + "@asyncapi/parser": "^1.17.0", "@asyncapi/raml-dt-schema-parser": "^2.0.1", "@npmcli/arborist": "^2.2.4", "ajv": "^6.10.2", @@ -233,12 +233,12 @@ } }, "node_modules/@asyncapi/parser": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.15.1.tgz", - "integrity": "sha512-n8Ny17ar0+4mm+nU1ddvu44DKxAzTr1NtH2yPWJRpODFzjH2BrQ0Xe1e7djzL2jJjeqHpWl6DZdLWChFvL0iPg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.17.0.tgz", + "integrity": "sha512-xNXtGZ/hTf8a1C4X65ESKkBJgSx0o9RDyX3LYdQfdQWsDjjmltK4saa9Peu+0Nr2bHU+xaziRo4tOv8QmJ5qfA==", "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.6", - "@asyncapi/specs": "^2.14.0", + "@asyncapi/specs": "^3.2.0", "@fmvilas/pseudo-yaml-ast": "^0.3.1", "ajv": "^6.10.1", "js-yaml": "^3.13.1", @@ -259,9 +259,9 @@ } }, "node_modules/@asyncapi/specs": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.14.0.tgz", - "integrity": "sha512-hHsYF6XsYNIKb1P2rXaooF4H+uKKQ4b/Ljxrk3rZ3riEDiSxMshMEfb1fUlw9Yj4V4OmJhjXwkNvw8W59AXv1A==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.0.tgz", + "integrity": "sha512-4tzJfhAk5IetJyUDzxl6oQ5oNDnX8+Q7kM62eksONdhJlfU9KYzx/mUeQrbHTFKBROi6yKXcYD842+ahICk8EA==" }, "node_modules/@babel/code-frame": { "version": "7.10.4", @@ -4001,9 +4001,9 @@ } }, "node_modules/avsc": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz", - "integrity": "sha512-uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==", + "version": "5.7.6", + "resolved": "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz", + "integrity": "sha512-jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA==", "dev": true, "engines": { "node": ">=0.11" @@ -19312,24 +19312,24 @@ } }, "@asyncapi/avro-schema-parser": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-1.0.1.tgz", - "integrity": "sha512-j3JWLDkzWARlo2v/olOAgJ1aB9HNsvUUUHPKkx54ZNHUUbyVcDpQhBNSdvm8OBNKVa53QxLoDK7g59jhgUJZ9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-1.1.0.tgz", + "integrity": "sha512-7J7pzSw0/jF2bXy/Mf+80VKJfXRRfyLTJz413MkKLbLXbbz9rV4sVpYfp31ofqXgyZ9bhfmHJzunbi0Bt7Jcww==", "dev": true, "requires": { "avsc": "^5.7.3" } }, "@asyncapi/generator": { - "version": "1.9.6", - "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.9.6.tgz", - "integrity": "sha512-vs7+rieyj1O3nFU3PViCi3EFw0Xt6y/+MfLp1+9G/0EK7GIiRJ3nLLu5h+D3d9f6YUGByveDJYPR9XW4r5usng==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.9.12.tgz", + "integrity": "sha512-pWXb3UMdY3bRW2vtVZffR4RJ0STatAIhXTSveIzda56OL/oNGCrSu/ce7SbOuHVxEvYOY7j6AjtGsjNkBEIyaw==", "dev": true, "requires": { - "@asyncapi/avro-schema-parser": "^1.0.0", + "@asyncapi/avro-schema-parser": "^1.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", "@asyncapi/openapi-schema-parser": "^2.0.1", - "@asyncapi/parser": "^1.15.1", + "@asyncapi/parser": "^1.17.0", "@asyncapi/raml-dt-schema-parser": "^2.0.1", "@npmcli/arborist": "^2.2.4", "ajv": "^6.10.2", @@ -19475,12 +19475,12 @@ } }, "@asyncapi/parser": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.15.1.tgz", - "integrity": "sha512-n8Ny17ar0+4mm+nU1ddvu44DKxAzTr1NtH2yPWJRpODFzjH2BrQ0Xe1e7djzL2jJjeqHpWl6DZdLWChFvL0iPg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.17.0.tgz", + "integrity": "sha512-xNXtGZ/hTf8a1C4X65ESKkBJgSx0o9RDyX3LYdQfdQWsDjjmltK4saa9Peu+0Nr2bHU+xaziRo4tOv8QmJ5qfA==", "requires": { "@apidevtools/json-schema-ref-parser": "^9.0.6", - "@asyncapi/specs": "^2.14.0", + "@asyncapi/specs": "^3.2.0", "@fmvilas/pseudo-yaml-ast": "^0.3.1", "ajv": "^6.10.1", "js-yaml": "^3.13.1", @@ -19501,9 +19501,9 @@ } }, "@asyncapi/specs": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.14.0.tgz", - "integrity": "sha512-hHsYF6XsYNIKb1P2rXaooF4H+uKKQ4b/Ljxrk3rZ3riEDiSxMshMEfb1fUlw9Yj4V4OmJhjXwkNvw8W59AXv1A==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.0.tgz", + "integrity": "sha512-4tzJfhAk5IetJyUDzxl6oQ5oNDnX8+Q7kM62eksONdhJlfU9KYzx/mUeQrbHTFKBROi6yKXcYD842+ahICk8EA==" }, "@babel/code-frame": { "version": "7.10.4", @@ -22282,9 +22282,9 @@ } }, "avsc": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz", - "integrity": "sha512-uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==", + "version": "5.7.6", + "resolved": "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz", + "integrity": "sha512-jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA==", "dev": true }, "aws-sign2": { diff --git a/package.json b/package.json index 0509b5f0f..014a30912 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "dependencies": { "@asyncapi/generator-filters": "^2.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", - "@asyncapi/parser": "^1.15.1", + "@asyncapi/parser": "^1.17.0", "yaml": "^1.10.2" }, "devDependencies": { - "@asyncapi/generator": "^1.9.6", + "@asyncapi/generator": "^1.9.12", "@babel/preset-env": "^7.15.8", "@babel/preset-react": "^7.14.5", "@semantic-release/commit-analyzer": "^8.0.1", @@ -78,7 +78,7 @@ }, "generator": { "renderer": "react", - "generator": ">=1.1.0 <2.0.0", + "generator": ">=1.9.12 <2.0.0", "parameters": { "frontMatter": { "description": "The name of a JSON or YAML formatted file containing values to provide the YAML frontmatter for static-site or documentation generators. The file may contain {{title}} and {{version}} replaceable tags.", diff --git a/test/components/Servers.test.js b/test/components/Servers.test.js index 13c335992..1ff190c09 100644 --- a/test/components/Servers.test.js +++ b/test/components/Servers.test.js @@ -14,6 +14,7 @@ describe('Servers component', () => { protocolVersion: '0.9.1', tags: [ { name: 'env:development' }, + { name: 'another-tag' }, ], }, staging: { @@ -48,6 +49,7 @@ Development server | Name | Description | Documentation | |---|---|---| | env:development | - | - | +| another-tag | - | - | ### \`staging\` Server