Skip to content

fix: resolve call edges through renamed import specifiers#1826

Merged
carlos-alm merged 9 commits into
mainfrom
fix/issue-1730-exports-renamed-import-consumers
Jul 6, 2026
Merged

fix: resolve call edges through renamed import specifiers#1826
carlos-alm merged 9 commits into
mainfrom
fix/issue-1730-exports-renamed-import-consumers

Conversation

@carlos-alm

Copy link
Copy Markdown
Contributor

Summary

  • import { X as Y } extraction in both engines preferred the tree-sitter name field over alias for import_specifier nodes. name is always present (the source-declared name); alias only exists for renames and holds the local binding actually used at call sites. This meant renamed imports recorded the original name instead of the local alias, so calls like collectFilesUtil(...) never matched any known imported name and were dropped unresolved.
  • Fixing extraction alone wasn't enough — the resolver also needed a local-alias → original-name map to look up the correct symbol in the target file. Added Import.renamedImports and threaded it through call resolution, points-to alias resolution, the Object.defineProperty post-pass, barrel/type-only edge emission, and cross-file return-type propagation, in both the full-build and incremental paths.

Closes #1730

Test plan

  • npm test — full suite green (3398 passed, 0 failed)
  • npm run lint — clean
  • cargo test --lib — 427 passed
  • Native addon rebuilt, codesigned, verified directly
  • Repro confirmed: codegraph exports src/domain/graph/builder/helpers.ts -T --json now credits collectFiles with consumerCount: 2, identical on native and WASM

Filed #1823 (barrel re-export rename export { X as Y } from ...), #1824 (dynamic import() destructuring rename), #1825 (renamed import used as a call receiver Y.method()) — same bug class, different resolution code paths, out of scope for this fix.

Stacked on #1822 (base branch fix/issue-1729-ast-string-type-annotation) — only the resolver/extractor/test diff is this issue's change.

BATCH_COMMANDS entries with sig: 'dbOnly' (currently only complexity)
always wrote their target into opts.target. complexityData treats
opts.target as a symbol-name filter and opts.file as the file-path
filter, so batch complexity <file> never matched anything and the
function list silently fell back to empty with a whole-repo summary
regardless of which file was requested.

Add an optional targetKey on BatchCommandEntry so each dbOnly command
can declare which opts key its targets map to, and set it to 'file'
for complexity. batchData and multiBatchData now route the target
through the declared key instead of assuming opts.target.

Fixes #1721

Impact: 4 functions changed, 6 affected
…ssification

codegraph roles --role dead flagged every function parameter as dead-leaf and
every interface/type member as dead-unresolved, regardless of actual usage.

Root cause: the role classifier's fan-in-based "no callers = dead" heuristic
is meaningless for these two symbol categories, since neither can ever have
inbound call edges by construction:

- Parameters: `kind = 'parameter'` nodes were unconditionally force-assigned
  dead-leaf via a fast-path bypass in classifyNodeRolesFull/Incremental (TS)
  and do_classify_full/do_classify_incremental (native), before any fan-in
  was even computed. A parameter's liveness is a local dataflow question (is
  it referenced within its own function body), not a call-graph reachability
  question, so this produced ~90% noise in --role dead output.

- Interface/type members: every language extractor qualifies interface/type
  members as `Owner.member` top-level definitions (mirroring class method
  qualification), and they never receive inbound call edges (they're
  consumed via type annotations, not calls). Lacking any recognition of
  this, they fell through the normal fan-in/fan-out path and landed in
  dead-unresolved.

Fix:
- Parameters are now fully excluded from role classification (role stays
  NULL), the same treatment already given to file/directory nodes.
- Interface/type members are now recognized in the classifier by resolving
  the Owner.member prefix against same-file TYPE_DEF_KINDS declarations
  (interface/type/struct/enum/trait/record) and classified `leaf`
  unconditionally. Class methods use the identical Owner.member naming
  convention but are unaffected since `class` is not in TYPE_DEF_KINDS, so
  real dead methods/functions remain detected.

Applied to both the TS/WASM classifier (graph/classifiers/roles.ts,
features/structure.ts) and the native Rust classifier
(graph/classifiers/roles.rs) per the dual-engine parity requirement; verified
both engines produce identical results end-to-end against this repo's own
graph.

Fixes #1723

Impact: 6 functions changed, 5 affected
codegraph exports <file> --json (and the --unused dead-export filter it
feeds) reported zero consumers for interfaces/types that are demonstrably
imported and used elsewhere via `import type { X }`, even though
`codegraph deps <file>` correctly showed the importing file in
`importedBy`. Example: ChaContext in src/domain/graph/builder/cha.ts is
imported (type-only) by build-edges.ts and native-orchestrator.ts, but
`codegraph exports` showed consumerCount: 0.

Root cause: exportsFileImpl's per-symbol consumers query
(domain/analysis/exports.ts) only looked at kind = 'calls' edges. The
builder already emits a symbol-level `imports-type` edge for `import
type { X }` statements (source = importing file node, target = the
specific imported symbol -- see emitTypeOnlySymbolEdges in
build-edges.ts/incremental.ts), which `codegraph deps` reads from, but
the exports consumer query never looked at this edge kind. Role
classification (features/structure.ts) already includes 'imports-type'
in its fan-in formula, so `codegraph roles --role dead` was unaffected --
this was purely a gap in exports's independent consumer list.

Fix: widen the consumers query to `kind IN ('calls', 'imports-type')`,
matching the edge-kind set already used everywhere else in the codebase
for cross-file usage credit (structure.ts, graph-enrichment.ts,
boundaries.ts, dependencies.ts). No native Rust changes needed --
domain/analysis/exports.ts is pure query-layer code that reads the
already-built edges table and has no engine-specific mirror.

Deliberately does NOT add `extends`/`implements`: investigation found
those edges are resolved by symbol name only, with no file/import
scoping (buildClassHierarchyEdges in both build-edges.ts/incremental.ts
and the native emit_hierarchy_edges), so they link same-named
declarations across unrelated files (verified: this repo's own graph has
false `implements`/`extends` edges between unrelated fixture classes
across languages and a `Repository` interface in src/types.ts). Filed
as #1812. Also filed #1813 for a related but distinct gap: `import {
type X }` inline per-specifier modifiers aren't tracked as type-only in
either engine's extractor, so such X still gets no credit even after
this fix.

Added tests/integration/exports.test.ts coverage: an interface consumed
only via a symbol-level `imports-type` edge gets consumerCount >= 1 and
is excluded from --unused, while a genuinely unreferenced interface
still shows 0 consumers.

Verified against this repo's own graph: `codegraph exports
src/domain/graph/builder/cha.ts -T --json` now credits ChaContext with
2 consumers (build-edges.ts, native-orchestrator.ts). Full test suite
(201 files, 3359 tests) and lint pass clean.

docs check acknowledged: internal bug fix to exports consumer
computation, no new feature/language/CLI surface/architecture change --
README.md, CLAUDE.md, and ROADMAP.md are unaffected.

Fixes #1724

Impact: 1 functions changed, 3 affected
The CLI's `-f/--file` option is a repeatable Commander accumulator
(collectFile) that always produces a string[], even on first use. The
native composite bindings backing fn-impact (findNodesWithFanIn) and
query (fnDeps) forwarded that array straight into napi-rs functions
whose Rust signatures only accepted a single String, so any use of
-f/--file crashed with "Failed to convert JavaScript value ... into
rust type `String`" regardless of engine defaults. context worked
only because its code path never touches the native repository for
symbol lookup.

Widen the native Rust signatures (find_nodes_with_fan_in, fn_deps) to
accept Vec<String> and build an OR-of-LIKE clause for multiple files,
mirroring buildFileConditionSQL/NodeQuery.fileFilter on the JS side.
Normalize the file option before calling into the native binding on
the TS side, and thread the widened string | string[] type through
QueryOpts, fnDeps's opts, and the call chain down to
findMatchingNodes. This also makes repeated -f/--file genuinely
multi-file end to end for fn-impact/query, matching context's
existing behavior, instead of crashing on any use.

findNodesByScope shares QueryOpts but has no CLI caller and its
native binding still only accepts one file; it now takes the first
value defensively rather than crash or fail to type-check.

Fixes #1726

docs check acknowledged: pure bug fix, no new CLI options/languages/
architecture — the -f/--file "repeatable" docs are now accurate
rather than needing correction.

Impact: 14 functions changed, 34 affected
… exports

Two compounding root causes made `where --file`'s `exported` array (and
`codegraph exports`) unreliable for entire classes of exports:

1. The JS/TS export-statement handler (WASM query path, WASM walk path, and
   the mirrored native Rust extractor) only recognized `export function`,
   `export class`, `export interface`, and `export type` declarations. It
   never matched `lexical_declaration`/`variable_declaration`, so
   `export const/let/var …` was never added to the extractor's export list —
   regardless of the initializer's shape — leaving the `exported=1` DB column
   permanently unset for every exported constant in the codebase (including
   ones that happened to look "correct", like a `new Set(...)`-initialized
   constant referenced as a call argument elsewhere).

2. `where --file`'s `exported` list ignored the `exported` DB column entirely
   and computed membership from `findCrossFileCallTargets` (symbols targeted
   by a cross-file `calls` edge) — a heuristic that only "worked" by
   coincidence for symbols that happened to be passed as call arguments
   elsewhere. `codegraph exports` already had the right idea (prefer the
   `exported` column, fall back to the heuristic only for pre-migration DBs)
   but duplicated that logic locally instead of sharing it.

Fixes:
- src/extractors/javascript.ts: extract the function/class/interface/type
  kind map plus a new lexical/variable-declaration branch into a shared
  `collectExportedDeclarations`, used by both `handleExportCapture` (query
  path) and `handleExportStmt` (walk path) so they can't drift apart again.
  Declarator values are classified with the same predicate already used to
  build the matching Definition (function-valued -> kind 'function',
  literal/array/object/new-expression-valued `const` -> kind 'constant').
- crates/codegraph-core/src/extractors/javascript.rs: mirror the same fix in
  `handle_export_declaration` via a new `collect_exported_var_declarations`.
- src/db/repository/nodes.ts: add `findExportedNodesByFile`, the single
  shared implementation of "prefer exported=1, fall back to cross-file calls
  for pre-migration DBs" — re-exported through db/repository/index.ts and
  db/index.ts.
- src/domain/analysis/exports.ts: use the shared helper instead of a locally
  duplicated hasExportedCol/exportedNodesStmt implementation.
- src/domain/analysis/symbol-lookup.ts: `whereFileImpl` now uses the shared
  helper instead of `findCrossFileCallTargets` directly, so `where --file`
  and `exports` agree on what "exported" means.

Tests:
- tests/parsers/javascript.test.ts: unit coverage for bare-literal, new
  Set(...), object-literal-with-methods, and arrow-function exported consts,
  plus a non-exported-const negative case and a function/class regression
  guard for the shared-helper refactor.
- tests/engines/query-walk-parity.test.ts, tests/engines/parity.test.ts:
  cross-path/cross-engine regression cases for the same shapes.
- tests/integration/queries.test.ts: new fixture node with exported=1 but
  zero incoming edges of any kind, proving `where --file`'s exported list
  no longer depends on cross-file call presence.

No user-facing command/language/architecture changes, so README/CLAUDE.md/
ROADMAP.md are unaffected — docs check acknowledged.

Fixes #1728

Impact: 8 functions changed, 17 affected
tree-sitter-typescript's predefined_type production (string, number,
boolean, ... primitive type keywords) lexes its keyword as an anonymous
grammar token whose type string is identical to the named `string` node
type used for real string literals. Both engines matched by node type
alone, so `codegraph ast --kind string` spuriously matched bare `string`
type annotations (interface fields, parameter types, return types) as if
they were string literals.

Add an isNamed/is_named() guard scoped to the JS/TS/TSX family on both
engines: WASM via astRequiresNamedNode() in ast-analysis/rules/index.ts
feeding the shared resolveAstKind() in ast-store-visitor.ts, native via a
match guard in javascript.rs's walk_ast_nodes_depth. Genuine string,
template, and string-literal-type nodes are always named and unaffected.

No user-facing command/language/architecture changes, so README/CLAUDE.md/
ROADMAP.md are unaffected — docs check acknowledged.

Fixes #1729

Impact: 8 functions changed, 13 affected
codegraph exports <file> reported zero consumers for an exported
function/symbol that is genuinely imported and used elsewhere, whenever
the importing file renamed the binding at the import site
(import { X as Y } from '...'). Example: collectFiles in
src/domain/graph/builder/helpers.ts is imported (as collectFilesUtil)
and called by collect-files.ts and native-orchestrator.ts, but
`codegraph exports helpers.ts -T --json` showed consumerCount: 0.

Root cause (extractor, both engines): extractImportNames (javascript.ts)
and its mirrored scan_import_names_depth (javascript.rs) handled
import_specifier nodes with `node.childForFieldName('name') ||
childForFieldName('alias')`. Per the tree-sitter grammar, `name` is
*always* present on import_specifier (the name as declared by the source
module); `alias` only exists for `X as Y` and holds the *local* binding
actually referenced by call sites. Preferring `name` unconditionally
meant the local alias was silently dropped for every renamed import —
`imp.names` recorded "collectFiles" instead of "collectFilesUtil", so
`importedNames` (keyed by call-site text) never had a matching entry and
the call fell through unresolved.

Fixing only the extractor was not sufficient: once `imp.names` correctly
holds the local alias, `resolveCallTargets` (call-resolver.ts) /
resolve_call_targets (build_edges.rs) still searched the *target file*
for a symbol literally named "collectFilesUtil" — which doesn't exist
there (only "collectFiles" does). This required threading a second
piece of information end-to-end: for each renamed specifier, the local
alias's *original* exported name, so target-file/barrel lookups search
by the right name while importedNames stays keyed by the call-site text.

Changes (both engines, full-build + incremental/native-orchestrator +
native-hybrid paths):
- types.ts / types.rs: new `Import.renamedImports` /
  `Import.renamed_imports` field — { local, imported } pairs, populated
  only for specifiers that actually rename a binding.
- extractors/javascript.ts, .rs: extractImportNames /
  extract_import_names_with_renames now prefer `alias` (local binding)
  for import_specifier and record the rename pair. export_specifier is
  deliberately left unchanged (see scope notes below). Fixed in both the
  walk path (handleImportStmt) and the query/WASM-worker path
  (handleImportCapture) on the TS side.
- build-edges.ts, build_edges.rs, import_edges.rs, pipeline.rs,
  call-resolver.ts, incremental.ts: buildImportedNamesMap /
  collect_imported_names_for_file now also produce a local-alias ->
  original-name map; resolveCallTargets / resolve_call_targets consult
  it to search the target file by the original name. Applied
  consistently to the primary call-resolution path, the
  Object.defineProperty post-pass, points-to alias resolution, barrel
  edge / import-type edge emission, and cross-file return-type
  propagation — every place that previously assumed a call site's local
  name equals the target file's declared name.

Native Rust: touched and verified. Rebuilt locally via
`npx napi build --platform --release` (crates/codegraph-core), codesigned
(`codesign --sign - --force`), and installed over the loaded
node_modules/@optave/codegraph-darwin-arm64/codegraph-core.node so the
fix was exercised by the actual native engine, not the prebuilt npm
binary. `cargo test --lib`: 427 passed.

Tests added:
- tests/parsers/javascript.test.ts: extractor-level coverage for the
  local-name/rename-pair extraction, a mixed renamed+non-renamed
  specifier list, and confirmation export_specifier is unaffected.
- crates/codegraph-core/src/extractors/javascript.rs: matching Rust unit
  tests.
- tests/integration/issue-1730-renamed-import-consumer.test.ts: new
  end-to-end test building real files through buildGraph() on both wasm
  and native engines, asserting the calls edge exists, no edge is
  created against a nonexistent "collectFilesUtil" symbol, and
  `codegraph exports` credits the consumer — on both engines.
  tests/integration/exports.test.ts was not extended: that file
  hand-inserts DB rows and only exercises the query layer, which is
  unaffected by this bug (the missing piece was edge creation, not the
  consumer query added for #1724).

Verified against this repo's own graph (native engine, rebuilt):
`codegraph exports src/domain/graph/builder/helpers.ts -T --json` now
credits collectFiles with 2 consumers (collect-files.ts,
native-orchestrator.ts); WASM engine agrees exactly. Without -T, also
picks up tests/unit/builder.test.ts via the (unrenamed) builder.ts
barrel re-export, which already worked pre-fix and was only hidden by
-T in the original repro.

Scope notes — filed as separate issues rather than expanding this fix:
- #1823: export { X as Y } from '...' (barrel re-export with rename) is
  not tracked — resolveBarrelExport/resolve_barrel_export key off the
  original name, and export_specifier extraction was deliberately left
  unchanged here since barrel/reexport tracing is a distinct mechanism.
- #1824: dynamic import destructuring rename
  (const { a: b } = await import(...)) has the same class of bug in
  extractDynamicImportNames, a different extraction function.
- #1825: a renamed import used as a call receiver
  (import { X as Y }; Y.method()) still fails to resolve — confirmed
  empirically (no calls edge created) — a different resolution strategy
  (resolveByReceiver/resolveViaDirectQualifiedMethod in
  resolver/strategy.ts) than the one this fix addresses.

Full test suite (202 files, 3398 tests) and lint pass clean.

docs check acknowledged: internal resolver/extractor bug fix, no new
feature/language/CLI surface/architecture change -- README.md,
CLAUDE.md, and ROADMAP.md are unaffected.

Fixes #1730

Impact: 29 functions changed, 47 affected
@greptile-apps

greptile-apps Bot commented Jul 5, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR fixes a long-standing bug where import { X as Y } caused call edges to go unresolved: the extractor was recording the source-declared name (X) in imp.names instead of the local alias (Y), so no call site using Y ever matched an entry in importedNames. The fix threads a new renamedImports / importedOriginalNames map through both the TypeScript (WASM) and Rust (native) pipelines.

  • Extractor fix: extractImportNames / scan_import_names_depth now prefer the alias field for import_specifier nodes and populate a side-channel renamedImports array for renamed bindings.
  • Resolver fix: resolveCallTargets and its callers now consult importedOriginalNames to look up the original symbol name in the target file while still keying importedNames by the local alias that appears at call sites.
  • Shared utility: importNamePairs extracted to import-utils.ts, shared by the full-build and incremental pipelines to eliminate drift between them (addressing a previous review comment).

Confidence Score: 5/5

Safe to merge — the fix is correctly scoped, both engines updated in lock-step, and all changed code paths have new unit and integration test coverage.

The change is a targeted, well-understood bug fix: two symmetric data-flow additions (extractor side-channel + resolver lookup map) applied consistently across the full-build, incremental, and Rust native pipelines. The importNamePairs consolidation removes drift risk between the two TS paths. All new code paths are covered by unit tests and an end-to-end regression test on both engines.

No files require special attention — the three related gaps (#1823, #1824, #1825) are tracked separately and out of scope here.

Important Files Changed

Filename Overview
src/extractors/javascript.ts Root fix: extractImportNames now prefers the alias field (local binding Y) over name (exported symbol X) for import_specifier nodes, and collects {local, imported} pairs into renamedImports. export_specifier intentionally left unchanged.
crates/codegraph-core/src/extractors/javascript.rs Rust mirror of the extractor fix: scan_import_names_depth now handles import_specifier and export_specifier in separate branches, records local alias + rename pairs; extract_import_names_with_renames new entrypoint used by handle_import_stmt.
src/domain/graph/builder/import-utils.ts New shared helper importNamePairs consolidates the * as stripping + rename-pair lookup, eliminating the previously duplicated logic between build-edges.ts and incremental.ts.
src/domain/graph/builder/call-resolver.ts Added optional importedOriginalNames parameter; resolveCallTargets now derives targetName from the original map before querying byNameAndFile, while preserving local-name fallback for same-file lookups.
src/domain/graph/builder/stages/build-edges.ts buildImportedNamesMap now returns both importedNames and importedOriginalNames; importNamePairs replaces inline * as stripping across barrel/type-only/define-property passes; importedOriginalNames threaded into buildFileCallEdges and PTS helpers.

Reviews (4): Last reviewed commit: "Merge origin/main into fix/issue-1730-ex..." | Re-trigger Greptile

@github-actions

github-actions Bot commented Jul 5, 2026

Copy link
Copy Markdown
Contributor

Codegraph Impact Analysis

28 functions changed47 callers affected across 5 files

  • resolveCallTargets in src/domain/graph/builder/call-resolver.ts:213 (13 transitive callers)
  • importNamePairs in src/domain/graph/builder/import-utils.ts:15 (22 transitive callers)
  • rebuildReverseDepEdges in src/domain/graph/builder/incremental.ts:190 (3 transitive callers)
  • resolveBarrelImportEdges in src/domain/graph/builder/incremental.ts:326 (7 transitive callers)
  • emitTypeOnlySymbolEdges in src/domain/graph/builder/incremental.ts:352 (4 transitive callers)
  • buildImportedNamesMap in src/domain/graph/builder/incremental.ts:437 (5 transitive callers)
  • buildCallEdges in src/domain/graph/builder/incremental.ts:708 (5 transitive callers)
  • rebuildEdgesForTargetFile in src/domain/graph/builder/incremental.ts:788 (3 transitive callers)
  • NativeFileEntry.importedNames in src/domain/graph/builder/stages/build-edges.ts:92 (0 transitive callers)
  • emitTypeOnlySymbolEdges in src/domain/graph/builder/stages/build-edges.ts:156 (3 transitive callers)
  • buildBarrelEdges in src/domain/graph/builder/stages/build-edges.ts:226 (3 transitive callers)
  • propagateReturnTypesAcrossFiles in src/domain/graph/builder/stages/build-edges.ts:447 (3 transitive callers)
  • buildDefinePropertyPostPass in src/domain/graph/builder/stages/build-edges.ts:626 (3 transitive callers)
  • buildImportedNamesForNative in src/domain/graph/builder/stages/build-edges.ts:801 (3 transitive callers)
  • addImports in src/domain/graph/builder/stages/build-edges.ts:811 (3 transitive callers)
  • buildCallEdgesJS in src/domain/graph/builder/stages/build-edges.ts:841 (3 transitive callers)
  • buildImportedNamesMap in src/domain/graph/builder/stages/build-edges.ts:931 (7 transitive callers)
  • traceBarrel in src/domain/graph/builder/stages/build-edges.ts:942 (7 transitive callers)
  • addImportNames in src/domain/graph/builder/stages/build-edges.ts:947 (6 transitive callers)
  • resolveFallbackTargets in src/domain/graph/builder/stages/build-edges.ts:1257 (3 transitive callers)

….ts (#1826)

docs check acknowledged — internal dedup of an existing helper, no new
functionality, public API, or architecture change.

Impact: 1 functions changed, 22 affected
@carlos-alm

Copy link
Copy Markdown
Contributor Author

Addressed the duplication concern from the review summary — extracted importNamePairs into a new shared src/domain/graph/builder/import-utils.ts, imported by both stages/build-edges.ts and incremental.ts (the Rust mirror doesn't need this since import_edges.rs has no separate incremental copy).

@carlos-alm

Copy link
Copy Markdown
Contributor Author

@greptileai

carlos-alm added a commit that referenced this pull request Jul 6, 2026
…fix/issue-1731-stale-edges-hash-match

Resolves an import-only conflict in incremental.ts: #1826 extracted
importNamePairs into a new shared import-utils.ts (removing the local
copy this branch's import list didn't yet have), while this branch adds
fileHash/fileStat imports for the new upsertFileHash/deleteFileHash
stmts. Both additions kept side by side.

docs check acknowledged — conflict resolution only, no new functionality.

Impact: 1 functions changed, 22 affected
Base automatically changed from fix/issue-1729-ast-string-type-annotation to main July 6, 2026 02:29
Resolves conflicts from stacked-branch divergence: main now has #1822's
scoped requireNamedNode guard fix (ast-store-visitor.ts + its two
matching test assertions), #1816's findNodesByScope warn()/TODO(#1815)
and fn-impact --file test, and #1820's findExportedNodesByFile(db, file,
knownSymbols) signature plus its two call-site updates — all merged
after this branch forked.

docs check acknowledged — conflict resolution only, no new functionality.

Impact: 6 functions changed, 16 affected
@carlos-alm carlos-alm merged commit 81ed1bb into main Jul 6, 2026
29 checks passed
@carlos-alm carlos-alm deleted the fix/issue-1730-exports-renamed-import-consumers branch July 6, 2026 02:56
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 6, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

codegraph exports does not credit consumers that import via a rename (import { X as Y })

1 participant