From 418234e85a2374c9d67bb281de0ba0a575cca072 Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 16 May 2019 23:48:02 +0100 Subject: [PATCH 1/2] fix(oas3): show correct source maps for schema invalid type warning --- .../lib/parser/oas/parseSchemaObject.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/fury-adapter-oas3-parser/lib/parser/oas/parseSchemaObject.js b/packages/fury-adapter-oas3-parser/lib/parser/oas/parseSchemaObject.js index fbcba18a6..8395c8432 100644 --- a/packages/fury-adapter-oas3-parser/lib/parser/oas/parseSchemaObject.js +++ b/packages/fury-adapter-oas3-parser/lib/parser/oas/parseSchemaObject.js @@ -131,8 +131,13 @@ function validateValuesMatchSchema(context, schema) { function parseSchema(context) { const { namespace } = context; - const ensureValidType = R.unless(isValidType, createWarning(namespace, - `'Schema Object' 'type' must be either ${types.join(', ')}`)); + const ensureValidType = R.unless( + isValidType, + R.compose( + createWarning(namespace, `'Schema Object' 'type' must be either ${types.join(', ')}`), + getValue + ) + ); const parseType = pipeParseResult(namespace, parseString(context, name, false), From 198eff551ae7a5cb019668fa6d5a014b3897bcaf Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 16 May 2019 23:49:31 +0100 Subject: [PATCH 2/2] fix(oas3): show correct source maps multiple examples warning --- .../lib/parser/oas/parseMediaTypeObject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fury-adapter-oas3-parser/lib/parser/oas/parseMediaTypeObject.js b/packages/fury-adapter-oas3-parser/lib/parser/oas/parseMediaTypeObject.js index c88c3d693..04a85fac3 100644 --- a/packages/fury-adapter-oas3-parser/lib/parser/oas/parseMediaTypeObject.js +++ b/packages/fury-adapter-oas3-parser/lib/parser/oas/parseMediaTypeObject.js @@ -96,7 +96,7 @@ function parseMediaTypeObject(context, MessageBodyClass, element) { } if (examples.length > 1) { - parseResult.push(createWarning(namespace, `'${name}' 'examples' only one example is supported, other examples have been ignored`, examples)); + parseResult.push(createWarning(namespace, `'${name}' 'examples' only one example is supported, other examples have been ignored`, examples.content[1])); } return parseResult;