fix(oas3): use either where appropriate

Author: opichals

packages/openapi3-parser/lib/parser/oas/parseMediaTypeObject.js

@@ -37,7 +37,7 @@ function isXMLMediaType(mediaType) {
   return type === 'application' && (suffix === 'xml' || subtype === 'xml');
 }
 
-const canGenerateMessageBodyForMediaType = R.anyPass([isJSONMediaType, isTextMediaType]);
+const canGenerateMessageBodyForMediaType = R.either(isJSONMediaType, isTextMediaType);
 
 function generateMessageBody(context, mediaType, dataStructure) {
   const elements = {};
@@ -98,10 +98,10 @@ function parseExample(context, mediaType) {
   const createExampleNotStringWarning = createWarning(namespace,
     `'${name}' 'example' should be a string for media type '${mediaType}'`);
 
-  const isTextBasedType = R.anyPass([
+  const isTextBasedType = R.either(
     () => isTextMediaType(mediaType),
-    () => isXMLMediaType(mediaType),
-  ]);
+    () => isXMLMediaType(mediaType)
+  );
 
   const parseTextExample = pipeParseResult(namespace,
     R.unless(isString, createExampleNotStringWarning),

packages/openapi3-parser/lib/parser/oas/parseParameterObjects.js

@@ -10,7 +10,7 @@ const parseReference = require('../parseReference');
 const parseParameterObjectOrRef = parseReference('parameters', parseParameterObject);
 
 // Given MemberElement has key `path` or `query`
-const isPathOrQuery = R.anyPass([hasKey('path'), hasKey('query')]);
+const isPathOrQuery = R.either(hasKey('path'), hasKey('query'));
 
 /**
  * Parse parameters array

packages/openapi3-parser/lib/parser/oas/parseResponsesObject.js

@@ -48,7 +48,7 @@ function parseResponsesObject(context, element) {
     createWarning(namespace, `'${name}' response status code must be a string and should be wrapped in quotes`, member.key),
   ]);
 
-  const isStatusCodeOrDefault = R.anyPass([isStatusCode, hasKey('default')]);
+  const isStatusCodeOrDefault = R.either(isStatusCode, hasKey('default'));
 
   // FIXME Add support for status code ranges
   // https://github.com/apiaryio/fury-adapter-oas3-parser/issues/64

packages/openapi3-parser/lib/parser/oas/parseSchemaObject.js

@@ -115,7 +115,7 @@ function validateValuesMatchSchema(context, schema) {
     return member;
   };
 
-  const isDefaultOrExample = R.anyPass([hasKey('example'), hasKey('default')]);
+  const isDefaultOrExample = R.either(hasKey('example'), hasKey('default'));
   const parseMember = R.cond([
     [isDefaultOrExample, validate],
     [R.T, e => e],

packages/openapi3-parser/lib/parser/parseMap.js

@@ -6,7 +6,7 @@ const {
 const { createWarning } = require('./annotations');
 const parseObject = require('./parseObject');
 
-const isAnnotationOrMember = R.anyPass([isAnnotation, isMember]);
+const isAnnotationOrMember = R.either(isAnnotation, isMember);
 
 const validateMapValueIsObject = (namespace, name, key) => R.unless(R.pipe(getValue, isObject), createWarning(namespace, `'${name}' '${key}' is not an object`));
 

packages/openapi3-parser/lib/parser/parseObject.js

@@ -11,7 +11,7 @@ const pipeParseResult = require('../pipeParseResult');
  * @returns {boolean}
  * @private
  */
-const isAnnotationOrMember = R.anyPass([isAnnotation, isMember]);
+const isAnnotationOrMember = R.either(isAnnotation, isMember);
 
 const parseResultHasErrors = parseResult => !parseResult.errors.isEmpty;