headson 0.7.0__tar.gz → 0.7.1__tar.gz

{headson-0.7.0 → headson-0.7.1}/Cargo.lock

@@ -369,7 +369,7 @@ dependencies = [
 
 [[package]]
 name = "headson"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "assert_cmd",

{headson-0.7.0 → headson-0.7.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "headson"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 description = "Budget‑constrained JSON preview renderer"
 readme = "README.md"

{headson-0.7.0 → headson-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: headson
-Version: 0.7.0
+Version: 0.7.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
@@ -83,6 +83,7 @@ Common flags:
 - `-i, --input-format <json|yaml|text>`: ingestion format (default: `json`). For filesets in `auto` format, ingestion is chosen by extensions.
 - `-m, --compact`: no indentation, no spaces, no newlines
 - `--no-newline`: single line output
+- `--no-header`: suppress fileset section headers (useful when embedding output in scripts)
 - `--no-space`: no space after `:` in objects
 - `--indent <STR>`: indentation unit (default: two spaces)
 - `--string-cap <N>`: max graphemes to consider per string (default: 500)
@@ -92,7 +93,7 @@ Common flags:
 Notes:
 
 - Multiple inputs:
-  - With newlines enabled, file sections are rendered with human‑readable headers. In compact/single‑line modes, headers are omitted.
+  - With newlines enabled, file sections are rendered with human‑readable headers (pass `--no-header` to suppress them). In compact/single‑line modes, headers are omitted.
 - In `--format auto`, each file uses its own best format: JSON family for `.json`, YAML for `.yaml`/`.yml`.
   - Unknown extensions are treated as Text (raw lines) — safe for logs and `.txt` files.
   - `--global-bytes` may truncate or omit entire files to respect the total budget.
@@ -114,6 +115,7 @@ Notes:
   - Caps the number of lines in the output.
   - Incompatible with `--no-newline`.
   - Multiple inputs: defaults to `<LINES> * number_of_inputs`; `--global-lines` caps the total.
+  - Fileset headers, blank separators, and summary lines do not count toward the line cap; only actual content lines are considered.
 
 - Interactions and precedence
   - All active budgets are enforced simultaneously. The render must satisfy all of: bytes (if set), chars (if set), and lines (if set). The strictest cap wins.

{headson-0.7.0 → headson-0.7.1}/README.md

@@ -69,6 +69,7 @@ Common flags:
 - `-i, --input-format <json|yaml|text>`: ingestion format (default: `json`). For filesets in `auto` format, ingestion is chosen by extensions.
 - `-m, --compact`: no indentation, no spaces, no newlines
 - `--no-newline`: single line output
+- `--no-header`: suppress fileset section headers (useful when embedding output in scripts)
 - `--no-space`: no space after `:` in objects
 - `--indent <STR>`: indentation unit (default: two spaces)
 - `--string-cap <N>`: max graphemes to consider per string (default: 500)
@@ -78,7 +79,7 @@ Common flags:
 Notes:
 
 - Multiple inputs:
-  - With newlines enabled, file sections are rendered with human‑readable headers. In compact/single‑line modes, headers are omitted.
+  - With newlines enabled, file sections are rendered with human‑readable headers (pass `--no-header` to suppress them). In compact/single‑line modes, headers are omitted.
 - In `--format auto`, each file uses its own best format: JSON family for `.json`, YAML for `.yaml`/`.yml`.
   - Unknown extensions are treated as Text (raw lines) — safe for logs and `.txt` files.
   - `--global-bytes` may truncate or omit entire files to respect the total budget.
@@ -100,6 +101,7 @@ Notes:
   - Caps the number of lines in the output.
   - Incompatible with `--no-newline`.
   - Multiple inputs: defaults to `<LINES> * number_of_inputs`; `--global-lines` caps the total.
+  - Fileset headers, blank separators, and summary lines do not count toward the line cap; only actual content lines are considered.
 
 - Interactions and precedence
   - All active budgets are enforced simultaneously. The render must satisfy all of: bytes (if set), chars (if set), and lines (if set). The strictest cap wins.

{headson-0.7.0 → headson-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "headson"
-version = "0.7.0"
+version = "0.7.1"
 description = "Budget‑constrained JSON preview renderer (Python bindings)"
 readme = "README.md"
 requires-python = ">=3.10"

{headson-0.7.0 → headson-0.7.1}/python/Cargo.lock

@@ -291,7 +291,7 @@ dependencies = [
 
 [[package]]
 name = "headson"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -307,7 +307,7 @@ dependencies = [
 
 [[package]]
 name = "headson-python"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "headson",

{headson-0.7.0 → headson-0.7.1}/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "headson-python"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 publish = false
 readme = "README.md"

{headson-0.7.0 → headson-0.7.1}/python/src/lib.rs

@@ -63,6 +63,7 @@ fn render_config_with_sampler(
         string_free_prefix_graphemes: None,
         debug: false,
         primary_source_name: None,
+        show_fileset_headers: true,
     })
 }
 

{headson-0.7.0 → headson-0.7.1}/src/ingest/formats/text/mod.rs

@@ -494,6 +494,7 @@ mod tests {
             string_free_prefix_graphemes: None,
             debug: false,
             primary_source_name: None,
+            show_fileset_headers: true,
         };
         let prio = PriorityConfig::new(100, 100);
         (cfg, prio)

{headson-0.7.0 → headson-0.7.1}/src/lib.rs

@@ -187,52 +187,20 @@ fn find_largest_render_under_budgets(
     if total == 0 {
         return String::new();
     }
-    // Each included node contributes at least some output; cap hi by budget.
-    let lo = 1usize;
-    // For the upper bound, when a byte budget is present, we can safely cap by it;
-    // otherwise, cap by total.
-    let hi = match budgets.byte_budget {
-        Some(c) => total.min(c.max(1)),
-        None => total,
-    };
-    // Reuse render-inclusion flags across render attempts to avoid clearing the vector.
-    // A node participates in the current render attempt when inclusion_flags[id] == render_set_id.
-    let mut inclusion_flags: Vec<u32> = vec![0; total];
-    // Each render attempt bumps this non-zero identifier to create a fresh inclusion set.
-    let mut render_set_id: u32 = 1;
-    // Measure length without color so ANSI escapes do not count toward the
-    // byte budget. Then render once more with the requested color setting.
-    let mut best_k: Option<usize> = None;
+    let root_is_fileset = order_build
+        .object_type
+        .get(crate::order::ROOT_PQ_ID)
+        .is_some_and(|t| *t == crate::order::ObjectType::Fileset);
     let mut measure_cfg = config.clone();
     measure_cfg.color_enabled = false;
-
-    let _ = crate::utils::search::binary_search_max(lo, hi, |mid| {
-        let s = crate::serialization::render_top_k(
-            order_build,
-            mid,
-            &mut inclusion_flags,
-            render_set_id,
-            &measure_cfg,
-        );
-        render_set_id = render_set_id.wrapping_add(1).max(1);
-        // Measure output using a unified stats helper and enforce
-        // all provided caps (chars and/or lines).
-        let stats = crate::utils::measure::count_output_stats(
-            &s,
-            budgets.char_budget.is_some(),
-        );
-        let fits_bytes = budgets.byte_budget.is_none_or(|c| stats.bytes <= c);
-        let fits_chars = budgets.char_budget.is_none_or(|c| stats.chars <= c);
-        let fits_lines = budgets.line_budget.is_none_or(|l| stats.lines <= l);
-        if fits_bytes && fits_chars && fits_lines {
-            best_k = Some(mid);
-            true
-        } else {
-            false
-        }
-    });
-
-    let k = best_k.unwrap_or(1);
+    if budgets.line_budget.is_some()
+        && config.show_fileset_headers
+        && root_is_fileset
+    {
+        measure_cfg.show_fileset_headers = false;
+    }
+    let (k, mut inclusion_flags, render_set_id) =
+        select_best_k(order_build, &measure_cfg, budgets);
 
     // Prepare final inclusion set once and optionally build debug JSON.
     crate::serialization::prepare_render_set_top_k_and_ancestors(
@@ -295,6 +263,53 @@ fn find_largest_render_under_budgets(
     )
 }
 
+fn select_best_k(
+    order_build: &PriorityOrder,
+    measure_cfg: &RenderConfig,
+    budgets: Budgets,
+) -> (usize, Vec<u32>, u32) {
+    let total = order_build.total_nodes;
+    // Each included node contributes at least some output; cap hi by budget.
+    let lo = 1usize;
+    // For the upper bound, when a byte budget is present, we can safely cap by it;
+    // otherwise, cap by total.
+    let hi = match budgets.byte_budget {
+        Some(c) => total.min(c.max(1)),
+        None => total,
+    };
+    // Reuse render-inclusion flags across render attempts to avoid clearing the vector.
+    let mut inclusion_flags: Vec<u32> = vec![0; total];
+    // Each render attempt bumps this non-zero identifier to create a fresh inclusion set.
+    let mut render_set_id: u32 = 1;
+    let mut best_k: Option<usize> = None;
+    let measure_chars = budgets.char_budget.is_some();
+    let _ = crate::utils::search::binary_search_max(lo, hi, |mid| {
+        let current_render_id = render_set_id;
+        let s = crate::serialization::render_top_k(
+            order_build,
+            mid,
+            &mut inclusion_flags,
+            current_render_id,
+            measure_cfg,
+        );
+        let stats =
+            crate::utils::measure::count_output_stats(&s, measure_chars);
+        let fits_bytes = budgets.byte_budget.is_none_or(|c| stats.bytes <= c);
+        let fits_chars = budgets.char_budget.is_none_or(|c| stats.chars <= c);
+        let fits_lines =
+            budgets.line_budget.is_none_or(|cap| stats.lines <= cap);
+        render_set_id = render_set_id.wrapping_add(1).max(1);
+        if fits_bytes && fits_chars && fits_lines {
+            best_k = Some(mid);
+            true
+        } else {
+            false
+        }
+    });
+    let k = best_k.unwrap_or(1);
+    (k, inclusion_flags, render_set_id)
+}
+
 // (removed) render_final helper was inlined to centralize optional debug dump
 
 // Optional new public API that accepts both budgets explicitly.

{headson-0.7.0 → headson-0.7.1}/src/main.rs

@@ -64,6 +64,12 @@ struct Cli {
         help = "Do not add newlines in the output. Incompatible with --lines/--global-lines."
     )]
     no_newline: bool,
+    #[arg(
+        long = "no-header",
+        default_value_t = false,
+        help = "Suppress fileset section headers in the output"
+    )]
+    no_header: bool,
     #[arg(
         short = 'm',
         long = "compact",
@@ -525,6 +531,7 @@ fn get_render_config_from(cli: &Cli) -> headson::RenderConfig {
         string_free_prefix_graphemes: None,
         debug: cli.debug,
         primary_source_name: None,
+        show_fileset_headers: !cli.no_header,
     }
 }
 

{headson-0.7.0 → headson-0.7.1}/src/serialization/fileset.rs

@@ -1,6 +1,6 @@
 use super::RenderScope;
 use crate::format::Format;
-use crate::order::{ObjectType, ROOT_PQ_ID};
+use crate::order::{NodeId, ObjectType, ROOT_PQ_ID};
 use crate::serialization::types::OutputTemplate;
 
 impl<'a> RenderScope<'a> {
@@ -19,26 +19,68 @@ impl<'a> RenderScope<'a> {
     }
 
     fn render_fileset_sections(&mut self, depth: usize) -> String {
-        let mut out = String::new();
         let Some(children_ids) = self.order.children.get(ROOT_PQ_ID) else {
-            return out;
+            return String::new();
         };
+        let show_headers = self.should_render_fileset_headers();
+        let mut out = String::new();
+        let kept = self.render_fileset_children(
+            children_ids,
+            depth,
+            show_headers,
+            &mut out,
+        );
+        if show_headers {
+            self.render_fileset_summary(children_ids, depth, kept, &mut out);
+        }
+        out
+    }
+
+    fn fileset_push_section_gap(&self, out: &mut String) {
+        let nl = &self.config.newline;
+        out.push_str(nl);
+        out.push_str(nl);
+    }
+
+    fn should_render_fileset_headers(&self) -> bool {
+        self.config.show_fileset_headers && !self.config.newline.is_empty()
+    }
+
+    fn render_fileset_children(
+        &mut self,
+        children_ids: &[NodeId],
+        depth: usize,
+        show_headers: bool,
+        out: &mut String,
+    ) -> usize {
         let mut kept = 0usize;
-        for &child_id in children_ids.iter() {
+        for &child_id in children_ids {
             if self.inclusion_flags[child_id.0] != self.render_set_id {
                 continue;
             }
-            if kept > 0 {
-                self.fileset_push_section_gap(&mut out);
+            if kept > 0 && show_headers {
+                self.fileset_push_section_gap(out);
             }
             kept += 1;
             let raw_key =
                 self.order.nodes[child_id.0].key_in_object().unwrap_or("");
-            out.push_str(&self.fileset_header_line(depth, raw_key));
+            if show_headers {
+                out.push_str(&self.fileset_header_line(depth, raw_key));
+            }
             let rendered =
                 self.fileset_render_child(child_id.0, depth, raw_key);
             out.push_str(&rendered);
         }
+        kept
+    }
+
+    fn render_fileset_summary(
+        &self,
+        children_ids: &[NodeId],
+        depth: usize,
+        kept: usize,
+        out: &mut String,
+    ) {
         let total = self
             .order
             .metrics
@@ -46,16 +88,9 @@ impl<'a> RenderScope<'a> {
             .and_then(|m| m.object_len)
             .unwrap_or(children_ids.len());
         if total > kept && !self.config.newline.is_empty() {
-            self.fileset_push_section_gap(&mut out);
+            self.fileset_push_section_gap(out);
             out.push_str(&self.fileset_summary_line(depth, total - kept));
         }
-        out
-    }
-
-    fn fileset_push_section_gap(&self, out: &mut String) {
-        let nl = &self.config.newline;
-        out.push_str(nl);
-        out.push_str(nl);
     }
 
     fn fileset_header_line(&self, depth: usize, key: &str) -> String {

{headson-0.7.0 → headson-0.7.1}/src/serialization/mod.rs

@@ -936,6 +936,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("arena_render_empty", out);
@@ -974,6 +975,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         // Sanity: output should contain CRLF newlines and render the object child across lines.
@@ -1014,6 +1016,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("arena_render_single", out);
@@ -1055,6 +1058,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("array_omitted_pseudo_head", out_head);
@@ -1077,6 +1081,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("array_omitted_pseudo_tail", out_tail);
@@ -1116,6 +1121,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("array_omitted_js_head", out_head);
@@ -1137,6 +1143,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("array_omitted_js_tail", out_tail);
@@ -1176,6 +1183,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out_head);
@@ -1198,6 +1206,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out_tail);
@@ -1234,6 +1243,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out);
@@ -1270,6 +1280,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out);
@@ -1304,6 +1315,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out);
@@ -1366,6 +1378,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out);
@@ -1439,6 +1452,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         // Expect the first 5 characters plus an ellipsis, as a valid JSON string literal.
@@ -1475,6 +1489,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_yaml_valid(&out);
@@ -1518,6 +1533,7 @@ mod tests {
             string_free_prefix_graphemes: None,
             debug: false,
             primary_source_name: None,
+            show_fileset_headers: true,
         };
         let scope = RenderScope {
             order: &build,
@@ -1560,6 +1576,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         assert_snapshot!("inline_open_array_in_object_json", out);
@@ -1597,6 +1614,7 @@ mod tests {
                 string_free_prefix_graphemes: None,
                 debug: false,
                 primary_source_name: None,
+                show_fileset_headers: true,
             },
         );
         // Should be a valid JS object with one property and an omitted summary.
@@ -1649,6 +1667,7 @@ mod tests {
             string_free_prefix_graphemes: None,
             debug: false,
             primary_source_name: None,
+            show_fileset_headers: true,
         }
     }
 

{headson-0.7.0 → headson-0.7.1}/src/serialization/types.rs

@@ -43,6 +43,8 @@ pub struct RenderConfig {
     // a single logical input outside of filesets. Used by code-specific
     // features such as syntax highlighting.
     pub primary_source_name: Option<String>,
+    // When false, suppress fileset section headers and summary lines.
+    pub show_fileset_headers: bool,
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]

{headson-0.7.0 → headson-0.7.1}/src/utils/measure.rs

@@ -10,8 +10,16 @@ fn count_lines_from_bytes(b: &[u8]) -> usize {
     if b.is_empty() {
         return 0;
     }
-    let mut i = 0usize;
+    let mut lines = count_line_breaks(b).saturating_add(1);
+    if ends_with_break(b) && lines > 0 {
+        lines -= 1;
+    }
+    lines
+}
+
+fn count_line_breaks(b: &[u8]) -> usize {
     let mut breaks = 0usize;
+    let mut i = 0usize;
     while i < b.len() {
         match b[i] {
             b'\n' => {
@@ -21,7 +29,7 @@ fn count_lines_from_bytes(b: &[u8]) -> usize {
             b'\r' => {
                 breaks += 1;
                 if i + 1 < b.len() && b[i + 1] == b'\n' {
-                    i += 2; // treat CRLF as a single break
+                    i += 2;
                 } else {
                     i += 1;
                 }
@@ -29,7 +37,11 @@ fn count_lines_from_bytes(b: &[u8]) -> usize {
             _ => i += 1,
         }
     }
-    breaks + 1
+    breaks
+}
+
+fn ends_with_break(b: &[u8]) -> bool {
+    b.ends_with(b"\n") || (b.ends_with(b"\r") && !b.ends_with(b"\r\n"))
 }
 
 /// Count bytes and logical lines in a string, normalizing CRLF/CR/LF.