fix(oas3): use both where appropriate

Author: opichals

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

@@ -44,9 +44,9 @@ function parseOauthFlowsObject(context, object) {
 
     const parse = pipeParseResult(namespace,
       R.compose(parseOauthFlowObject(context), getValue),
-      R.when(R.allPass([R.complement(hasAuthorizationUrl), needAuthorizationUrl]), () => createWarning(namespace,
+      R.when(R.both(R.complement(hasAuthorizationUrl), needAuthorizationUrl), () => createWarning(namespace,
         `'${name}' '${key}' is missing required property 'authorizationUrl'`, member)),
-      R.when(R.allPass([R.complement(hasTokenUrl), needTokenUrl]), () => createWarning(namespace,
+      R.when(R.both(R.complement(hasTokenUrl), needTokenUrl), () => createWarning(namespace,
         `'${name}' '${key}' is missing required property 'tokenUrl'`, member)));
 
     return parse(member);

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

@@ -27,7 +27,7 @@ const unsupportedKeys = [
 ];
 const isUnsupportedKey = R.anyPass(R.map(hasKey, unsupportedKeys));
 
-const isRequestBody = R.allPass([isMember, hasKey('requestBody')]);
+const isRequestBody = R.both(isMember, hasKey('requestBody'));
 
 function createTransactions(namespace, member, operation) {
   const requests = R.map(getValue, R.filter(isRequestBody, operation.content));

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

@@ -60,10 +60,10 @@ function validateRequiredForPathParameter(context, object, parameter) {
   return parseResult;
 }
 
-const hasExplodeWithoutQueryIn = R.allPass([
+const hasExplodeWithoutQueryIn = R.both(
   object => object.getValue('explode') === true,
-  object => object.getValue('in') !== 'query',
-]);
+  object => object.getValue('in') !== 'query'
+);
 
 /**
  * Parse Parameter Object

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

@@ -38,7 +38,7 @@ const chainParseResult = R.curry((transform, parseResult) => {
 
 // FIXME Can be simplified once https://github.com/refractproject/minim/issues/201 is completed
 const hasMember = R.curry((object, key) => {
-  const findKey = R.allPass([isMember, member => member.key.toValue() === key]);
+  const findKey = R.both(isMember, member => member.key.toValue() === key);
   const matchingMembers = object.content.filter(findKey);
   return matchingMembers.length > 0;
 });
@@ -153,7 +153,7 @@ function parseObject(context, name, parseMember, requiredKeys = [], orderedKeys
       let errors = null;
 
       orderedKeys.forEach((key) => {
-        const isOrderedKey = R.allPass([isMember, m => m.key.equals(key)]);
+        const isOrderedKey = R.both(isMember, m => m.key.equals(key));
         const member = R.filter(isOrderedKey, value).get(0);
         if (member) {
           const parseResult = parseMember(member);

packages/openapi3-parser/lib/pipeParseResult.js

@@ -22,7 +22,7 @@ const hasValue = parseResult => !R.reject(isAnnotation, parseResult).isEmpty;
  * @param parseResult {ParseResult}
  * @returns boolean
  */
-const hasNoErrorsAndHasValue = R.allPass([hasNoErrors, hasValue]);
+const hasNoErrorsAndHasValue = R.both(hasNoErrors, hasValue);
 
 /**
  * Concatate the lhs and rhs array into a parse result