refactor(scanner): migrate tweak_ast_for_scanning to AstFactory#9683
Conversation
329255f to
cf07075
Compare
11303f5 to
ab05a7b
Compare
6dccec2 to
d019415
Compare
How to use the Graphite Merge QueueAdd the label graphite: merge-when-ready to this PR to add it to the merge queue. You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
) Introduces `AstFactory<'a>(AstBuilder<'a>)` — a rolldown-owned newtype over oxc's `AstBuilder` that `Deref`s to it, with rolldown-specific constructions added as inherent `make_*` methods. Each `make_*` takes `&self` and reaches the builder through `Deref`, so call sites don't depend on `AstFactory: Copy` and stay stable when oxc#23043 makes `AstBuilder` non-`Copy`. This is the AST-construction baseline; consumers migrate off `AstSnippet` area-by-area, and `AstSnippet` is deleted once empty. Design doc: `meta/design/ast-construction.md` (#9673), refined here to lock the conventions below. Migrates the first two areas to `AstFactory` (handle named `ast_factory`): - **vite-web-worker-post** — `.builder` reach-throughs → deref'd calls; `id_ref_expr`/`id_name` inlined to their oxc equivalents; `var_decl_stmt` → `make_var_decl`. - **generate_lazy_export** — same pattern; `module_exports_expr_stmt` / `export_default_expr_stmt` / `statement_module_declaration_export_named_declaration` → `make_module_exports_stmt` / `make_export_default_stmt` / `make_export_named_stmt` (the last avoids shadowing oxc's builder method); the reused paren-unwrap loop is extracted into a `take_without_parentheses` helper. **Locked conventions** (applied here, followed by every later step; recorded in the design doc's Plan section): handle named `ast_factory`; `make_*` take `&self`; reused non-trivial snippets become named helpers. The now-unused `AstSnippet` helpers are left in place — they're removed wholesale when `AstSnippet` is deleted at the end of the migration. Behavior-preserving. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + migrate `vite_web_worker_post` + `generate_lazy_export` — **#9682 ← this PR** - [x] Migrate `tweak_ast_for_scanning` — #9683 - [ ] `vite_build_import_analysis` (~45 sites) - [ ] hmr finalizer + `hmr_stage` (incl. the `utils.rs` `Deref` blocker) - [ ] `module_finalizers` (~211 sites) - [ ] fold construction ext traits; delete `AstSnippet` Verified: `cargo clippy --deny warnings` + `cargo fmt --check` clean; adversarial sub-agent reviews (behavior-equivalence, Rust soundness, convention/completeness) found no real issues. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
9d99544 to
d909781
Compare
d019415 to
5312913
Compare
5312913 to
aaa09a4
Compare
✅ Deploy Preview for rolldown-rs canceled.
|
aaa09a4 to
055ce7e
Compare
There was a problem hiding this comment.
Pull request overview
This PR mechanically migrates tweak_ast_for_scanning’s AST-construction usage from the legacy AstSnippet facade to the newer AstFactory wrapper, aligning the pre-scan PreProcessor with the ongoing AstFactory migration plan described in meta/design/ast-construction.md.
Changes:
- Replace
AstSnippetwithAstFactoryinPreProcessorstate and initialization. - Update AST builder call sites from
.snippet.builder.*reach-throughs to direct deref’dAstFactorycalls. - Replace
.alloc()allocator accesses withast_factory.allocatorto supporttake_in(...)moves.
Merge activity
|
Merging this PR will not alter performance
Comparing Footnotes
|
Migrates the `PreProcessor` scanner pre-pass off `AstSnippet` to `AstFactory` (handle `ast_factory`): `.builder.*` reach-throughs → deref'd calls, `.alloc()` → `.allocator`. Pure mechanical migration — no new `make_*`. Behavior-preserving; clippy/fmt clean + adversarial reviews. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — **#9683 ← this PR** - [x] `vite_build_import_analysis` — #9693 - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — #9695 - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — #9700 - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — #9701 - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — #9702 🤖 Generated with [Claude Code](https://claude.com/claude-code)
055ce7e to
3a5fa19
Compare
…9693) Migrates `vite_build_import_analysis` off `AstSnippet` onto `AstFactory`. Adds `AstFactory::make_arrow_returning` **and the identifier shortcuts `make_id` / `make_id_ref_expr` / `make_id_name`** (high-frequency one-liners that read poorly when inlined — per review feedback); migrates `BindingPatternExt::into_expression` to `&AstFactory` (its only external caller is here; `into_assignment_target` deferred). Remaining thin wrappers inlined. Behavior-preserving; 2 adversarial + 1 CodeX review, all clean. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — #9683 - [x] `vite_build_import_analysis` — **#9693 ← this PR** - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — #9695 - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — #9700 - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — #9701 - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — #9702 🤖 Generated with [Claude Code](https://claude.com/claude-code)
Migrates the HMR finalizer area (`crates/rolldown/src/hmr/`) off the legacy `AstSnippet` facade onto the `AstFactory` newtype. Behavior-preserving. - **Consolidates 3 redundant construction fields** on `HmrAstFinalizer` (`alloc: &Allocator`, `snippet: AstSnippet`, `builder: &AstBuilder`) into a single `ast_factory: AstFactory`. The 3 construction sites in `hmr_stage.rs` build `AstFactory::new(allocator)`. - **`HmrAstBuilder::builder()`** (shared trait, also impl'd for the not-yet-migrated `ScopeHoistingFinalizer`) now returns `AstBuilder` **by value** (it is `Copy`) instead of `&AstBuilder` — the one non-mechanical fix the design doc flagged. `HmrAstFinalizer` returns `*self.ast_factory`; `ScopeHoistingFinalizer` returns `self.snippet.builder` and keeps compiling unchanged. - **Shared `make_*` additions on `AstFactory`** (incl. `make_member_access` -> `MemberExpression`, which `make_member_access_expr` delegates to) (faithful ports of `AstSnippet` patterns, reused later by `module_finalizers`): `make_member_access_expr`, `make_call_with_arg`, `make_promise_resolve_then`, `make_lazy_export_property` (renamed from `object_property_kind_object_property` to avoid shadowing the oxc builder method reached via `Deref`), `make_import_star_stmt`, `make_to_esm_call_with_interop`, `make_seq_in_parens`. - Thin wrappers inlined (`id`/`id_ref_expr`/`id_name`/`atom`/`string_literal_expr`/`call_expr_expr`/…); `var_decl_stmt` → existing `make_var_decl`; `.builder.*` → deref'd `ast_factory.*`; `.alloc()` → `.allocator`. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — #9683 - [x] `vite_build_import_analysis` — #9693 - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — **#9695 ← this PR** - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — #9700 - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — #9701 - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — #9702 🤖 Generated with [Claude Code](https://claude.com/claude-code)
…9700) Migrates all 179 `self.snippet.*` call sites in `module_finalizers/mod.rs` onto the `AstFactory` handle, **adding the 12 `make_*` methods (+2 private helpers) this file consumes** in the same PR (behavior-identical ports of the corresponding `AstSnippet` patterns): `make_to_esm_wrapper`, `make_keep_name_call`, `make_static_block_keep_name`, `make_re_export_call`, `make_member_expr_or_ident_ref`, `make_member_expr_with_void_zero_object`, `make_callee_then_call`, `make_then_extract_property`, `make_then_call_esm_wrapper_with_namespace`, `make_then_call_cjs_wrapper_with_to_esm`, plus `arrow_function_extract_property` / `then_with_arrow_callback`. Thin wrappers are inlined to deref'd oxc constructor calls, `.builder.*` reach-throughs become deref'd `ast_factory.*`, and `AstBuilder::new(self.alloc)` / `self.builder()` become `*self.ast_factory`. The one-use `object_freeze_dynamic_import_polyfill` is inlined at its call site. Adds a **transitional** `ast_factory` field alongside `snippet` on `ScopeHoistingFinalizer` — the sibling impl files (`impl_visit_mut.rs` / `rename.rs` / `hmr.rs`) still read `snippet` and migrate in #9701, which removes the field. Behavior-preserving: two independent full-fixture snapshot differential runs against the parent commit (byte-identical emitted JS, identical pass/fail sets) + 2 adversarial reviews + 1 CodeX review + Copilot, all clean. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — #9683 - [x] `vite_build_import_analysis` — #9693 - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — #9695 - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — **#9700 ← this PR** - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — #9701 - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — #9702 🤖 Generated with [Claude Code](https://claude.com/claude-code)
…ctory (#9701) Finishes the `ScopeHoistingFinalizer` migration: the remaining `impl_visit_mut.rs` (16 sites) / `rename.rs` (6) / `hmr.rs` (3) call sites move off `AstSnippet`, **adding the `make_commonjs_wrapper_stmt` / `make_esm_wrapper_stmt` ports alongside their first callers**. The transitional `snippet` field from #9700 is removed (struct + construction + imports), and the `HmrAstBuilder::builder()` impl for `ScopeHoistingFinalizer` now returns `*self.ast_factory`. `literal_prop_access_member_expr` (the `MemberExpression`-returning variant) and other thin wrappers are inlined. Behavior-preserving: full-fixture snapshot suite byte-identical + 2 adversarial reviews + 1 CodeX review + Copilot, all clean. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — #9683 - [x] `vite_build_import_analysis` — #9693 - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — #9695 - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — #9700 - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — **#9701 ← this PR** - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — #9702 🤖 Generated with [Claude Code](https://claude.com/claude-code)
…ory and delete AstSnippet (#9702) Final step of the migration. `BindingPatternExt::into_assignment_target` / `BindingPropertyExt::into_assignment_target_property` now take `&AstFactory` (matching the `into_expression` precedent from #9693) instead of constructing `AstBuilder::new(alloc)` / `AstSnippet::new(alloc)` internally; the sole external caller (`module_finalizers/mod.rs`) passes `&self.ast_factory`. With zero users left, `AstSnippet` is deleted — `ast_snippet.rs` (1030 lines) and the `lib.rs` export — and the temporary `## Plan` section in `meta/design/ast-construction.md` is removed per its own instruction (`## Current state` retitled `## Prior state` to match the new reality; one stale method-name doc comment fixed). Behavior-preserving: full-fixture snapshot suite byte-identical (incl. the `wrapped_esm` fixture, which exercises every branch of the rewritten destructuring-assignment conversion) + 2 adversarial reviews + 1 CodeX review, all clean. ### AstFactory migration progress (`meta/design/ast-construction.md`) - [x] Design doc + conventions — #9673 (merged) - [x] Introduce `AstFactory` + `vite_web_worker_post` + `generate_lazy_export` — #9682 (merged) - [x] `tweak_ast_for_scanning` — #9683 - [x] `vite_build_import_analysis` — #9693 - [x] hmr finalizer + `hmr_stage` (+ 6 shared `make_*`, `builder()` by-value) — #9695 - [x] `module_finalizers/mod.rs` (+ the `make_*` ports it consumes; transitional dual field) — #9700 - [x] rest of `ScopeHoistingFinalizer` (+ wrapper `make_*` ports; `snippet` field removed) — #9701 - [x] fold construction ext traits onto `AstFactory`; delete `AstSnippet` — **#9702 ← this PR** 🤖 Generated with [Claude Code](https://claude.com/claude-code)
## [1.1.1] - 2026-06-11 ### 🚀 Features - ecmascript_utils: introduce AstFactory for AST construction (#9682) by @hyf0 - drop no-op init calls for empty wrapped-ESM modules (#9678) by @IWANABETHATGUY ### 🐛 Bug Fixes - resolver: honor package.json#type for .jsx/.tsx extensions (#9690) (#9699) by @IWANABETHATGUY - hmr: report the full-reload reason for the invalidate-loop case (#9708) by @hyf0 - explicit `moduleSideEffects` from a hook must take priority over the `package.json#sideEffects` (#9688) by @sapphi-red - keep the `rolldown-runtime` name for the standalone runtime chunk (#9685) by @shulaoda - lazy-barrel: request all exports for entry barrels on first encounter (#9672) by @shulaoda - finalizer: skip init_*() for tree-shaken wrapped ESM owners (#9669) by @IWANABETHATGUY - order `chunk.imports` by execution order (#9654) by @chuganzy - vite-resolve: preserve slash separators for Sass partial exports (#9546) by @cjc0013 - cross-chunk CJS wrapper shadowed by author-local binding (#9648) by @IWANABETHATGUY ### 🚜 Refactor - precompute wrapped-ESM init metadata in generate stage (#9712) by @IWANABETHATGUY - ecmascript_utils: fold construction ext traits onto AstFactory and delete AstSnippet (#9702) by @hyf0 - finalizer: finish ScopeHoistingFinalizer migration to AstFactory (#9701) by @hyf0 - finalizer: migrate module_finalizers/mod.rs to AstFactory (#9700) by @hyf0 - hmr: migrate hmr finalizer to AstFactory (#9695) by @hyf0 - plugin: migrate vite_build_import_analysis to AstFactory (#9693) by @hyf0 - scanner: migrate tweak_ast_for_scanning to AstFactory (#9683) by @hyf0 - always split runtime module first (#9419) by @IWANABETHATGUY ### 📚 Documentation - tsconfig: correct auto-discovery resolution to match TypeScript (#9714) by @shulaoda - design: plan to unify all internal AST construction (#9673) by @hyf0 - tsconfig: align reference resolution docs with TypeScript behavior (#9641) by @shulaoda ### ⚡ Performance - avoid per-module join Strings in scope-hoisting concatenation (#9645) by @Boshen - avoid intermediate Strings in the ESM export clause (#9644) by @Boshen - reuse a scratch buffer for facade namespace names in the scanner (#9642) by @Boshen - reuse the import-matching tracker stack across named imports (#9643) by @Boshen - avoid cloning the per-chunk export-items map in render_chunk_exports (#9639) by @Boshen - avoid CompactStr allocation in sorted-exports membership check (#9640) by @Boshen ### 🧪 Testing - add more `moduleSideEffects` precedence tests (#9689) by @sapphi-red - 9651: drop shimMissingExports from regression fixture (#9674) by @IWANABETHATGUY ### ⚙️ Miscellaneous Tasks - update react repo links (#9711) by @iiio2 - remove outdated pnpm configurations (#9666) by @btea - deps: update github actions to v2.81.5 (#9665) by @renovate[bot] - testing: migrate test harness off deprecated inlineDynamicImports (#9710) by @IWANABETHATGUY - hmr: delete commented-out dead code left from old register-module codegen (#9707) by @hyf0 - deps: update napi-rs toolchain (#9706) by @shulaoda - deps: update rollup submodule for tests to v4.61.1 (#9676) by @rolldown-guard[bot] - deps: update test262 submodule for tests (#9677) by @rolldown-guard[bot] - deps: update oxc to 0.135.0 (#9670) by @Boshen - pass ALGOLIA_APP_ID and ALGOLIA_API_KEY to void deploy (#9667) by @Boshen - deps: update github actions (#9662) by @renovate[bot] - deps: update rust crates (#9663) by @renovate[bot] - deps: update rolldown-plugin-dts to v0.25.2 (#9661) by @renovate[bot] - deps: update typos to v1.47.2 (#9660) by @renovate[bot] - deps: update docs dependencies (#9657) by @bddjr - deps: update typos to v1.47.1 (#9655) by @renovate[bot] - deploy website in its own workflow, only on docs output change (#9650) by @Boshen - publish to pkg.pr.new add pm and `commentWithDev` option (#9638) by @btea ### ❤️ New Contributors * @chuganzy made their first contribution in [#9654](#9654) * @cjc0013 made their first contribution in [#9546](#9546)

Migrates the
PreProcessorscanner pre-pass offAstSnippettoAstFactory(handleast_factory):.builder.*reach-throughs → deref'd calls,.alloc()→.allocator. Pure mechanical migration — no newmake_*. Behavior-preserving; clippy/fmt clean + adversarial reviews.AstFactory migration progress (
meta/design/ast-construction.md)AstFactory+vite_web_worker_post+generate_lazy_export— feat(ecmascript_utils): introduce AstFactory for AST construction #9682 (merged)tweak_ast_for_scanning— refactor(scanner): migrate tweak_ast_for_scanning to AstFactory #9683 ← this PRvite_build_import_analysis— refactor(plugin): migrate vite_build_import_analysis to AstFactory #9693hmr_stage(+ 6 sharedmake_*,builder()by-value) — refactor(hmr): migrate hmr finalizer to AstFactory #9695module_finalizers/mod.rs(+ themake_*ports it consumes; transitional dual field) — refactor(finalizer): migrate module_finalizers/mod.rs to AstFactory #9700ScopeHoistingFinalizer(+ wrappermake_*ports;snippetfield removed) — refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory #9701AstFactory; deleteAstSnippet— refactor(ecmascript_utils): fold construction ext traits onto AstFactory and delete AstSnippet #9702🤖 Generated with Claude Code