chore(no-navigation-without-resolve): simplified link checking logic

Author: marekdedic

packages/eslint-plugin-svelte/src/rules/no-navigation-without-resolve.ts

@@ -90,55 +90,25 @@ export default createRule('no-navigation-without-resolve', {
 					}
 				}
 			},
-			SvelteShorthandAttribute(node) {
-				if (
-					ignoreLinks ||
-					node.parent.parent.type !== 'SvelteElement' ||
-					node.parent.parent.kind !== 'html' ||
-					node.parent.parent.name.type !== 'SvelteName' ||
-					node.parent.parent.name.name !== 'a' ||
-					node.key.name !== 'href' ||
-					node.value.type !== 'Identifier'
-				) {
-					return;
-				}
-				if (
-					!expressionIsAbsolute(new FindVariableContext(context), node.value) &&
-					!expressionIsFragment(new FindVariableContext(context), node.value) &&
-					!isResolveCall(new FindVariableContext(context), node.value, resolveReferences)
-				) {
-					context.report({ loc: node.loc, messageId: 'linkWithoutResolve' });
-				}
-			},
-			SvelteAttribute(node) {
-				if (
-					ignoreLinks ||
-					node.parent.parent.type !== 'SvelteElement' ||
-					node.parent.parent.kind !== 'html' ||
-					node.parent.parent.name.type !== 'SvelteName' ||
-					node.parent.parent.name.name !== 'a' ||
-					node.key.name !== 'href'
-				) {
-					return;
-				}
-				if (
-					(node.value[0].type === 'SvelteLiteral' &&
-						!expressionIsNullish(new FindVariableContext(context), node.value[0]) &&
-						!expressionIsAbsolute(new FindVariableContext(context), node.value[0]) &&
-						!expressionIsFragment(new FindVariableContext(context), node.value[0])) ||
-					(node.value[0].type === 'SvelteMustacheTag' &&
-						!expressionIsNullish(new FindVariableContext(context), node.value[0].expression) &&
-						!expressionIsAbsolute(new FindVariableContext(context), node.value[0].expression) &&
-						!expressionIsFragment(new FindVariableContext(context), node.value[0].expression) &&
-						!isResolveCall(
-							new FindVariableContext(context),
-							node.value[0].expression,
+			...(!ignoreLinks && {
+				SvelteShorthandAttribute(node) {
+					if (!isLinkAttributeOk(context, node, node.value, resolveReferences)) {
+						context.report({ loc: node.loc, messageId: 'linkWithoutResolve' });
+					}
+				},
+				SvelteAttribute(node) {
+					if (
+						!isLinkAttributeOk(
+							context,
+							node,
+							node.value[0].type === 'SvelteMustacheTag' ? node.value[0].expression : node.value[0],
 							resolveReferences
-						))
-				) {
-					context.report({ loc: node.value[0].loc, messageId: 'linkWithoutResolve' });
+						)
+					) {
+						context.report({ loc: node.value[0].loc, messageId: 'linkWithoutResolve' });
+					}
 				}
-			}
+			})
 		};
 	}
 });
@@ -250,11 +220,30 @@ function checkShallowNavigationCall(
 	}
 }
 
+function isLinkAttributeOk(
+	context: RuleContext,
+	attribute: AST.SvelteAttribute | AST.SvelteShorthandAttribute,
+	value: TSESTree.Expression | AST.SvelteLiteral,
+	resolveReferences: Set<TSESTree.Identifier>
+): boolean {
+	return (
+		attribute.parent.parent.type !== 'SvelteElement' ||
+		attribute.parent.parent.kind !== 'html' ||
+		attribute.parent.parent.name.type !== 'SvelteName' ||
+		attribute.parent.parent.name.name !== 'a' ||
+		attribute.key.name !== 'href' ||
+		expressionIsNullish(new FindVariableContext(context), value) ||
+		expressionIsAbsolute(new FindVariableContext(context), value) ||
+		expressionIsFragment(new FindVariableContext(context), value) ||
+		isResolveCall(new FindVariableContext(context), value, resolveReferences)
+	);
+}
+
 // Helper functions
 
 function isResolveCall(
 	ctx: FindVariableContext,
-	node: TSESTree.CallExpressionArgument,
+	node: TSESTree.CallExpressionArgument | AST.SvelteLiteral,
 	resolveReferences: Set<TSESTree.Identifier>
 ): boolean {
 	if (

packages/eslint-plugin-svelte/tests/fixtures/rules/no-navigation-without-resolve/valid/link-nullish01-input.svelte

@@ -1,9 +1,11 @@
 <script>
 	const one = undefined;
 	const two = null;
+	const href = null;
 </script>
 
 <a href={undefined}>Click me!</a>
 <a href={null}>Click me!</a>
 <a href={one}>Click me!</a>
 <a href={two}>Click me!</a>
+<a {href}>Click me!</a>