Skip to content

Commit a4be64f

Browse files
char0nchar0n
authored
feat: add support for AsyncAPI 2.6.0 (#3824)
Closes #3820 Closes #3819 Closes #3817 Refs https://github.com/swagger-api/apidom/releases/tag/v0.67.0
1 parent d7b60e3 commit a4be64f

17 files changed

+3874
-2714
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ REACT_APP_COMPACT_BUNDLE=true
1515
# REACT_APP_DEFINITION_URL=https://petstore.swagger.io/v2/swagger.json
1616

1717
# AsyncAPI 2.x.x remote absolute URI
18-
REACT_APP_DEFINITION_URL=https://raw.githubusercontent.com/asyncapi/spec/v2.5.0/examples/streetlights-kafka.yml
18+
REACT_APP_DEFINITION_URL=https://raw.githubusercontent.com/asyncapi/spec/v2.6.0/examples/streetlights-kafka.yml
1919

2020
REACT_APP_VERSION=$npm_package_version

‎package-lock.json‎

Lines changed: 3800 additions & 2640 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@
6363
"@emotion/styled": "^11.10.5",
6464
"@mui/material": "^5.11.3",
6565
"@primer/octicons-react": "^17.10.0",
66-
"@swagger-api/apidom-core": "^0.66.0",
67-
"@swagger-api/apidom-ls": "^0.66.0",
68-
"@swagger-api/apidom-ns-api-design-systems": "^0.66.0",
69-
"@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.66.0",
70-
"@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.66.0",
71-
"@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.66.0",
72-
"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.66.0",
73-
"@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.66.0",
74-
"@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.66.0",
75-
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.66.0",
76-
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.66.0",
66+
"@swagger-api/apidom-core": "^0.67.0",
67+
"@swagger-api/apidom-ls": "^0.67.0",
68+
"@swagger-api/apidom-ns-api-design-systems": "^0.67.0",
69+
"@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.67.0",
70+
"@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.67.0",
71+
"@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.67.0",
72+
"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.67.0",
73+
"@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.67.0",
74+
"@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.67.0",
75+
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.67.0",
76+
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.67.0",
7777
"axios": "^1.2.1",
7878
"classnames": "^2.3.2",
7979
"deepmerge": "^4.2.2",
@@ -109,7 +109,7 @@
109109
"@testing-library/user-event": "^14.4.3",
110110
"copyfiles": "^2.4.1",
111111
"cross-env": "^7.0.3",
112-
"cypress": "^12.2.0",
112+
"cypress": "^12.5.1",
113113
"cypress-file-upload": "^5.0.8",
114114
"eslint-config-airbnb": "^19.0.4",
115115
"eslint-config-prettier": "^8.6.0",
@@ -118,8 +118,8 @@
118118
"https-browserify": "^1.0.0",
119119
"husky": "^8.0.3",
120120
"jest-canvas-mock": "^2.4.0",
121-
"lint-staged": "^13.1.0",
122-
"prettier": "^2.8.1",
121+
"lint-staged": "^13.1.1",
122+
"prettier": "^2.8.3",
123123
"react-scripts": "file:./create-react-app/packages/react-scripts",
124124
"rimraf": "^4.1.2",
125125
"sass": "^1.58.0",

‎src/plugins/editor-content-fixtures/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import selectOpenAPI310PetstoreYAML from './selectors/selectOpenAPI310PetstoreYAML.js';
22
import selectOpenAPI303PetstoreYAML from './selectors/selectOpenAPI303PetstoreYAML.js';
33
import selectOpenAPI20PetstoreYAML from './selectors/selectOpenAPI20PetstoreYAML.js';
4-
import selectAsyncAPI250PetstoreYAML from './selectors/selectAsyncAPI250PetstoreYAML.js';
5-
import selectAsyncAPI250StreetlightsYAML from './selectors/selectAsyncAPI250StreetlightsYAML.js';
4+
import selectAsyncAPI260PetstoreYAML from './selectors/selectAsyncAPI260PetstoreYAML.js';
5+
import selectAsyncAPI260StreetlightsYAML from './selectors/selectAsyncAPI260StreetlightsYAML.js';
66
import selectAPIDesignSystemsYAML from './selectors/selectAPIDesignSystemsYAML.js';
77
// test
88

@@ -13,8 +13,8 @@ const EditorContentFixturesPlugin = () => ({
1313
selectOpenAPI310PetstoreYAML,
1414
selectOpenAPI303PetstoreYAML,
1515
selectOpenAPI20PetstoreYAML,
16-
selectAsyncAPI250PetstoreYAML,
17-
selectAsyncAPI250StreetlightsYAML,
16+
selectAsyncAPI260PetstoreYAML,
17+
selectAsyncAPI260StreetlightsYAML,
1818
selectAPIDesignSystemsYAML,
1919
},
2020
},

‎src/plugins/editor-content-fixtures/selectors/selectAsyncAPI250PetstoreYAML.js‎ renamed to ‎src/plugins/editor-content-fixtures/selectors/selectAsyncAPI260PetstoreYAML.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const selectAsyncAPI250PetstoreYAML = () => `asyncapi: 2.5.0
1+
const selectAsyncAPI260PetstoreYAML = () => `asyncapi: 2.6.0
22
info:
33
title: Petstore
44
version: 1.0.0
@@ -222,4 +222,4 @@ components:
222222
name: "##default"
223223
`;
224224

225-
export default selectAsyncAPI250PetstoreYAML;
225+
export default selectAsyncAPI260PetstoreYAML;

‎src/plugins/editor-content-fixtures/selectors/selectAsyncAPI250StreetlightsYAML.js‎ renamed to ‎src/plugins/editor-content-fixtures/selectors/selectAsyncAPI260StreetlightsYAML.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const selectAsyncAPI250StreetlightsYAML = () => `asyncapi: '2.5.0'
1+
const selectAsyncAPI260StreetlightsYAML = () => `asyncapi: '2.6.0'
22
info:
33
title: Streetlights Kafka API
44
version: '1.0.0'
@@ -188,4 +188,4 @@ components:
188188
enum: ['my-app-id']
189189
`;
190190

191-
export default selectAsyncAPI250StreetlightsYAML;
191+
export default selectAsyncAPI260StreetlightsYAML;

‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/LoadExampleNestedMenu.jsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ const LoadExampleNestedMenu = (props) => {
2020
'TopBarFileMenuLoadExampleNestedMenuOpenAPI20PetstoreMenuItem',
2121
true
2222
);
23-
const AsyncAPI25PetstoreMenuItem = getComponent(
24-
'TopBarFileMenuLoadExampleNestedMenuAsyncAPI25PetstoreMenuItem',
23+
const AsyncAPI26PetstoreMenuItem = getComponent(
24+
'TopBarFileMenuLoadExampleNestedMenuAsyncAPI26PetstoreMenuItem',
2525
true
2626
);
27-
const AsyncAPI25StreetlightsMenuItem = getComponent(
28-
'TopBarFileMenuLoadExampleNestedMenuAsyncAPI25StreetlightsMenuItem',
27+
const AsyncAPI26StreetlightsMenuItem = getComponent(
28+
'TopBarFileMenuLoadExampleNestedMenuAsyncAPI26StreetlightsMenuItem',
2929
true
3030
);
3131
const APIDesignSystemsMenuItem = getComponent(
@@ -42,11 +42,11 @@ const LoadExampleNestedMenu = (props) => {
4242
const handleOpenAPI20PetstoreClick = useCallback(async (event) => {
4343
await loadExampleNestedMenuHandler.current.loadOpenAP20PetstoreFixture(event);
4444
}, []);
45-
const handleAsyncAPI25PetstoreClick = useCallback(async (event) => {
46-
await loadExampleNestedMenuHandler.current.loadAsyncAPI25PetstoreFixture(event);
45+
const handleAsyncAPI26PetstoreClick = useCallback(async (event) => {
46+
await loadExampleNestedMenuHandler.current.loadAsyncAPI26PetstoreFixture(event);
4747
}, []);
48-
const handleAsyncAPI25StreetlightsClick = useCallback(async (event) => {
49-
await loadExampleNestedMenuHandler.current.loadAsyncAPI25StreetlightsFixture(event);
48+
const handleAsyncAPI26StreetlightsClick = useCallback(async (event) => {
49+
await loadExampleNestedMenuHandler.current.loadAsyncAPI26StreetlightsFixture(event);
5050
}, []);
5151
const handleAPIDesignSystemsClick = useCallback(async (event) => {
5252
await loadExampleNestedMenuHandler.current.loadAPIDesignSystemsFixture(event);
@@ -61,8 +61,8 @@ const LoadExampleNestedMenu = (props) => {
6161
<OpenAPI30PetstoreMenuItem onClick={handleOpenAPI30PetstoreClick} />
6262
<OpenAPI20PetstoreMenuItem onClick={handleOpenAPI20PetstoreClick} />
6363
<DropdownMenuItemDivider />
64-
<AsyncAPI25PetstoreMenuItem onClick={handleAsyncAPI25PetstoreClick} />
65-
<AsyncAPI25StreetlightsMenuItem onClick={handleAsyncAPI25StreetlightsClick} />
64+
<AsyncAPI26PetstoreMenuItem onClick={handleAsyncAPI26PetstoreClick} />
65+
<AsyncAPI26StreetlightsMenuItem onClick={handleAsyncAPI26StreetlightsClick} />
6666
<DropdownMenuItemDivider />
6767
<APIDesignSystemsMenuItem onClick={handleAPIDesignSystemsClick} />
6868
</DropDownMenuNested>

‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/LoadExampleNestedMenuHandler.jsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ const LoadExampleNestedMenuHandler = forwardRef((props, ref) => {
1717
const content = editorContentFixturesSelectors.selectOpenAPI20PetstoreYAML();
1818
editorActions.setContent(content, 'fixture-load');
1919
},
20-
loadAsyncAPI25PetstoreFixture() {
21-
const content = editorContentFixturesSelectors.selectAsyncAPI250PetstoreYAML();
20+
loadAsyncAPI26PetstoreFixture() {
21+
const content = editorContentFixturesSelectors.selectAsyncAPI260PetstoreYAML();
2222
editorActions.setContent(content, 'fixture-load');
2323
},
24-
loadAsyncAPI25StreetlightsFixture() {
25-
const content = editorContentFixturesSelectors.selectAsyncAPI250StreetlightsYAML();
24+
loadAsyncAPI26StreetlightsFixture() {
25+
const content = editorContentFixturesSelectors.selectAsyncAPI260StreetlightsYAML();
2626
editorActions.setContent(content, 'fixture-load');
2727
},
2828
loadAPIDesignSystemsFixture() {
@@ -42,8 +42,8 @@ LoadExampleNestedMenuHandler.propTypes = {
4242
selectOpenAPI310PetstoreYAML: PropTypes.func.isRequired,
4343
selectOpenAPI303PetstoreYAML: PropTypes.func.isRequired,
4444
selectOpenAPI20PetstoreYAML: PropTypes.func.isRequired,
45-
selectAsyncAPI250PetstoreYAML: PropTypes.func.isRequired,
46-
selectAsyncAPI250StreetlightsYAML: PropTypes.func.isRequired,
45+
selectAsyncAPI260PetstoreYAML: PropTypes.func.isRequired,
46+
selectAsyncAPI260StreetlightsYAML: PropTypes.func.isRequired,
4747
selectAPIDesignSystemsYAML: PropTypes.func.isRequired,
4848
}).isRequired,
4949
};

‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/items/AsyncAPI25PetstoreMenuItem.jsx‎ renamed to ‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/items/AsyncAPI26PetstoreMenuItem.jsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import PropTypes from 'prop-types';
22

3-
const AsyncAPI25PetstoreMenuItem = ({ getComponent, onClick, children }) => {
3+
const AsyncAPI26PetstoreMenuItem = ({ getComponent, onClick, children }) => {
44
const DropdownMenuItem = getComponent('DropdownMenuItem');
55

66
return (
7-
<DropdownMenuItem onClick={onClick}>{children || 'AsyncAPI 2.5 Petstore'}</DropdownMenuItem>
7+
<DropdownMenuItem onClick={onClick}>{children || 'AsyncAPI 2.6 Petstore'}</DropdownMenuItem>
88
);
99
};
1010

11-
AsyncAPI25PetstoreMenuItem.propTypes = {
11+
AsyncAPI26PetstoreMenuItem.propTypes = {
1212
getComponent: PropTypes.func.isRequired,
1313
children: PropTypes.node,
1414
onClick: PropTypes.func.isRequired,
1515
};
1616

17-
AsyncAPI25PetstoreMenuItem.defaultProps = {
17+
AsyncAPI26PetstoreMenuItem.defaultProps = {
1818
children: null,
1919
};
2020

21-
export default AsyncAPI25PetstoreMenuItem;
21+
export default AsyncAPI26PetstoreMenuItem;

‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/items/AsyncAPI25StreetlightsMenuItem.jsx‎ renamed to ‎src/plugins/top-bar/components/FileMenu/items/LoadExampleNestedMenu/items/AsyncAPI26StreetlightsMenuItem.jsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import PropTypes from 'prop-types';
22

3-
const AsyncAPI25StreetlightsMenuItem = ({ getComponent, onClick, children }) => {
3+
const AsyncAPI26StreetlightsMenuItem = ({ getComponent, onClick, children }) => {
44
const DropdownMenuItem = getComponent('DropdownMenuItem');
55

66
return (
7-
<DropdownMenuItem onClick={onClick}>{children || 'AsyncAPI 2.5 Streetlights'}</DropdownMenuItem>
7+
<DropdownMenuItem onClick={onClick}>{children || 'AsyncAPI 2.6 Streetlights'}</DropdownMenuItem>
88
);
99
};
1010

11-
AsyncAPI25StreetlightsMenuItem.propTypes = {
11+
AsyncAPI26StreetlightsMenuItem.propTypes = {
1212
getComponent: PropTypes.func.isRequired,
1313
children: PropTypes.node,
1414
onClick: PropTypes.func.isRequired,
1515
};
1616

17-
AsyncAPI25StreetlightsMenuItem.defaultProps = {
17+
AsyncAPI26StreetlightsMenuItem.defaultProps = {
1818
children: null,
1919
};
2020

21-
export default AsyncAPI25StreetlightsMenuItem;
21+
export default AsyncAPI26StreetlightsMenuItem;

0 commit comments

Comments
 (0)