make internal bin the second entry in bundles by dfrankland · Pull Request #1024 · trunk-io/analytics-cli

dfrankland · 2026-02-04T03:54:04Z

depends on:

update to Rust edition 2024 #1023

This greatly improves our ability to extract only what's needed from byte streams

trunk-io · 2026-02-04T03:54:07Z

😎 Merged directly without going through the merge queue, as the queue was empty and the PR was up to date with the target branch - details.

codecov-commenter · 2026-02-04T04:19:46Z

Codecov Report

❌ Patch coverage is 93.57798% with 14 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.66%. Comparing base (f024d97) to head (ec667b2).

Files with missing lines	Patch %	Lines
bundle/src/bundler.rs	93.95%	13 Missing ⚠️
bundle/src/bundle_meta.rs	66.66%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1024      +/-   ##
==========================================
+ Coverage   81.33%   81.66%   +0.33%     
==========================================
  Files          69       69              
  Lines       14526    14527       +1     
==========================================
+ Hits        11815    11864      +49     
+ Misses       2711     2663      -48

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

trunk-staging-io · 2026-02-04T05:17:35Z

_{View Full Report ↗︎ ⋅ Docs}

dfrankland · 2026-02-04T05:36:51Z

-    pub fn internal_bundled_file(&self) -> Option<BundledFile> {
+    pub fn internal_bundled_file(&self) -> Option<&BundledFile> {
        match self {
-            Self::V0_7_8(data) => data.internal_bundled_file.clone(),
-            Self::V0_7_7(data) => data.internal_bundled_file.clone(),
+            Self::V0_7_8(data) => data.internal_bundled_file.as_ref(),
+            Self::V0_7_7(data) => data.internal_bundled_file.as_ref(),


Not sure why this was cloned before, but from what I can see only a reference is needed

dfrankland · 2026-02-04T05:37:18Z

+        // Add the internal binary file if it exists.
+        if let Some(bundled_file) = self.meta.internal_bundled_file.as_ref() {
+            let path = std::path::Path::new(&bundled_file.original_path);
+            let mut file = File::open(path)?;
+            tar.append_file(&bundled_file.path, &mut file)?;
+            total_bytes_in += std::fs::metadata(path)?.len();
+        }


moved up from below

dfrankland · 2026-02-04T05:37:42Z

-/// Reads and decompresses a .tar.zstd file from an input stream into just a `meta.json` file.
-/// This assumes that the `meta.json` file will be the first entry in the tarball.
-pub async fn parse_meta_from_tarball<R: AsyncBufRead>(input: R) -> anyhow::Result<VersionedBundle> {


moved down to be closer to the other parse_ functions

dfrankland · 2026-02-04T05:38:03Z

-/// Reads and decompresses a .tar.zstd file from an input stream into just the internal bin file.
-pub async fn parse_internal_bin_from_tarball<R: AsyncBufRead>(


also moved down to be closer to other parse_ functions

dfrankland · 2026-02-04T05:39:23Z

+    Err(anyhow::anyhow!("No internal.bin file found in the tarball"))
 }

 #[cfg(test)]


tests were getting a bit noisy, so I tried to clean them up a bit and make them clearer

dfrankland · 2026-02-04T05:39:56Z


    #[tokio::test]
-    pub async fn test_nondefault_internal_bin_path() {
+    pub async fn test_internal_bin_is_second_entry() {


added this test new to check that the generated bundle's second entry is the internal bin

dfrankland · 2026-02-04T05:40:54Z

-    #[test]
-    pub fn test_no_duplicate_internal_file() {
+    #[tokio::test]
+    pub async fn test_internal_bin_is_backwards_compatible_with_last_entry() {


also added this test to ensure that parsing the internal bin works even if it's not the second entry

trunk-io · 2026-02-04T06:45:28Z

_{View Full Report ↗︎ ⋅ Docs}

TylerJang27 · 2026-02-04T15:41:22Z

+async fn parse_meta_entry<R: AsyncBufRead>(
+    entry: &mut Entry<Archive<ZstdDecoder<Pin<Box<R>>>>>,
+) -> anyhow::Result<Option<VersionedBundle>> {
+    if let Some(path_str) = entry.path()?.to_str()
+        && path_str == META_FILENAME
+    {
+        let mut meta_bytes = Vec::new();
+        entry.read_to_end(&mut meta_bytes).await?;
+        Ok(Some(parse_meta(meta_bytes)?))
+    } else {
+        Ok(None)
    }
+}

-    anyhow::Result::Err(anyhow::anyhow!(
-        "No {} file found in the tarball",
-        target_name
-    ))
+async fn parse_meta_from_first_entry<R: AsyncBufRead>(


which should be used? parse_meta_from_first_entry?

Neither parse_meta_entry nor parse_meta_from_first_entry are public, they are only used internally here. Additionally, they take different arguments:

parse_meta_entry: takes a &mut Entry<T> (object containing file bytes)

parse_meta_from_first_entry: takes a &mut Entries<T> (stream of files)

parse_meta_entry is for parsing the entry itself while parse_meta_from_first_entry is for ensuring the first entry of the stream parses

dfrankland force-pushed the dylan/update-to-rust-edition-2024 branch from aa07767 to 7356854 Compare February 4, 2026 04:07

dfrankland force-pushed the dylan/make-internal-bin-second-entry-to-bundles branch from 073e460 to 53eec9a Compare February 4, 2026 04:08

dfrankland force-pushed the dylan/update-to-rust-edition-2024 branch from 7356854 to 363806c Compare February 4, 2026 04:27

dfrankland force-pushed the dylan/make-internal-bin-second-entry-to-bundles branch from 53eec9a to b8c16c1 Compare February 4, 2026 04:29

dfrankland force-pushed the dylan/update-to-rust-edition-2024 branch from 363806c to 57f1b88 Compare February 4, 2026 04:46

dfrankland force-pushed the dylan/make-internal-bin-second-entry-to-bundles branch from b8c16c1 to 31f21f9 Compare February 4, 2026 04:46

dfrankland force-pushed the dylan/update-to-rust-edition-2024 branch from 57f1b88 to bb29ba9 Compare February 4, 2026 04:51

dfrankland force-pushed the dylan/make-internal-bin-second-entry-to-bundles branch from 31f21f9 to d6c56a5 Compare February 4, 2026 04:51

dfrankland commented Feb 4, 2026

View reviewed changes

dfrankland marked this pull request as ready for review February 4, 2026 05:41

dfrankland requested review from TylerJang27, acatxnamedvirtue, cmillar-trunk, max-trunk and mb1206 as code owners February 4, 2026 05:41

TylerJang27 approved these changes Feb 4, 2026

View reviewed changes

acatxnamedvirtue approved these changes Feb 4, 2026

View reviewed changes

max-trunk approved these changes Feb 4, 2026

View reviewed changes

dfrankland changed the base branch from dylan/update-to-rust-edition-2024 to main February 4, 2026 17:05

make internal bin the second entry in bundles

ec667b2

dfrankland force-pushed the dylan/make-internal-bin-second-entry-to-bundles branch from d6c56a5 to ec667b2 Compare February 4, 2026 17:06

trunk-io Bot merged commit ed25a09 into main Feb 4, 2026
25 checks passed

		/// Reads and decompresses a .tar.zstd file from an input stream into just the internal bin file.
		pub async fn parse_internal_bin_from_tarball<R: AsyncBufRead>(

Conversation

dfrankland commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trunk-io Bot commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

trunk-staging-io Bot commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trunk-io Bot commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

dfrankland commented Feb 4, 2026 •

edited

Loading

trunk-io Bot commented Feb 4, 2026 •

edited

Loading

codecov-commenter commented Feb 4, 2026 •

edited

Loading

trunk-staging-io Bot commented Feb 4, 2026 •

edited

Loading

trunk-io Bot commented Feb 4, 2026 •

edited

Loading