From c35c84af7769e2a63d356b3e96b36e53e0f9abe5 Mon Sep 17 00:00:00 2001 From: Bryan Mishkin <698306+bmish@users.noreply.github.com> Date: Mon, 22 Jun 2020 13:58:58 -0500 Subject: [PATCH] refactor: rename isExtendObject util function --- lib/rules/avoid-leaking-state-in-ember-objects.js | 2 +- lib/utils/ember.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/rules/avoid-leaking-state-in-ember-objects.js b/lib/rules/avoid-leaking-state-in-ember-objects.js index 34027ea845..e82d4dd9ce 100644 --- a/lib/rules/avoid-leaking-state-in-ember-objects.js +++ b/lib/rules/avoid-leaking-state-in-ember-objects.js @@ -80,7 +80,7 @@ module.exports = { return { CallExpression(node) { - if (!(ember.isEmberObject(node) || ember.isReopenObject(node))) { + if (!(ember.isExtendObject(node) || ember.isReopenObject(node))) { return; } diff --git a/lib/utils/ember.js b/lib/utils/ember.js index c536db31f7..5c068fa9dc 100644 --- a/lib/utils/ember.js +++ b/lib/utils/ember.js @@ -55,8 +55,7 @@ module.exports = { unwrapBraceExpressions, hasDuplicateDependentKeys, - isEmberObject, - + isExtendObject, isReopenObject, isReopenClassObject, @@ -78,7 +77,7 @@ const CORE_MODULE_IMPORT_PATHS = { }; function isClassicEmberCoreModule(node, module, filePath) { - const isExtended = isEmberObject(node); + const isExtended = isExtendObject(node); let isModuleByPath; if (filePath) { @@ -143,7 +142,7 @@ function isModule(node, element, module) { } function isDSModel(node, filePath) { - const isExtended = isEmberObject(node); + const isExtended = isExtendObject(node); let isModuleByPath = false; if (filePath && isExtended) { @@ -182,7 +181,7 @@ function isMirageConfig(fileName) { return fileName.endsWith(path.join('mirage', 'config.js')); } -function isEmberObject(node) { +function isExtendObject(node) { return ( node.callee.property && (node.callee.property.name === 'extend' || node.callee.property.value === 'extend') @@ -535,7 +534,7 @@ function unwrapBraceExpressions(dependentKeys) { function isEmberObjectImplementingUnknownProperty(node) { if (types.isCallExpression(node)) { - if (!isEmberObject(node) && !isReopenObject(node)) { + if (!isExtendObject(node) && !isReopenObject(node)) { return false; } // Classic class.