Skip to content

Commit b05ce6b

Browse files
committed
chore: migrated custom code in getSimpleNameFromNode to ASTSearchHelper
1 parent d82229b commit b05ce6b

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

packages/eslint-plugin-svelte/src/utils/ast-utils.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -666,17 +666,18 @@ function getSimpleNameFromNode(
666666
| TSESTree.Expression,
667667
context: RuleContext | undefined
668668
): string {
669-
if (node.type === 'Identifier' || node.type === 'SvelteName') {
670-
return node.name;
671-
}
672-
if (
673-
node.type === 'SvelteMemberExpressionName' ||
674-
(node.type === 'MemberExpression' && !node.computed)
675-
) {
676-
return `${getSimpleNameFromNode(node.object, context!)}.${getSimpleNameFromNode(
677-
node.property,
678-
context!
679-
)}`;
669+
const name = ASTSearchHelper(node, {
670+
Identifier: (node) => node.name,
671+
MemberExpression: (node, searchAnotherNode) =>
672+
!node.computed
673+
? `${searchAnotherNode(node.object)}.${searchAnotherNode(node.property)}`
674+
: null,
675+
SvelteName: (node) => node.name,
676+
SvelteMemberExpressionName: (node, searchAnotherNode) =>
677+
`${searchAnotherNode(node.object)}.${searchAnotherNode(node.property)}`
678+
});
679+
if (name !== null) {
680+
return name;
680681
}
681682

682683
// No nodes other than those listed above are currently expected to be used in names.

0 commit comments

Comments
 (0)