Skip to content

fix(oas): extensions on tags is incorrectly spread #267

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

Open
P0lip wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(oas): extensions on tags is incorrectly spread #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions src/oas/__tests__/__snapshots__/service.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Object {
"tags": Array [
Object {
"description": "Everything about your Pets",
"extensions": Object {},
"externalDocs": Object {
"description": "Find out more",
"url": "http://swagger.io",
Expand All @@ -80,11 +81,13 @@ Object {
},
Object {
"description": "Access to Petstore orders",
"extensions": Object {},
"id": "tag-store",
"name": "store",
},
Object {
"description": "Operations about user",
"extensions": Object {},
"externalDocs": Object {
"description": "Find out more about our store",
"url": "http://swagger.io",
Expand All @@ -93,11 +96,13 @@ Object {
"name": "user",
},
Object {
"extensions": Object {
"x-service-tag-extension": Object {
"hello": "world",
},
},
"id": "tag-x-extension-in-tag",
"name": "x-extension-in-tag",
"x-service-tag-extension": Object {
"hello": "world",
},
},
],
"termsOfService": "http://swagger.io/terms/",
Expand Down Expand Up @@ -176,6 +181,7 @@ Object {
"tags": Array [
Object {
"description": "Everything about your Pets",
"extensions": Object {},
"externalDocs": Object {
"description": "Find out more",
"url": "http://swagger.io",
Expand All @@ -185,11 +191,13 @@ Object {
},
Object {
"description": "Access to Petstore orders",
"extensions": Object {},
"id": "tag-store",
"name": "store",
},
Object {
"description": "Operations about user",
"extensions": Object {},
"externalDocs": Object {
"description": "Find out more about our store",
"url": "http://swagger.io",
Expand All @@ -198,11 +206,13 @@ Object {
"name": "user",
},
Object {
"extensions": Object {
"x-service-tag-extension": Object {
"hello": "world",
},
},
"id": "tag-x-extension-in-tag",
"name": "x-extension-in-tag",
"x-service-tag-extension": Object {
"hello": "world",
},
},
],
"termsOfService": "http://swagger.io/terms/",
Expand Down
2 changes: 1 addition & 1 deletion src/oas/tags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const translateTagDefinition: TranslateFunction<
),

...toExternalDocs(tag.externalDocs),
...extensions,
extensions,
};
};

Expand Down
1 change: 1 addition & 0 deletions src/oas2/__tests__/__fixtures__/id/bundled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default {
// hash('tag-mutates')
id: 'tag-mutates',
name: 'mutates',
extensions: {},
},
],
extensions: {
Expand Down
6 changes: 4 additions & 2 deletions src/oas2/__tests__/bundle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,10 @@ describe('bundleOas2Service', () => {
{
id: 'tag-service-tag-extension',
name: 'service-tag-extension',
'x-service-tag-extension': {
hello: 'world',
extensions: {
'x-service-tag-extension': {
hello: 'world',
},
},
},
],
Expand Down
1 change: 1 addition & 0 deletions src/oas3/__tests__/__fixtures__/id/bundled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default {
// hash('tag-mutates')
id: 'tag-mutates',
name: 'mutates',
extensions: {},
},
],
components: {
Expand Down
1 change: 1 addition & 0 deletions src/oas3/__tests__/__fixtures__/id/legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default [
// hash(`tag-${tag.name}`)
id: 'tag-mutates',
name: 'mutates',
extensions: {},
},
],
extensions: {
Expand Down
6 changes: 4 additions & 2 deletions src/oas3/__tests__/bundle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,10 @@ describe('bundleOas3Service', () => {
{
id: 'tag-service-tag-extension',
name: 'service-tag-extension',
'x-service-tag-extension': {
hello: 'world',
extensions: {
'x-service-tag-extension': {
hello: 'world',
},
},
},
],
Expand Down