-
Notifications
You must be signed in to change notification settings - Fork 90
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: do not crash when operation has illegal $ref, print error instead #103
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
const at = require('lodash/at'); | ||
|
||
/* | ||
Checks the unresolved spec to see if the object at path `path` | ||
has a `$ref` property. Useful when validating a resolved spec | ||
and want to know if a certain object was referenced or defined | ||
inline. | ||
*/ | ||
|
||
module.exports = (jsSpec, path) => { | ||
if (Array.isArray(path)) { | ||
path = convertArrayToBracketNotation(path); | ||
} else { | ||
// if not array, assuming it is a dot separated string | ||
// | ||
// note: it is not a good idea to use this pattern, | ||
// as parameter names sometimes have periods in them. | ||
// only arrays should be passed in | ||
path = convertArrayToBracketNotation(path.split('.')); | ||
} | ||
|
||
const objectAtGivenPath = at(jsSpec, path)[0]; | ||
return Boolean(objectAtGivenPath && objectAtGivenPath.$ref); | ||
}; | ||
|
||
// returns a string with format parentKey['nextKey']['nextKey']['etc'] | ||
function convertArrayToBracketNotation(path) { | ||
return path.reduce((result, element) => result + `['${element}']`); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
const expect = require('expect'); | ||
const { hasRefProperty } = require('../../src/plugins/utils'); | ||
|
||
const spec = { | ||
paths: { | ||
'/resource': { | ||
post: { | ||
description: 'a simple operation', | ||
requestBody: { | ||
$ref: 'external.yaml#/resource-post-request-body' | ||
}, | ||
responses: { | ||
'200': { | ||
description: 'a simple response' | ||
}, | ||
'400': { | ||
$ref: '#/components/responses/ErrorResponse' | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
components: { | ||
responses: { | ||
ErrorResponse: { | ||
description: 'error response with content', | ||
content: { | ||
'application/json': { | ||
schema: { | ||
$ref: 'external.yaml#/error-response-schema' | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
}; | ||
|
||
describe('has ref property - util', () => { | ||
it('should return true when array leads to $ref property', () => { | ||
const path = ['paths', '/resource', 'post', 'requestBody']; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(true); | ||
}); | ||
|
||
it('should return true when dot-separated-string leads to $ref property', () => { | ||
const path = 'paths./resource.post.requestBody'; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(true); | ||
}); | ||
|
||
it('should return false when array does not lead to $ref property', () => { | ||
const path = ['paths', '/resource', 'post', 'responses', '200']; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(false); | ||
}); | ||
|
||
it('should return false when dot-separated-string does not lead to $ref property', () => { | ||
const path = 'paths./resource.post.responses.200'; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(false); | ||
}); | ||
|
||
it('should return false when path leads to somewhere non-existent in the spec', () => { | ||
const path = ['paths', '/resource', 'get', 'responses', '200']; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(false); | ||
}); | ||
|
||
it('should return false when path leads through $ref - currently unsupported', () => { | ||
const path = [ | ||
'paths', | ||
'/resource', | ||
'post', | ||
'responses', | ||
'400', | ||
'content', | ||
'application/json', | ||
'schema' | ||
]; | ||
const hasRef = hasRefProperty(spec, path); | ||
|
||
expect(hasRef).toBe(false); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course! I always thought of validators as operating on either the
jsSpec
orresolvedSpec
, but no reason you can't use both. Nice!