Repository navigation
fix(sync): a barrel whose re-export points elsewhere re-links its importers - #3059
Merged
Merged
Conversation
…orters
`c.ts` imports `foo` through `index.ts`, which re-exports it from `a.ts`.
Change the clause to `./b` and sync, and `bar` kept calling `a.ts:foo`
where a fresh index gives `b.ts:foo`. The barrel declares nothing of
`foo`, so the definition delta has nothing to rebind; no file was added
for the walks below a barrel or the added-files pass; the binding never
failed, so the retries never see it; and the name-matched-import pass
reads only bindings a name match took. `export *` moved the same way, and
a scoped sync of the barrel alone too.
The orchestrator now reports the modified ES modules whose `export … from`
statements changed, read off their import nodes (named by the module, with
the statement as signature) before and after the store. Their importers'
bindings through them go back for the sweep, up through the modules that
pass them on in turn, with the failures parked under them and the edges
into the members of what the bindings pointed at (`w.run()` with
`w: Widget`). It is the importer walk the removed-files pass uses, run
after the name-matched-import pass.
Review changes: the trigger compares the `export … from` statements
themselves. The original compared the modules a file imports and counted a
module that lost any import, so dropping a plain import from excalidraw's
`types.ts` (218 importers, no re-exports) re-opened 2,186 refs for the same
graph; it now re-opens none. Comparing statements also catches a name
dropped from a clause whose module stays (`export { foo, qux } from './a'`
to `export { foo } from './a'`), which the module set missed. Plus tests
for both, and the doc comments the new code sat between moved back.
Validation: 9 tests; on main's source 7 fail (the 2 controls pass), and
on the original trigger the 2 new ones fail. 15 fixture edits, each
compared with a fresh index, in a later process and in the same process:
main diverged in 8 of each, this in none. excalidraw with
`export * from "./utils"` in its math barrel (116 importers) retargeted to
`./constants`: main was 224 edges off, identical here over nodes, edges,
refs and files. Fresh indexes are identical to main's.
Original PR #2985 by @danusha2345.
Fixes #2978
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
codegraph syncand the file watcher now re-link the files importing through a barrel when an edit points one of its re-exports at another module (export { foo } from './a'changed to'./b', anexport *moved the same way), takes one away, or drops a name from one, in JavaScript and TypeScript.Root cause
c.tsimportsfoothroughindex.ts, which re-exports it froma.ts. Change the clause to'./b'and sync:barkept callinga.ts:foo, where a fresh index givesb.ts:foo. The barrel declares nothing offoo, so the definition delta has nothing to rebind; no file is added, so neither the walks below a barrel nor the added-files pass run; the binding never failed, so the failed-reference retries never see it; and the name-matched-import pass reads only bindings a name match took.What came from the contributor, and what we changed
From @danusha2345 (PR #2985), unchanged:
reopenReferencesThroughRetargetedModulesin module-importers.ts, the importer walk the removed-files pass uses, which re-opens each importer's bindings through the changed barrel (and up through barrels passing it on), the failures parked under them, and the edges into the members of what the bindings pointed at (w.run()withw: Widget); the call after the name-matched-import pass; their 7 tests.Our changes on top:
export … fromstatements themselves. The original compared the set of modules a file imports and also counted any module that lost an import, so a plain import edit in a widely imported module re-opened every binding of all its importers: dropping oneimport typeline from excalidraw'spackages/excalidraw/types.ts(218 importers, no re-exports) re-opened 2,186 refs for the same graph. Import nodes carry their statement as the signature in both engines, so the orchestrator now samples each file'sexport …import nodes before and after the store (getReExportStatementsByFiles); that edit now re-opens nothing. Comparing statements also catches a name dropped from a clause whose module stays (export { foo, qux } from './a'toexport { foo } from './a'), which diverged on main and with the original trigger. The import-then-export forms (import { foo } from './a'; export { foo }, renamed, namespace, a forwarded default) already converge on main.SyncResult,getNodeNamePairsByFiles) moved back onto their declarations.Validation
__tests__/sync-barrel-retarget.test.ts. On main's source 7 fail (the body-only and plain-import controls pass); on the contributor's original trigger the 2 new ones fail; all 9 pass here.codegraph sync) and in the same process (oneCodeGraphhandle, as the watcher and MCP server): main 80f6b50 diverges in 8 of 15 in each mode, this branch in none. The edits: named,export *,export * as liband renamed re-exports retargeted; a scoped sync of the barrel alone; a re-export taken away; a second barrel passing the first on; a value typed by the binding (new Widget(); w.run()); a name dropped from a clause; four import-then-export forms; a plain import dropped; a body-only control.export * from "./utils"inpackages/math/src/index.ts(116 importers through@excalidraw/math) retargeted to./constants: main's sync is 224 edges off a fresh index (126 stale, 98 missing); here identical over nodes, edges, refs and files, with 3,216 refs re-opened (222 ms for the pass). Fresh indexes are identical to main's (sync-only change).export …import nodes before and after the store; the walk runs only for a module whose re-export statements changed.CODEGRAPH_KERNEL_EXPECT=1,CODEGRAPH_NO_DAEMONunset, 4 workers, on main 80f6b50): 803 files passed, 6 skipped; 9,576 tests passed, 86 skipped, 0 failed.Fixes #2978
Lands #2985 by @danusha2345.
🤖 Generated with Claude Code