fix: extract declarator names with bracket-depth tracking - #513

test/scan-dirs.test.ts (1)

310-327: Please pin the original options leak too.

This test covers generic angle-bracket leakage, but issue #502 was reported against commas inside arrow-parameter defaults/destructuring. Adding a useResizable-style regression would protect the original failure mode as well.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@test/scan-dirs.test.ts` around lines 310 - 327, Add a second regression case
to the test that pins the original "options" leak by calling scanExports for the
composable that previously failed (the useResizable-style example) and asserting
exports include the expected export (useResizable) but do NOT include the leaked
identifier "options"; reuse the same pattern/variables (scanExports, exports,
names) as in the existing generic test and add
expect(names).toContain('useResizable') and
expect(names).not.toContain('options').

src/node/scan-dirs.ts (2)

14-14: Hoist regex patterns to module scope to avoid re-compilation.

ESLint flags multiple regex literals that are re-created on every function call. Moving them to module scope improves performance, especially when scanning many files.

♻️ Proposed refactor

+const RE_IDENTIFIER = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/
+const RE_EXPORT_DECL = /^export\s+(?:default\s+)?(?:const|let|var)\s+/
+const RE_WHITESPACE = /\s/
+const RE_GENERIC_OPENER_PREV = /[a-zA-Z_$)>=]/
+const RE_TYPE_ANNOTATION = /:.*$/
 
-const RE_IDENTIFIER = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/
-
 function extractDeclaratorNames(code: string): string[] | undefined {
-  const match = code.match(/^export\s+(?:default\s+)?(?:const|let|var)\s+/)
+  const match = code.match(RE_EXPORT_DECL)
   // ...
-      while (k >= 0 && /\s/.test(rest[k])) k--
+      while (k >= 0 && RE_WHITESPACE.test(rest[k])) k--
       // ...
-      if (/[a-zA-Z_$)>=]/.test(prev))
+      if (RE_GENERIC_OPENER_PREV.test(prev))
       // ...
-      const name = current.trim().replace(/:.*$/, '').trim()
+      const name = current.trim().replace(RE_TYPE_ANNOTATION, '').trim()

Also applies to: 30-30, 69-69, 71-71, 86-86, 96-96, 110-110

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/node/scan-dirs.ts` at line 14, Several regex literals used inside
functions are being re-created on every call; hoist them to module scope to
avoid repeated compilation by replacing inline regexes with module-level
constants (e.g., keep RE_IDENTIFIER and add new constants such as RE_EXT_JSX/TS,
RE_IMPORT, RE_EXPORT, RE_COMMENT, RE_REQUIRE, etc.) and update all usages in the
functions (the regex instances referenced around the existing RE_IDENTIFIER and
the ones at the commented positions ~30, ~69, ~71, ~86, ~96, ~110) to use these
constants instead; ensure names are descriptive, declared once at top of
src/node/scan-dirs.ts, and preserve existing flags and patterns exactly.

---

84-115: Partial returns for mixed declarators bypass fallback logic.

The function silently returns incomplete results when destructuring patterns are mixed with simple declarators. For example, export const { a } = obj, b = 1 returns ['b'] instead of falling back to exp.names. This occurs because destructuring patterns (enclosed in {} or []) fail the RE_IDENTIFIER test and are skipped, while the function still returns the remaining valid names as a truthy array. The ?? fallback on line 254 only triggers if the function returns undefined, not if it returns a partial list.

Consider whether this behavior is acceptable (potentially safer than falling back to a polluted exp.names) or if the function should return undefined when any unsupported declarator is encountered to force fallback.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/node/scan-dirs.ts` around lines 84 - 115, The parser currently collects
partial names into the names array even when some declarators are unsupported
(destructuring) causing a partial truthy return; change the logic so that when a
declarator fails RE_IDENTIFIER (i.e. a destructuring pattern is encountered) you
set a flag (e.g. hadUnsupportedDeclarator) during the '=' and ',' handling
branches and in the trailing-name handling, and at the end return undefined if
that flag is true instead of returning the partial names array; ensure this
touches the code paths that use current/inValue/isTopLevel/RE_IDENTIFIER/names
so mixed declarators cause the function to return undefined (allowing the
existing fallback to exp.names) rather than a partial list.

src/node/scan-dirs.ts (1)

93-99: ESLint style violations in bracket depth tracking.

Static analysis flags multiple style issues: line 93 has two statements, and lines 94-99 are missing newlines after if and curly brackets per the project's antfu/if-newline and antfu/curly rules.

✨ Proposed style fixes

-    else if (ch === '>' && angleDepth > 0) { angleDepth-- }
-    else if (ch === '(') parenDepth++
-    else if (ch === ')') parenDepth = Math.max(0, parenDepth - 1)
-    else if (ch === '{') braceDepth++
-    else if (ch === '}') braceDepth = Math.max(0, braceDepth - 1)
-    else if (ch === '[') bracketDepth++
-    else if (ch === ']') bracketDepth = Math.max(0, bracketDepth - 1)
+    else if (ch === '>' && angleDepth > 0) {
+      angleDepth--
+    }
+    else if (ch === '(') {
+      parenDepth++
+    }
+    else if (ch === ')') {
+      parenDepth = Math.max(0, parenDepth - 1)
+    }
+    else if (ch === '{') {
+      braceDepth++
+    }
+    else if (ch === '}') {
+      braceDepth = Math.max(0, braceDepth - 1)
+    }
+    else if (ch === '[') {
+      bracketDepth++
+    }
+    else if (ch === ']') {
+      bracketDepth = Math.max(0, bracketDepth - 1)
+    }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/node/scan-dirs.ts` around lines 93 - 99, Split the combined statements
and apply the project's if-newline and curly rules in the block that updates
angleDepth, parenDepth, braceDepth, and bracketDepth when processing ch: ensure
each conditional uses its own line (no two statements on one line), add a
newline immediately after each if keyword, and wrap single-line branches in
braces so e.g. the handlers for '>', '(', ')', '{', '}', '[', ']' are each
expressed as separate if (...) { ... } blocks and the '>' case decrements
angleDepth on its own line instead of sharing a line with another statement.

src/node/scan-dirs.ts (1)

14-18: Optional: Consider simplifying regex patterns per ESLint hints.

ESLint suggests using \w and the i flag, but note that \w doesn't include $ (valid in JS identifiers), so the current explicit character classes are more precise. These are cosmetic and safe to defer.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/node/scan-dirs.ts` around lines 14 - 18, ESLint hinted you can simplify
identifier regex; replace RE_IDENTIFIER with a pattern that uses \w but still
allows $ and disallows leading digits: change to /^[A-Z_$][\w$]*$/i (this
preserves $ and forbids a digit as the first char while using the i flag to
cover case), and leave RE_EXPORT_DECL, RE_TYPE_ANNOTATION, RE_GENERIC_PREV and
RE_WHITESPACE as-is unless you want further cosmetic changes.