add support for .? and &&

ota-meshi · ota-meshi · commit 61bb8af11d4b · 2025-05-16T09:28:35.000+09:00
diff --git a/packages/eslint-plugin-svelte/src/rules/no-top-level-browser-globals.ts b/packages/eslint-plugin-svelte/src/rules/no-top-level-browser-globals.ts
@@ -33,7 +33,6 @@ export default createRule('no-top-level-browser-globals', {
 			isAvailableLocation: (node: TSESTree.Node) => boolean;
 			// The guard that checks whether the browser environment is set to true.
 			browserEnvironment: boolean;
-			used?: boolean;
 		};
 		const maybeGuards: MaybeGuard[] = [];
 
@@ -126,7 +125,6 @@ export default createRule('no-top-level-browser-globals', {
 			for (const guard of maybeGuards.reverse()) {
 				if (guard.isAvailableLocation(ref.node)) {
 					if (guard.browserEnvironment || guard.reference?.name === ref.name) {
-						guard.used = true;
 						return true;
 					}
 				}
@@ -280,6 +278,14 @@ export default createRule('no-top-level-browser-globals', {
 			}
 
 			if (node.type === 'MemberExpression') {
+				if (
+					((parent.type === 'CallExpression' && parent.callee === node) ||
+						(parent.type === 'MemberExpression' && parent.object === node)) &&
+					parent.optional
+				) {
+					// e.g. globalThis.location?.href
+					return (n) => n === node;
+				}
 				// e.g. if (globalThis.window)
 				return getGuardChecker({ node });
 			}
@@ -325,6 +331,15 @@ export default createRule('no-top-level-browser-globals', {
 
 				return (n) => start <= n.range[0] && n.range[1] <= end;
 			}
+			if (
+				!guardInfo.not &&
+				parent.type === 'LogicalExpression' &&
+				parent.operator === '&&' &&
+				parent.left === guardInfo.node
+			) {
+				const block = parent.right;
+				return (n) => block.range[0] <= n.range[0] && n.range[1] <= block.range[1];
+			}
 			return null;
 		}
 	}
diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/invalid/guards08-errors.yaml b/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/invalid/guards08-errors.yaml
@@ -0,0 +1,20 @@
+- message: Unexpected top-level browser global variable "location".
+  line: 3
+  column: 21
+  suggestions: null
+- message: Unexpected top-level browser global variable "location".
+  line: 3
+  column: 49
+  suggestions: null
+- message: Unexpected top-level browser global variable "location".
+  line: 5
+  column: 14
+  suggestions: null
+- message: Unexpected top-level browser global variable "location".
+  line: 5
+  column: 37
+  suggestions: null
+- message: Unexpected top-level browser global variable "location".
+  line: 7
+  column: 14
+  suggestions: null
diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/invalid/guards08-input.svelte b/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/invalid/guards08-input.svelte
@@ -0,0 +1,8 @@
+<script>
+	console.log(typeof location !== 'undefined' && location.href);
+	console.log(typeof location === 'undefined' && location.href); // NG
+	console.log(globalThis.location && location.href);
+	console.log(globalThis.location || location.href); // NG
+	console.log(globalThis.location?.href);
+	console.log(globalThis.location.href); // NG
+</script>
diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/valid/env-guards01-input.svelte b/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/valid/env-guards01-input.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { browser } from '$app/environment';
+	import { BROWSER } from 'esm-env';
+
+	console.log(browser && location.href);
+	console.log(BROWSER && location.href);
+</script>
diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/valid/guards08-input.svelte b/packages/eslint-plugin-svelte/tests/fixtures/rules/no-top-level-browser-globals/valid/guards08-input.svelte
@@ -0,0 +1,8 @@
+<script>
+	console.log(typeof location !== 'undefined' && location.href);
+	// console.log(typeof location === 'undefined' && location.href); // NG
+	console.log(globalThis.location && location.href);
+	// console.log(globalThis.location || location.href); // NG
+	console.log(globalThis.location?.href);
+	// console.log(globalThis.location.href); // NG
+</script>
