Skip to content

feat(playground): add support for OpenAPI 3.0.x #1958

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 5, 2022
Merged

feat(playground): add support for OpenAPI 3.0.x #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f53dffd
feat(playground): add support for OpenAPI 3.0.x
char0n Sep 5, 2022
e703b56
refactor: export symbols
char0n Sep 5, 2022
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
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/apidom-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
"@swagger-api/apidom-ast": "*",
"@swagger-api/apidom-core": "*",
"@swagger-api/apidom-ns-asyncapi-2": "*",
"@swagger-api/apidom-ns-openapi-3-0": "*",
"@swagger-api/apidom-ns-openapi-3-1": "*",
"@swagger-api/apidom-parser": "*",
"@swagger-api/apidom-parser-adapter-asyncapi-json-2": "*",
"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "*",
"@swagger-api/apidom-parser-adapter-json": "*",
"@swagger-api/apidom-parser-adapter-openapi-json-3-0": "*",
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "*",
"@swagger-api/apidom-parser-adapter-openapi-json-3-1": "*",
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "*",
"@swagger-api/apidom-parser-adapter-yaml-1-2": "*",
Expand Down
4 changes: 4 additions & 0 deletions packages/apidom-playground/src/playground/apidom.worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { dehydrate, from, sexprs, toValue } from '@swagger-api/apidom-core';
import ApiDOMParser from '@swagger-api/apidom-parser';
import * as jsonAdapter from '@swagger-api/apidom-parser-adapter-json';
import * as yamlAdapter from '@swagger-api/apidom-parser-adapter-yaml-1-2';
import * as openapi3_0AdapterJson from '@swagger-api/apidom-parser-adapter-openapi-json-3-0';
import * as openapi3_0AdapterYaml from '@swagger-api/apidom-parser-adapter-openapi-yaml-3-0';
import * as openapi3_1AdapterJson from '@swagger-api/apidom-parser-adapter-openapi-json-3-1';
import * as openapi3_1AdapterYaml from '@swagger-api/apidom-parser-adapter-openapi-yaml-3-1';
import * as asyncapi2AdapterJson from '@swagger-api/apidom-parser-adapter-asyncapi-json-2';
Expand All @@ -17,6 +19,8 @@ import {
const parser = ApiDOMParser()
.use(jsonAdapter)
.use(yamlAdapter)
.use(openapi3_0AdapterJson)
.use(openapi3_0AdapterYaml)
.use(openapi3_1AdapterJson)
.use(openapi3_1AdapterYaml)
.use(asyncapi2AdapterJson)
Expand Down
3 changes: 0 additions & 3 deletions packages/apidom-playground/src/playground/components/left-pane/EditorControls.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ const EditorControls = () => {
value={mediaType}
onChange={handleMediaTypeChange}
>
<MenuItem value="application/json">application/json</MenuItem>
<MenuItem value="application/yaml">application/yaml</MenuItem>
<MenuItem value="text/yaml">text/yaml</MenuItem>
{mediaTypes.map((medType) => (
<MenuItem key={medType} value={medType}>
{medType}
Expand Down
16 changes: 15 additions & 1 deletion packages/apidom-playground/src/playground/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import { createSelector } from 'swagger-adjust';
import { isEmptyString, isNonEmptyString, isNull } from 'ramda-adjunct';
import { from, traverse, createNamespace, sexprs, toValue } from '@swagger-api/apidom-core';
/* eslint-disable camelcase */
import openApi3_0NsPlugin, {
mediaTypes as openApi3_0MediaTypes,
} from '@swagger-api/apidom-ns-openapi-3-0';
import openApi3_1NsPlugin, {
mediaTypes as openApi3_1MediaTypes,
} from '@swagger-api/apidom-ns-openapi-3-1';
import asyncApi2NsPlugin, {
mediaTypes as asyncApi2MediaTypes,
} from '@swagger-api/apidom-ns-asyncapi-2';
import { mediaTypes as jsonMediaTypes } from '@swagger-api/apidom-parser-adapter-json';
import { mediaTypes as yamlMediaTypes } from '@swagger-api/apidom-parser-adapter-yaml-1-2';

export const selectSource = (state) => state.source;

Expand All @@ -31,6 +36,9 @@ export const selectApiDOMNamespace = createSelector(selectMediaType, (mediaType)
if (isEmptyString(mediaType)) {
return null;
}
if (openApi3_0MediaTypes.includes(mediaType)) {
return createNamespace(openApi3_0NsPlugin);
}
if (openApi3_1MediaTypes.includes(mediaType)) {
return createNamespace(openApi3_1NsPlugin);
}
Expand Down Expand Up @@ -104,7 +112,13 @@ export const selectCanDereference = createSelector(
);

export const selectMediaTypes = (() => {
const allMediaTypes = [...openApi3_1MediaTypes, ...asyncApi2MediaTypes];
const allMediaTypes = [
...jsonMediaTypes,
...yamlMediaTypes,
...openApi3_0MediaTypes,
...openApi3_1MediaTypes,
...asyncApi2MediaTypes,
];
return () => allMediaTypes;
})();
/* eslint-enable */
2 changes: 2 additions & 0 deletions packages/apidom-reference/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ export { default as HttpResolver } from './resolve/resolvers/HttpResolver';
export { default as Resolver } from './resolve/resolvers/Resolver';
export { default as ResolveStrategy } from './resolve/strategies/ResolveStrategy';
export { default as AsyncApi2ResolveStrategy } from './resolve/strategies/asyncapi-2';
export { default as OpenApi3_0ResolveStrategy } from './resolve/strategies/openapi-3-0';
export { default as OpenApi3_1ResolveStrategy } from './resolve/strategies/openapi-3-1';

export { default as AsyncApi2DereferenceStrategy } from './dereference/strategies/asyncapi-2';
export { default as OpenApi3_0DereferenceStrategy } from './dereference/strategies/openapi-3-0';
export { default as OpenApi3_1DereferenceStrategy } from './dereference/strategies/openapi-3-1';

export { default as options } from './options';
Expand Down