From 892b1d93f01be384ac44b6f84fb279be14288d65 Mon Sep 17 00:00:00 2001 From: Bert De Block Date: Wed, 18 Dec 2024 13:17:00 +0100 Subject: [PATCH] Remove custom `findByName` util --- lib/commands/try-one.js | 3 +-- lib/utils/config.js | 5 ++--- lib/utils/find-by-name.js | 10 ---------- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 lib/utils/find-by-name.js diff --git a/lib/commands/try-one.js b/lib/commands/try-one.js index 6e1fba9c..29e7e3ec 100644 --- a/lib/commands/try-one.js +++ b/lib/commands/try-one.js @@ -1,6 +1,5 @@ 'use strict'; -const findByName = require('../utils/find-by-name'); const debug = require('debug')('ember-try:commands:try-one'); module.exports = { @@ -50,7 +49,7 @@ module.exports = { debug('Config: %s', JSON.stringify(config)); - let scenario = findByName(config.scenarios, scenarioName); + let scenario = config.scenarios.find((s) => s.name === scenarioName); if (!scenario) { throw new Error( 'The `ember try:one` command requires a scenario ' + 'specified in the config.', diff --git a/lib/utils/config.js b/lib/utils/config.js index 12ab4478..51848b96 100644 --- a/lib/utils/config.js +++ b/lib/utils/config.js @@ -3,7 +3,6 @@ const path = require('path'); const fs = require('fs'); const { prefix, warn } = require('./console'); -const findByName = require('./find-by-name'); const debug = require('debug')('ember-try:utils:config'); function getConfigPath(project) { @@ -91,12 +90,12 @@ function mergeAutoConfigAndConfigFileData(autoConfig, configData) { let conf = Object.assign({}, autoConfig, configData); let overriddenScenarios = autoConfig.scenarios.map((scenario) => { - let overriddenScenario = findByName(configData.scenarios, scenario.name); + let overriddenScenario = configData.scenarios.find((s) => s.name === scenario.name); return Object.assign({}, scenario, overriddenScenario); }); let additionalScenarios = configData.scenarios.filter((scenario) => { - return !findByName(autoConfig.scenarios, scenario.name); + return !autoConfig.scenarios.find((s) => s.name === scenario.name); }); conf.scenarios = [...overriddenScenarios, ...additionalScenarios]; diff --git a/lib/utils/find-by-name.js b/lib/utils/find-by-name.js deleted file mode 100644 index 80622038..00000000 --- a/lib/utils/find-by-name.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -module.exports = function findByName(arr, name) { - let matches = (arr || []).filter((item) => { - if (item.name === name) { - return item; - } - }); - return matches[0]; -};