headson 0.5.2__tar.gz → 0.5.3__tar.gz

{headson-0.5.2 → headson-0.5.3}/Cargo.lock

@@ -266,7 +266,7 @@ dependencies = [
 
 [[package]]
 name = "headson"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "assert_cmd",

{headson-0.5.2 → headson-0.5.3}/Cargo.toml

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

{headson-0.5.2 → headson-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: headson
-Version: 0.5.2
+Version: 0.5.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
@@ -58,8 +58,9 @@ If you’re comfortable with tools like `head` and `tail`, use `headson` when yo
 
 Common flags:
 
-- `-n, --budget <BYTES>`: per‑file output budget. When multiple input files are provided, the total budget equals `<BYTES> * number_of_inputs`.
-- `-N, --global-budget <BYTES>`: total output budget across all inputs. Useful when you want a fixed-size preview across many files (may omit entire files). Mutually exclusive with `--budget`.
+- `-n, --budget <BYTES>`: per‑file output budget. When multiple input files are provided, the default total budget equals `<BYTES> * number_of_inputs`.
+- `-N, --global-budget <BYTES>`: total output budget across all inputs. Useful when you want a fixed-size preview across many files (may omit entire files).
+  - When used together with `--budget`, the final total budget is `min(global, per_file * number_of_inputs)`. Files are only truncated if they don't fit into this final global limit, and no single file expands beyond the per‑file budget.
 - `-f, --template <json|pseudo|js>`: output style (default: `pseudo`)
 - `-m, --compact`: no indentation, no spaces, no newlines
 - `--no-newline`: single line output
@@ -167,7 +168,7 @@ print(
 
 # Algorithm
 
-![Algorithm overview](docs/assets/algorithm.svg)
+![Algorithm overview](https://raw.githubusercontent.com/kantord/headson/main/docs/assets/algorithm.svg)
 
 ## Footnotes
  - <sup><b>[1]</b></sup> <b>Optimized tree representation</b>: An arena‑style tree stored in flat, contiguous buffers. Each node records its kind and value plus index ranges into shared child and key arrays. Arrays are ingested in a single pass and may be deterministically pre‑sampled: the first element is always kept; additional elements are selected via a fixed per‑index inclusion test; for kept elements, original indices are stored and full lengths are counted. This enables accurate omission info and internal gap markers later, while minimizing pointer chasing.

{headson-0.5.2 → headson-0.5.3}/README.md

@@ -43,8 +43,9 @@ If you’re comfortable with tools like `head` and `tail`, use `headson` when yo
 
 Common flags:
 
-- `-n, --budget <BYTES>`: per‑file output budget. When multiple input files are provided, the total budget equals `<BYTES> * number_of_inputs`.
-- `-N, --global-budget <BYTES>`: total output budget across all inputs. Useful when you want a fixed-size preview across many files (may omit entire files). Mutually exclusive with `--budget`.
+- `-n, --budget <BYTES>`: per‑file output budget. When multiple input files are provided, the default total budget equals `<BYTES> * number_of_inputs`.
+- `-N, --global-budget <BYTES>`: total output budget across all inputs. Useful when you want a fixed-size preview across many files (may omit entire files).
+  - When used together with `--budget`, the final total budget is `min(global, per_file * number_of_inputs)`. Files are only truncated if they don't fit into this final global limit, and no single file expands beyond the per‑file budget.
 - `-f, --template <json|pseudo|js>`: output style (default: `pseudo`)
 - `-m, --compact`: no indentation, no spaces, no newlines
 - `--no-newline`: single line output
@@ -152,7 +153,7 @@ print(
 
 # Algorithm
 
-![Algorithm overview](docs/assets/algorithm.svg)
+![Algorithm overview](https://raw.githubusercontent.com/kantord/headson/main/docs/assets/algorithm.svg)
 
 ## Footnotes
  - <sup><b>[1]</b></sup> <b>Optimized tree representation</b>: An arena‑style tree stored in flat, contiguous buffers. Each node records its kind and value plus index ranges into shared child and key arrays. Arrays are ingested in a single pass and may be deterministically pre‑sampled: the first element is always kept; additional elements are selected via a fixed per‑index inclusion test; for kept elements, original indices are stored and full lengths are counted. This enables accurate omission info and internal gap markers later, while minimizing pointer chasing.

{headson-0.5.2 → headson-0.5.3}/pyproject.toml

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

{headson-0.5.2 → headson-0.5.3}/python/Cargo.lock

@@ -169,7 +169,7 @@ dependencies = [
 
 [[package]]
 name = "headson"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -182,7 +182,7 @@ dependencies = [
 
 [[package]]
 name = "headson-python"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "headson",

{headson-0.5.2 → headson-0.5.3}/python/Cargo.toml

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

{headson-0.5.2 → headson-0.5.3}/src/main.rs

@@ -17,7 +17,7 @@ type IgnoreNotices = Vec<String>;
     about = "Get a small but useful preview of a JSON file"
 )]
 struct Cli {
-    #[arg(short = 'n', long = "budget", conflicts_with = "global_budget")]
+    #[arg(short = 'n', long = "budget")]
     budget: Option<usize>,
     #[arg(short = 'f', long = "template", value_enum, default_value_t = Template::Pseudo)]
     template: Template,
@@ -49,8 +49,7 @@ struct Cli {
         short = 'N',
         long = "global-budget",
         value_name = "BYTES",
-        conflicts_with = "budget",
-        help = "Total output budget across all inputs; useful to keep multiple files within a fixed overall output size (may omit entire files)."
+        help = "Total output budget across all inputs. When combined with --budget, the effective global limit is the smaller of the two."
     )]
     global_budget: Option<usize>,
     #[arg(
@@ -101,11 +100,11 @@ fn main() -> Result<()> {
 }
 
 fn compute_effective_budget(cli: &Cli, input_count: usize) -> usize {
-    if let Some(g) = cli.global_budget {
-        g
-    } else {
-        let per_file = cli.budget.unwrap_or(500);
-        per_file.saturating_mul(input_count)
+    match (cli.global_budget, cli.budget) {
+        (Some(g), Some(n)) => g.min(n.saturating_mul(input_count)),
+        (Some(g), None) => g,
+        (None, Some(n)) => n.saturating_mul(input_count),
+        (None, None) => 500usize.saturating_mul(input_count),
     }
 }
 
@@ -114,7 +113,15 @@ fn compute_priority(
     effective_budget: usize,
     input_count: usize,
 ) -> headson::PriorityConfig {
-    let per_file_for_priority = (effective_budget / input_count.max(1)).max(1);
+    let per_file_for_priority =
+        if cli.global_budget.is_some() && cli.budget.is_some() {
+            // When both limits are provided, base per-file heuristics on the per-file
+            // budget but also respect the effective per-file slice of the final global.
+            let eff_per_file = (effective_budget / input_count.max(1)).max(1);
+            cli.budget.unwrap().min(eff_per_file).max(1)
+        } else {
+            (effective_budget / input_count.max(1)).max(1)
+        };
     get_priority_config(per_file_for_priority, cli)
 }