Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-07-10 16:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

getMethodParams param semantic fix

Browse Source
This commit is contained in:
Roman Hotsiy 2015-12-12 17:29:50 +02:00
parent d2d856067b
commit 8d91427206
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/components/Method/method.js
View File

@ -35,7 +35,7 @@ export default class Method extends BaseComponent {
} }
findBodyParam() { findBodyParam() {
let pathParams = this.schemaMgr.getMethodParams(JsonPointer.join(this.pointer, 'parameters'), true); let pathParams = this.schemaMgr.getMethodParams(this.pointer, true);
let bodyParam = pathParams.find(param => param.in === 'body'); let bodyParam = pathParams.find(param => param.in === 'body');
return bodyParam; return bodyParam;
} }

26
lib/utils/SchemaManager.js
View File

@ -60,7 +60,9 @@ export default class SchemaManager {
resolveRefs(obj) { resolveRefs(obj) {
Object.keys(obj).forEach(key => { Object.keys(obj).forEach(key => {
if (obj[key].$ref) { if (obj[key].$ref) {
obj[key] = this.byPointer(obj[key].$ref); let resolved = this.byPointer(obj[key].$ref);
resolved._pointer = obj[key].$ref;
obj[key] = resolved;
} }
}); });
return obj; return obj;
@ -76,18 +78,20 @@ export default class SchemaManager {
}); });
} }
//get path params // accept pointer directly to parameters as well
let ptr = JsonPointer.dirName(methodPtr, 2) + '/parameters'; if (JsonPointer.baseName(methodPtr) === 'parameters') {
let pathParams = this.byPointer(ptr); methodPtr = JsonPointer.dirName(methodPtr);
if (Array.isArray(pathParams)) {
pathParams = injectPointers(pathParams, ptr);
} else if (pathParams && pathParams.$ref) {
pathParams = injectPointers(this.byPointer(pathParams.$ref), pathParams.$ref);
} else {
pathParams = [];
} }
let methodParams = injectPointers(this.byPointer(methodPtr), methodPtr) || []; //get path params
let pathParamsPtr = JsonPointer.join(JsonPointer.dirName(methodPtr), ['parameters']);
let pathParams = this.byPointer(pathParamsPtr) || [];
let methodParamsPtr = JsonPointer.join(methodPtr, ['parameters']);
let methodParams = this.byPointer(methodParamsPtr) || [];
pathParams = injectPointers(pathParams, pathParamsPtr);
methodParams = injectPointers(methodParams, methodParamsPtr);
if (resolveRefs) { if (resolveRefs) {
methodParams = this.resolveRefs(methodParams); methodParams = this.resolveRefs(methodParams);
pathParams = this.resolveRefs(pathParams); pathParams = this.resolveRefs(pathParams);