refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory by hyf0 · Pull Request #9701 · rolldown/rolldown

hyf0 · 2026-06-09T18:13:39Z

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`)

Design doc + conventions — docs(design): plan to unify all internal AST construction #9673 (merged)
Introduce 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
vite_build_import_analysis — refactor(plugin): migrate vite_build_import_analysis to AstFactory #9693
hmr finalizer + hmr_stage (+ 6 shared make_*, builder() by-value) — refactor(hmr): migrate hmr finalizer to AstFactory #9695
module_finalizers/mod.rs (+ the make_* ports it consumes; transitional dual field) — refactor(finalizer): migrate module_finalizers/mod.rs to AstFactory #9700
rest of ScopeHoistingFinalizer (+ wrapper make_* ports; snippet field removed) — refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory #9701 ← this PR
fold construction ext traits onto AstFactory; delete AstSnippet — refactor(ecmascript_utils): fold construction ext traits onto AstFactory and delete AstSnippet #9702

🤖 Generated with Claude Code

hyf0 · 2026-06-09T18:14:01Z

How to use the Graphite Merge Queue

Add 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.

Copilot

Pull request overview

This PR completes the ScopeHoistingFinalizer migration away from AstSnippet by switching remaining AST construction call sites to AstFactory, and removes the now-unnecessary transitional snippet field from the finalizer/context wiring.

Changes:

Replaced remaining AstSnippet-based constructions in scope-hoisting finalization (rename, visit-mutation paths) with AstFactory equivalents.
Removed AstSnippet from ScopeHoistingFinalizer and its initialization path, simplifying the finalizer struct and context setup.
Updated HMR-related finalization to use AstFactory for identifier/string construction and ensured HmrAstBuilder::builder() reads from the wrapped factory.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
crates/rolldown/src/module_finalizers/rename.rs	Replaces namespace/member access and identifier-reference allocation from `AstSnippet` to `AstFactory`.
crates/rolldown/src/module_finalizers/mod.rs	Removes the `snippet: AstSnippet` field and associated imports from `ScopeHoistingFinalizer`.
crates/rolldown/src/module_finalizers/impl_visit_mut.rs	Migrates remaining snippet-based statement/expression construction (wrappers, decls, keep-name call) to `AstFactory`.
crates/rolldown/src/module_finalizers/hmr.rs	Uses `AstFactory` for rewriting `import.meta.hot` and stable-id string literal rewrites.
crates/rolldown/src/module_finalizers/finalizer_context.rs	Drops `AstSnippet` construction when creating `ScopeHoistingFinalizer`; constructs `AstFactory` only.
crates/rolldown/src/hmr/utils.rs	Updates `HmrAstBuilder` impl for `ScopeHoistingFinalizer` to return the builder via `ast_factory`.

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)

graphite-app · 2026-06-10T02:56:22Z

Merge activity

Jun 10, 2:56 AM UTC: hyf0 added this pull request to the Graphite merge queue.
Jun 10, 3:04 AM UTC: Merged by the Graphite merge queue.

…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)

…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)

…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)

@hyf0

## [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)

github-actions Bot assigned hyf0 Jun 9, 2026

This was referenced Jun 9, 2026

refactor(finalizer): migrate module_finalizers/mod.rs to AstFactory #9700

Merged

refactor(ecmascript_utils): fold construction ext traits onto AstFactory and delete AstSnippet #9702

Merged

hyf0 requested a review from Copilot June 10, 2026 01:36

Copilot started reviewing on behalf of hyf0 June 10, 2026 01:36 View session

Copilot AI reviewed Jun 10, 2026

View reviewed changes

hyf0 changed the title ~~refactor(rolldown): finish ScopeHoistingFinalizer migration to AstFactory~~ refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory Jun 10, 2026

hyf0 commented Jun 10, 2026

View reviewed changes

Comment thread crates/rolldown/src/module_finalizers/rename.rs Outdated

hyf0 force-pushed the astfactory-mf-migrate-mod branch from 3e48a61 to dc7f5c5 Compare June 10, 2026 01:53

hyf0 force-pushed the astfactory-mf-finish-finalizer branch from 34bb840 to 2de0302 Compare June 10, 2026 01:53

hyf0 force-pushed the astfactory-mf-migrate-mod branch from dc7f5c5 to 8943831 Compare June 10, 2026 02:07

hyf0 force-pushed the astfactory-mf-finish-finalizer branch from 2de0302 to 96a8b9c Compare June 10, 2026 02:07

hyf0 requested review from IWANABETHATGUY and shulaoda June 10, 2026 02:15

hyf0 marked this pull request as ready for review June 10, 2026 02:18

graphite-app Bot added the graphite: merge-when-ready label Jun 10, 2026

hyf0 force-pushed the astfactory-mf-finish-finalizer branch from 96a8b9c to 5b21bed Compare June 10, 2026 02:22

hyf0 force-pushed the astfactory-mf-migrate-mod branch from 84c9a96 to 1ba7831 Compare June 10, 2026 02:22

IWANABETHATGUY approved these changes Jun 10, 2026

View reviewed changes

graphite-app Bot force-pushed the astfactory-mf-migrate-mod branch from 1ba7831 to 1fdc308 Compare June 10, 2026 02:30

graphite-app Bot force-pushed the astfactory-mf-finish-finalizer branch from 5b21bed to 15bbfcc Compare June 10, 2026 02:31

graphite-app Bot force-pushed the astfactory-mf-migrate-mod branch from 1fdc308 to ad65e7e Compare June 10, 2026 02:58

graphite-app Bot force-pushed the astfactory-mf-finish-finalizer branch from 15bbfcc to e9f7d42 Compare June 10, 2026 02:58

graphite-app Bot removed the graphite: merge-when-ready label Jun 10, 2026

Base automatically changed from astfactory-mf-migrate-mod to main June 10, 2026 03:03

graphite-app Bot merged commit e9f7d42 into main Jun 10, 2026
31 checks passed

graphite-app Bot deleted the astfactory-mf-finish-finalizer branch June 10, 2026 03:04

shulaoda mentioned this pull request Jun 11, 2026

release: v1.1.1 #9715

Closed

rolldown-guard Bot mentioned this pull request Jun 11, 2026

release: v1.1.1 #9718

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory#9701

refactor(finalizer): finish ScopeHoistingFinalizer migration to AstFactory#9701
graphite-app[bot] merged 1 commit into
mainfrom
astfactory-mf-finish-finalizer

hyf0 commented Jun 9, 2026 •

edited

Loading

Uh oh!

hyf0 commented Jun 9, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

graphite-app Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

hyf0 commented Jun 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

AstFactory migration progress (meta/design/ast-construction.md)

Uh oh!

hyf0 commented Jun 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to use the Graphite Merge Queue

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

graphite-app Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hyf0 commented Jun 9, 2026 •

edited

Loading

AstFactory migration progress (`meta/design/ast-construction.md`)

hyf0 commented Jun 9, 2026 •

edited

Loading

graphite-app Bot commented Jun 10, 2026 •

edited

Loading