From e55055534f95311651ac7ada7b5cfb77f9f1d93d Mon Sep 17 00:00:00 2001 From: Oliver foster Date: Thu, 19 Dec 2019 10:45:33 +0000 Subject: [PATCH] Fix travis errors --- src/parser.js | 5 ++--- src/utils.js | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/parser.js b/src/parser.js index 831b5cf..8bacf3e 100644 --- a/src/parser.js +++ b/src/parser.js @@ -381,9 +381,8 @@ class Parser { } const platformMatchingDefinition = Utils.find( - platformsAndOSNames, - name => (this.isPlatform(name)) - ); + platformsAndOSNames, + name => (this.isPlatform(name))); if (platformMatchingDefinition) { const platformResult = this.satisfies(platformsAndOSes[platformMatchingDefinition]); diff --git a/src/utils.js b/src/utils.js index cdf76e1..6f92bf2 100644 --- a/src/utils.js +++ b/src/utils.js @@ -210,6 +210,8 @@ export default class Utils { return -1; } } + + return undefined; } /** @@ -244,12 +246,11 @@ export default class Utils { if (Array.prototype.find) { return Array.prototype.find.call(arr, predicate); } - for (i = 0, l = arr.length; i < l; i+=1) { + for (i = 0, l = arr.length; i < l; i += 1) { const value = arr[i]; - if (!predicate(value, i)) { - continue; + if (predicate(value, i)) { + return value; } - return value; } return undefined; } @@ -262,18 +263,20 @@ export default class Utils { * @return {Object} */ static assign(obj, ...assigners) { + const result = obj; let i; let l; if (Object.assign) { return Object.assign(obj, ...assigners); } - for (i = 0, l = assigners.length; i < l; i+=1) { + for (i = 0, l = assigners.length; i < l; i += 1) { const assigner = assigners[i]; - if (typeof assigner !== 'object') { - continue; + if (typeof assigner === 'object') { + const keys = Object.keys(assigner); + keys.forEach((key) => { + result[key] = assigner[key]; + }); } - const keys = Object.keys(assigner); - keys.forEach(key => obj[key] = assigner[key]); } return obj; }