refactor(rolldown): collapse vestigial wrap-kind state and share chunk sort helper#10201
Merged
Merged
Conversation
Member
Author
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. |
This was referenced Jul 9, 2026
✅ Deploy Preview for rolldown-rs canceled.
|
Member
Author
Merge activity
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors internal linking/generation bookkeeping in rolldown to remove vestigial wrap-kind state, add a reusable star-export helper on NormalModule, and centralize chunk render-order sorting in ChunkGraph, with the intent of keeping generated output byte-identical while reducing future churn for strict execution order work.
Changes:
- Collapse
LinkingMetadata::{original_wrap_kind,sync_wrap_kind,update_wrap_kind}into a singlewrap_kind+set_wrap_kind. - Add
NormalModule::star_export_records()and routestar_export_module_ids()through it. - Extract chunk render-order sorting into
ChunkGraph::rebuild_sorted_chunk_idx_vec()and call it fromgenerate_chunks.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| crates/rolldown/src/types/linking_metadata.rs | Removes original_wrap_kind and consolidates wrap-kind mutation APIs. |
| crates/rolldown/src/stages/link_stage/wrapping.rs | Updates wrapping decisions to use set_wrap_kind. |
| crates/rolldown/src/stages/link_stage/generate_lazy_export.rs | Updates JSON-to-ESM path to use set_wrap_kind. |
| crates/rolldown/src/stages/link_stage/determine_module_exports_kind.rs | Updates wrap-kind adjustments during exports-kind determination to use set_wrap_kind. |
| crates/rolldown/src/stages/generate_stage/code_splitting.rs | Uses wrap_kind() where original_wrap_kind() was referenced; calls shared chunk sort helper. |
| crates/rolldown/src/chunk_graph.rs | Adds rebuild_sorted_chunk_idx_vec() to share chunk render-order sorting logic. |
| crates/rolldown_common/src/module/normal_module.rs | Introduces star_export_records() and rewires star_export_module_ids(). |
Merging this PR will not alter performance
Comparing 
Footnotes
|
shulaoda
approved these changes
Jul 9, 2026
…k sort helper (#10201) **What this does (and doesn't).** Byte-neutral cleanup of wrap-kind bookkeeping plus one shared chunk-graph helper. It (a) removes the `LinkingMetadata::original_wrap_kind` field, collapsing it into `wrap_kind` and merging `sync_wrap_kind`/`update_wrap_kind` into a single `set_wrap_kind`; (b) adds `NormalModule::star_export_records` and reroutes `star_export_module_ids` through it; (c) extracts the chunk render-order sort out of `generate_chunks` into `ChunkGraph::rebuild_sorted_chunk_idx_vec`. It does NOT change any generated output, add any feature, or introduce the liveness helpers (`chunk_is_live` / `module_is_in_live_chunk`) — those have no caller in this PR and are left for the later feature layer. **Why.** `original_wrap_kind` existed only to remember a module's pre-strict wrap kind for the code-splitting lazy-init analysis. But that analysis (`ensure_lazy_module_initialization_order`) early-returns whenever strict execution order is enabled, which is the only situation where `wrap_kind` and `original_wrap_kind` ever diverge — so the second copy is never actually read, and dropping it changes nothing. The `star_export_records` and `rebuild_sorted_chunk_idx_vec` extractions turn two inline blobs into named, reusable helpers with identical behavior, so the later strict-execution-order layers can build on them without a churny diff. **Validation.** `cargo test -p rolldown --test integration`: 1801 fixtures pass; the 5 failures are pre-existing and environment-only (missing `cjs-module-lexer` / `util-deprecate` npm packages and an unpopulated `test262` submodule), unrelated to this change. `cargo clippy -p rolldown --all-targets -- -D warnings` is clean and `cargo fmt --all` produces no diff. Zero snapshot changes across the ~1800 fixtures — byte-identical output. **Stack.** Part of a stack slicing the `output.strictExecutionOrder` work into reviewable layers. Next: (2) route interop ESM init emission through a shared init-target view; (3) skip CJS namespace merging under strict execution order.
graphite-app
Bot
force-pushed
the
strict-prep-wrap-kind-state
branch
from
July 9, 2026 14:20
29e9103 to
4424048
Compare
Merged
shulaoda
added a commit
that referenced
this pull request
Jul 15, 2026
## [1.2.0] - 2026-07-15 ### 🚀 Features - dev: skip shipping factories for newly imported top-level modules (#10223) by @h-a-n-a - dev: per-client ship map for HMR patch sizing (#10208) by @h-a-n-a - dev: client-side HMR (#10164) by @h-a-n-a - dev: send a full-reload update to clients when a tsconfig changes (#10262) by @shulaoda - treat `import.meta['url']` and `import.meta['ROLLUP_FILE_URL_*']` as side-effect free (#10267) by @sapphi-red - rewrite `import.meta['url']` (#10251) by @sapphi-red - add `FILE_NOT_FOUND` error (#10220) by @sapphi-red - treat `import.meta.ROLLUP_FILE_URL_*` as side-effect free (#10217) by @sapphi-red ### 🐛 Bug Fixes - sourcemap: preserve unmapped boundaries during composition (#10254) by @hyfdev - `[format]` in `*FileNames` option for ESM format should be `es` instead of `esm` (#10214) by @sapphi-red - sourcemap: preserve coarse mappings during composition (#10249) by @hyfdev - rolldown_plugin_vite_import_glob: support tsconfig paths with `import.meta.glob` (#10167) by @sapphi-red - dev: clear tsconfig caches for bare full builds (#10276) by @shulaoda - dev: force a full rebuild when a tsconfig changes (#10261) by @shulaoda - treat rooted drive-less module ids as absolute in preserveModules naming (#10235) by @IWANABETHATGUY - watch: rebuild when tsconfig files change (#10258) by @shulaoda - watch: drop tsconfig-merged transform options on each rebuild (#10257) by @shulaoda - incorrect `EMPTY_IMPORT_META` warning for `import.meta.ROLLUP_FILE_URL_*` for CJS output (#10221) by @sapphi-red - deconflict: rename CJS locals shadowing wrapped-ESM namespace objects (#9970) by @IWANABETHATGUY - rolldown: drop the unused runtime module after entry-level external flattening (#10237) by @IWANABETHATGUY - rolldown: re-propagate has_dynamic_exports to transitive star importers (#10239) by @IWANABETHATGUY - tree-shaking: tree-shake destructured dynamic import namespace bindings (#10213) by @logaretm - s390x: use json-escape-simd 3.1.1 for big-endian JSON escaping fix (#10211) by @satyamg1620 ### 🚜 Refactor - dev: move full-reload to client side (#10207) by @h-a-n-a - readability follow-ups to the ReplaceWith migration (#10286) by @IWANABETHATGUY - replace take_in-then-write-back with ReplaceWith and by-value moves (#10285) by @Boshen - share the main resolver's cache with the transformer's tsconfig lookups (#10205) by @shulaoda - rolldown: extract the ns star-external __reExport emission rule into LinkingMetadata (#10238) by @IWANABETHATGUY - rolldown: unify link/generate diagnostics into a Diagnostics accumulator (#10234) by @IWANABETHATGUY - sourcemap_filenames: drop dead sourcemap-filename plumbing (#10189) by @IWANABETHATGUY - extract external import symbol merging into a method (#10224) by @IWANABETHATGUY - rolldown: skip CJS namespace merging under strict execution order (#10203) by @hyfdev - resolve the manual tsconfig per file instead of once at startup (#10200) by @shulaoda - rolldown: route interop ESM init emission through a shared init-target view (#10202) by @hyfdev - rolldown: collapse vestigial wrap-kind state and share chunk sort helper (#10201) by @hyfdev ### 📚 Documentation - show plugin kinds in JSDoc and each hook's description (#10218) by @sapphi-red - add an explanation about removing imports from external modules without any messages (#10215) by @sapphi-red ### ⚡ Performance - sourcemap: owned merge in SourceJoiner::join (4005->5 allocs/chunk) (#10250) by @Boshen - avoid redundant sourcemap string copies in collapse and minify paths (#10093) by @Boshen ### 🧪 Testing - code-splitting: establish strict-order review baselines (#10287) by @hyfdev - dev: add hot API test cases (#10181) by @h-a-n-a - code-splitting: normalize strict execution order variants (#10277) by @hyfdev - code-splitting: harden strict execution order coverage (#10252) by @hyfdev - code-splitting: add strict execution order regressions (#10253) by @hyfdev ### ⚙️ Miscellaneous Tasks - deps: update github actions (#10241) by @renovate[bot] - deps: update oxc to 0.140.0 (#10274) by @shulaoda - update Yunfei's GitHub username (#10275) by @hyfdev - deps: update napi (#10260) by @renovate[bot] - deps: update test262 submodule for tests (#10266) by @rolldown-guard[bot] - deps: update dependency vite-plus to v0.2.4 (#10256) by @renovate[bot] - deps: update napi (#10240) by @renovate[bot] - deps: update oxc resolver to v11.24.2 (#10245) by @renovate[bot] - deps: update rust crates (#10244) by @renovate[bot] - disable Renovate updates for idna_adapter (#10248) by @shulaoda - deps: update oxc resolver to v11.24.1 (#10232) by @renovate[bot] - deps: update rust crate oxc_sourcemap to v8.1.1 (#10233) by @renovate[bot] - deps: update dependency rolldown-plugin-dts to ^0.27.0 (#10206) by @renovate[bot] - deps: upgrade sugar_path to v3 (#10230) by @hyfdev - add `dist-*` to `.gitignore` in sourcemap-filenames/hash-final-content fixture (#10216) by @sapphi-red - deps: update dependency rust to v1.97.0 (#10209) by @renovate[bot] ### ❤️ New Contributors * @satyamg1620 made their first contribution in [#10211](#10211) Co-authored-by: shulaoda <[email protected]>
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.
What this does (and doesn't). Byte-neutral cleanup of wrap-kind bookkeeping plus one shared chunk-graph helper. It (a) removes the
LinkingMetadata::original_wrap_kindfield, collapsing it intowrap_kindand mergingsync_wrap_kind/update_wrap_kindinto a singleset_wrap_kind; (b) addsNormalModule::star_export_recordsand reroutesstar_export_module_idsthrough it; (c) extracts the chunk render-order sort out ofgenerate_chunksintoChunkGraph::rebuild_sorted_chunk_idx_vec. It does NOT change any generated output, add any feature, or introduce the liveness helpers (chunk_is_live/module_is_in_live_chunk) — those have no caller in this PR and are left for the later feature layer.Why.
original_wrap_kindexisted only to remember a module's pre-strict wrap kind for the code-splitting lazy-init analysis. But that analysis (ensure_lazy_module_initialization_order) early-returns whenever strict execution order is enabled, which is the only situation wherewrap_kindandoriginal_wrap_kindever diverge — so the second copy is never actually read, and dropping it changes nothing. Thestar_export_recordsandrebuild_sorted_chunk_idx_vecextractions turn two inline blobs into named, reusable helpers with identical behavior, so the later strict-execution-order layers can build on them without a churny diff.Validation.
cargo test -p rolldown --test integration: 1801 fixtures pass; the 5 failures are pre-existing and environment-only (missingcjs-module-lexer/util-deprecatenpm packages and an unpopulatedtest262submodule), unrelated to this change.cargo clippy -p rolldown --all-targets -- -D warningsis clean andcargo fmt --allproduces no diff. Zero snapshot changes across the ~1800 fixtures — byte-identical output.Stack. Part of a stack slicing the
output.strictExecutionOrderwork into reviewable layers. Next: (2) route interop ESM init emission through a shared init-target view; (3) skip CJS namespace merging under strict execution order.