refactor(ast-utils, rules): enhance utility extraction and test coverage

- Rename extractDeclarations to extractTopLevelDeclarations for clarity and scope consistency
- Add extractReturnIdentifiers for improved return property identifier detection
- Extend unit tests for AST utilities to cover edge cases and TS/JS wrappers
- Update rules to ensure consistent usage of extractTopLevelDeclarations and identifiers handling
- Improve test coverage and robustness of rule logic

Author: doubledare704

packages/eslint-plugin/package.json

@@ -45,17 +45,20 @@
   "scripts": {
     "build": "tsup",
     "test": "vitest run",
+    "test:coverage": "vitest --coverage",
     "test:watch": "vitest",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . -l @pinia/eslint-plugin -r 1"
   },
   "devDependencies": {
+    "@eslint/js": "^9.35.0",
     "@typescript-eslint/parser": "^8.35.1",
     "@typescript-eslint/rule-tester": "^8.35.1",
     "@typescript-eslint/utils": "^8.35.1",
-    "eslint": "^9.0.0",
+    "eslint": "^9.35.0",
     "pinia": "workspace:*",
     "tsup": "^8.5.0",
     "typescript": "~5.8.3",
+    "typescript-eslint": "^8.44.0",
     "vitest": "^3.2.4"
   },
   "engines": {

packages/eslint-plugin/src/rules/__tests__/no-circular-store-dependencies.test.ts

@@ -4,10 +4,11 @@
 
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import { noCircularStoreDependencies } from '../no-circular-store-dependencies'
+import * as parser from '@typescript-eslint/parser'
 
 const ruleTester = new RuleTester({
   languageOptions: {
-    parser: require('@typescript-eslint/parser'),
+    parser,
     parserOptions: {
       ecmaVersion: 2020,
       sourceType: 'module',

packages/eslint-plugin/src/rules/__tests__/no-store-in-computed.test.ts

@@ -4,10 +4,11 @@
 
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import { noStoreInComputed } from '../no-store-in-computed'
+import * as parser from '@typescript-eslint/parser'
 
 const ruleTester = new RuleTester({
   languageOptions: {
-    parser: require('@typescript-eslint/parser'),
+    parser,
     parserOptions: {
       ecmaVersion: 2020,
       sourceType: 'module',

packages/eslint-plugin/src/rules/no-circular-store-dependencies.ts

@@ -31,7 +31,6 @@ export const noCircularStoreDependencies = createRule({
     type: 'problem',
     docs: {
       description: 'disallow circular dependencies between stores',
-      recommended: 'warn',
     },
     schema: [],
     messages: {

packages/eslint-plugin/src/rules/no-store-in-computed.ts

@@ -26,7 +26,6 @@ export const noStoreInComputed = createRule({
     type: 'problem',
     docs: {
       description: 'disallow store instantiation in computed properties',
-      recommended: 'error',
     },
     schema: [],
     messages: {

packages/eslint-plugin/src/rules/prefer-use-store-naming.ts

@@ -22,7 +22,6 @@ export const preferUseStoreNaming = createRule({
     type: 'suggestion',
     docs: {
       description: 'enforce consistent store naming conventions',
-      recommended: 'warn',
     },
     hasSuggestions: true,
     schema: [
@@ -44,6 +43,7 @@ export const preferUseStoreNaming = createRule({
     messages: {
       invalidNaming:
         'Store function should follow the naming pattern "{{expected}}"',
+      renameTo: 'Rename to "{{name}}"',
     },
   },
   defaultOptions: [{ prefix: 'use', suffix: 'Store' }],
@@ -95,7 +95,8 @@ export const preferUseStoreNaming = createRule({
               },
               suggest: [
                 {
-                  desc: `Rename to "${suggestedName}"`,
+                  messageId: 'renameTo',
+                  data: { name: suggestedName },
                   fix(fixer) {
                     return fixer.replaceText(node.id, suggestedName)
                   },

packages/eslint-plugin/src/rules/require-setup-store-properties-export.ts

@@ -8,7 +8,7 @@ import {
   isDefineStoreCall,
   isSetupStore,
   getSetupFunction,
-  extractDeclarations,
+  extractTopLevelDeclarations,
   extractReturnIdentifiers,
   findReturnStatement,
   hasSpreadInReturn,
@@ -30,7 +30,6 @@ export const requireSetupStorePropertiesExport = createRule({
     type: 'problem',
     docs: {
       description: 'require all setup store properties to be exported',
-      recommended: 'error',
     },
     fixable: 'code',
     schema: [],
@@ -55,8 +54,10 @@ export const requireSetupStorePropertiesExport = createRule({
           return
         }
 
-        // Extract all declared variables and functions
-        const { variables, functions } = extractDeclarations(setupFunction.body)
+        // Extract all declared variables and functions (top-level only)
+        const { variables, functions } = extractTopLevelDeclarations(
+          setupFunction.body
+        )
         const allDeclared = [...variables, ...functions]
 
         // Find the return statement

packages/eslint-plugin/src/utils/__tests__/ast-utils.test.ts

@@ -8,8 +8,9 @@ import type { TSESTree } from '@typescript-eslint/utils'
 import {
   isDefineStoreCall,
   getStoreId,
-  extractDeclarations,
+  extractTopLevelDeclarations,
   extractReturnProperties,
+  extractReturnIdentifiers,
 } from '../ast-utils'
 
 function parseCode(code: string): TSESTree.Program {
@@ -110,8 +111,8 @@ describe('getStoreId', () => {
   })
 })
 
-describe('extractDeclarations', () => {
-  it('should extract variable declarations and deduplicate', () => {
+describe('extractTopLevelDeclarations', () => {
+  it('should extract variable declarations and deduplicate (top-level only)', () => {
     const code = `
       function setup() {
         var name = ref('test')
@@ -122,12 +123,12 @@ describe('extractDeclarations', () => {
     `
     const ast = parseCode(code)
     const func = ast.body[0] as TSESTree.FunctionDeclaration
-    const result = extractDeclarations(func.body!)
+    const result = extractTopLevelDeclarations(func.body!)
 
     expect(result.variables).toEqual(['name', 'count'])
   })
 
-  it('should extract loop initializer declarations', () => {
+  it('should not include loop initializer declarations (top-level only)', () => {
     const code = `
       function setup() {
         for (let i = 0; i < 10; i++) {
@@ -141,13 +142,14 @@ describe('extractDeclarations', () => {
     `
     const ast = parseCode(code)
     const func = ast.body[0] as TSESTree.FunctionDeclaration
-    const result = extractDeclarations(func.body!)
+    const result = extractTopLevelDeclarations(func.body!)
 
-    expect(result.variables).toContain('i')
-    expect(result.variables).toContain('item')
+    expect(result.variables).not.toContain('i')
+    expect(result.variables).not.toContain('item')
+    expect(result.variables).toEqual([])
   })
 
-  it('should extract catch clause parameters', () => {
+  it('should not include catch clause parameters (top-level only)', () => {
     const code = `
       function setup() {
         try {
@@ -160,9 +162,10 @@ describe('extractDeclarations', () => {
     `
     const ast = parseCode(code)
     const func = ast.body[0] as TSESTree.FunctionDeclaration
-    const result = extractDeclarations(func.body!)
+    const result = extractTopLevelDeclarations(func.body!)
 
-    expect(result.variables).toContain('error')
+    expect(result.variables).not.toContain('error')
+    expect(result.variables).toEqual([])
   })
 })
 
@@ -191,7 +194,19 @@ describe('extractReturnProperties', () => {
     const func = ast.body[0] as TSESTree.FunctionDeclaration
     const returnStmt = func.body!.body[0] as TSESTree.ReturnStatement
     const result = extractReturnProperties(returnStmt)
+    expect(result).toEqual(['name', 'count'])
+  })
 
+  it('should extract computed string-literal property keys', () => {
+    const code = `
+      function setup() {
+        return { ["name"]: value, ['count']: value2 }
+      }
+    `
+    const ast = parseCode(code)
+    const func = ast.body[0] as TSESTree.FunctionDeclaration
+    const returnStmt = func.body!.body[0] as TSESTree.ReturnStatement
+    const result = extractReturnProperties(returnStmt)
     expect(result).toEqual(['name', 'count'])
   })
 
@@ -222,4 +237,19 @@ describe('extractReturnProperties', () => {
 
     expect(result).toEqual([])
   })
+
+  it('extractReturnIdentifiers should unwrap TS/JS wrappers to find identifiers', () => {
+    const code = `
+      function setup() {
+        const count = 1
+        const total = 2
+        return { a: (count as number), b: ((total)), c: (count!) }
+      }
+    `
+    const ast = parseCode(code)
+    const func = ast.body[0] as TSESTree.FunctionDeclaration
+    const returnStmt = func.body!.body[2] as TSESTree.ReturnStatement
+    const result = extractReturnIdentifiers(returnStmt)
+    expect(result).toEqual(['count', 'total', 'count'])
+  })
 })