dirsql 0.3.87__tar.gz → 0.3.89__tar.gz

{dirsql-0.3.87 → dirsql-0.3.89}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.87"
+version = "0.3.89"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.87 → dirsql-0.3.89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.87
+Version: 0.3.89
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index
 Author: Kevin Scott

{dirsql-0.3.87/packages/python → dirsql-0.3.89}/docs/howto/extract-from-contents.md

@@ -23,7 +23,7 @@ glob    = "books/*.json"
 on-file = "jq -c '[{title, author, year}]' {path}"
 ```
 
-`{path}` is the matched file, relative to the index root — one of the
+`{path}` is the matched file's absolute path — one of the
 placeholders defined by the
 [command hook contract](../reference/hooks.md#on-file), which also covers
 the argv splitting, working directory, stdout protocol, and timeout shared

{dirsql-0.3.87/packages/rust → dirsql-0.3.89}/docs/reference/hooks.md

@@ -101,8 +101,8 @@ row-mapping rules.
 
 | Placeholder | Value |
 |---|---|
-| `{path}` | The matched file's path **relative to the index root**. Appended automatically as a final argument when the command omits it, so `extract.py` and `extract.py {path}` behave identically. |
-| `{root}` | The index root directory. |
+| `{path}` | The matched file's **absolute** path. `on-file = "extract.py {path}"` — self-sufficient from any working directory, so the command resolves it even when the config lives outside the index. |
+| `{root}` | The index root directory. Derive a root-relative path with `relpath({path}, {root})`. |
 
 ### `pre-query`
 

{dirsql-0.3.87 → dirsql-0.3.89}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.3.87"
+version = "0.3.89"
 # abi3 note: the `abi3-py311` pyo3 feature (below) builds ONE stable-ABI
 # `cp311-abi3` wheel per platform that loads on every CPython >= 3.11
 # (matching `pyproject.toml`'s `requires-python = ">=3.11"`), instead of

{dirsql-0.3.87/packages/rust → dirsql-0.3.89/packages/python}/docs/howto/extract-from-contents.md

@@ -23,7 +23,7 @@ glob    = "books/*.json"
 on-file = "jq -c '[{title, author, year}]' {path}"
 ```
 
-`{path}` is the matched file, relative to the index root — one of the
+`{path}` is the matched file's absolute path — one of the
 placeholders defined by the
 [command hook contract](../reference/hooks.md#on-file), which also covers
 the argv splitting, working directory, stdout protocol, and timeout shared

{dirsql-0.3.87 → dirsql-0.3.89}/packages/python/docs/reference/hooks.md

@@ -101,8 +101,8 @@ row-mapping rules.
 
 | Placeholder | Value |
 |---|---|
-| `{path}` | The matched file's path **relative to the index root**. Appended automatically as a final argument when the command omits it, so `extract.py` and `extract.py {path}` behave identically. |
-| `{root}` | The index root directory. |
+| `{path}` | The matched file's **absolute** path. `on-file = "extract.py {path}"` — self-sufficient from any working directory, so the command resolves it even when the config lives outside the index. |
+| `{root}` | The index root directory. Derive a root-relative path with `relpath({path}, {root})`. |
 
 ### `pre-query`
 

{dirsql-0.3.87 → dirsql-0.3.89}/packages/python/e2e-attestation.json

@@ -1,6 +1,6 @@
 {
   "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1783632150,
+  "ran_at": 1783636465,
   "exit_code": 0,
-  "commit": "89d9e986dee0ee7abaab16b6d43e9b17543d8f01"
+  "commit": "3b275ebe12b28777822a7dbcc9d8c155697106d7"
 }

{dirsql-0.3.87 → dirsql-0.3.89/packages/rust}/docs/howto/extract-from-contents.md

@@ -23,7 +23,7 @@ glob    = "books/*.json"
 on-file = "jq -c '[{title, author, year}]' {path}"
 ```
 
-`{path}` is the matched file, relative to the index root — one of the
+`{path}` is the matched file's absolute path — one of the
 placeholders defined by the
 [command hook contract](../reference/hooks.md#on-file), which also covers
 the argv splitting, working directory, stdout protocol, and timeout shared

{dirsql-0.3.87 → dirsql-0.3.89/packages/rust}/docs/reference/hooks.md

@@ -101,8 +101,8 @@ row-mapping rules.
 
 | Placeholder | Value |
 |---|---|
-| `{path}` | The matched file's path **relative to the index root**. Appended automatically as a final argument when the command omits it, so `extract.py` and `extract.py {path}` behave identically. |
-| `{root}` | The index root directory. |
+| `{path}` | The matched file's **absolute** path. `on-file = "extract.py {path}"` — self-sufficient from any working directory, so the command resolves it even when the config lives outside the index. |
+| `{root}` | The index root directory. Derive a root-relative path with `relpath({path}, {root})`. |
 
 ### `pre-query`
 

{dirsql-0.3.87 → dirsql-0.3.89}/packages/rust/src/command.rs

@@ -15,9 +15,6 @@
 //!   value that itself contains `{…}` is never re-scanned — a substituted value
 //!   is always exactly one argv element, keeping values with spaces (and
 //!   untrusted input) injection-safe. An unknown `{…}` is left literal.
-//! - **append-if-absent.** A [`Placeholder`] marked [`Placeholder::append`] is
-//!   appended as a final argv element when its `{name}` does not appear in the
-//!   template (the `on-file` ergonomic: `cmd {path}` and `cmd` behave the same).
 //! - **cwd / env / timeout.** The child runs in `cwd` (the config file's
 //!   directory), inherits dirsql's environment (so `uvx --with …` / `npx …`
 //!   dependency resolution works), and is killed if it exceeds `timeout`.
@@ -44,34 +41,21 @@ pub const DEFAULT_COMMAND_TIMEOUT: Duration = Duration::from_secs(30);
 /// A named placeholder substituted into a command's argv.
 ///
 /// `name` is the bare identifier (no braces): a `name` of `path` matches the
-/// template token `{path}`.
+/// template token `{path}`. Substitution only — a placeholder whose `{name}`
+/// never appears in the template is a no-op.
 #[derive(Debug, Clone)]
 pub struct Placeholder {
     pub name: String,
     pub value: String,
-    /// When `true` and the template contains no `{name}`, `value` is appended
-    /// as a final argv element instead of being dropped.
-    pub append_if_absent: bool,
 }
 
 impl Placeholder {
-    /// A substitute-only placeholder: replaces `{name}` where it appears, and
-    /// is a no-op when the template omits it.
+    /// Replaces `{name}` where it appears, and is a no-op when the template
+    /// omits it.
     pub fn new(name: impl Into<String>, value: impl Into<String>) -> Self {
         Self {
             name: name.into(),
             value: value.into(),
-            append_if_absent: false,
-        }
-    }
-
-    /// A placeholder that is *appended* to argv when the template omits its
-    /// `{name}` (the `on-file` `{path}` ergonomic).
-    pub fn append(name: impl Into<String>, value: impl Into<String>) -> Self {
-        Self {
-            name: name.into(),
-            value: value.into(),
-            append_if_absent: true,
         }
     }
 }
@@ -246,32 +230,23 @@ fn build_argv(command: &str, placeholders: &[Placeholder]) -> Result<Vec<String>
         return Err(CommandError::InvalidCommand(command.to_string()));
     }
 
-    let mut used = vec![false; placeholders.len()];
-    let mut argv: Vec<String> = tokens
+    let argv: Vec<String> = tokens
         .iter()
-        .map(|token| substitute(token, placeholders, &mut used))
+        .map(|token| substitute(token, placeholders))
         .collect();
 
-    for (i, ph) in placeholders.iter().enumerate() {
-        if ph.append_if_absent && !used[i] {
-            argv.push(ph.value.clone());
-        }
-    }
-
     Ok(argv)
 }
 
 /// Replace every `{name}` in `token` with its placeholder value in a single
 /// left-to-right pass. Injected values are never re-scanned, so an untrusted
 /// value containing `{…}` is inert. Unknown `{…}` sequences are left literal.
-/// Marks `used[i]` for each placeholder that was substituted at least once.
-fn substitute(token: &str, placeholders: &[Placeholder], used: &mut [bool]) -> String {
+fn substitute(token: &str, placeholders: &[Placeholder]) -> String {
     let mut out = String::with_capacity(token.len());
     let mut i = 0;
     while i < token.len() {
         if let Some((idx, consumed)) = match_placeholder(token, i, placeholders) {
             out.push_str(&placeholders[idx].value);
-            used[idx] = true;
             i += consumed;
             continue;
         }
@@ -417,27 +392,8 @@ mod tests {
     }
 
     #[test]
-    fn append_if_absent_appends_when_the_template_omits_the_token() {
-        assert_eq!(
-            argv("extract.py", &[Placeholder::append("path", "docs/a.md")]),
-            ["extract.py", "docs/a.md"]
-        );
-    }
-
-    #[test]
-    fn append_if_absent_does_not_append_when_the_token_is_present() {
-        assert_eq!(
-            argv(
-                "extract.py --file {path}",
-                &[Placeholder::append("path", "docs/a.md")]
-            ),
-            ["extract.py", "--file", "docs/a.md"]
-        );
-    }
-
-    #[test]
-    fn substitute_only_placeholder_is_dropped_when_absent() {
-        assert_eq!(argv("run", &[Placeholder::new("extra", "/tmp/x")]), ["run"]);
+    fn a_placeholder_the_template_omits_is_dropped() {
+        assert_eq!(argv("run", &[Placeholder::new("path", "/tmp/x")]), ["run"]);
     }
 
     #[test]
@@ -476,12 +432,6 @@ mod tests {
         assert!(tail.ends_with('x'));
     }
 
-    #[test]
-    fn placeholder_constructors_set_append_flag() {
-        assert!(!Placeholder::new("a", "b").append_if_absent);
-        assert!(Placeholder::append("a", "b").append_if_absent);
-    }
-
     // The run_command tests spawn real `sh`/`echo`/`cat`. Their test code must
     // statically reference only `super::` items (plus pure std) to satisfy the
     // unit-lint isolation rule.

{dirsql-0.3.87 → dirsql-0.3.89}/packages/rust/src/lib.rs

@@ -992,8 +992,9 @@ impl DirSQLBuilder {
             };
             config_root = Some(resolved_root.clone());
 
-            // `on-file` commands run in the config file's directory and compute
-            // `{path}` relative to the resolved index root.
+            // `on-file` commands run in the config file's directory; `{path}`
+            // is the matched file's absolute path and `{root}` the resolved
+            // index root.
             let cfg_tables = build_tables_from_config(&cfg, &cfg_parent, &resolved_root)?;
             tables.extend(cfg_tables);
             ignore.extend(cfg.ignore);
@@ -1379,7 +1380,7 @@ fn relative_path(root: &Path, path: &Path) -> String {
 /// array of row objects on stdout, which becomes the file's rows (filesystem
 /// facts are still merged on top, user values winning). `config_dir` is the
 /// command's working directory (the config file's parent) and `root` is the
-/// resolved index root used to compute the `{path}` placeholder. Each run is
+/// resolved index root exposed as the `{root}` placeholder. Each run is
 /// bounded by the global `[dirsql].hook-timeout` key when present, falling
 /// back to [`command::DEFAULT_COMMAND_TIMEOUT`].
 fn build_tables_from_config(
@@ -1427,9 +1428,10 @@ fn build_tables_from_config(
 /// Run a table's `on-file` command for one matched file and parse its output
 /// into rows.
 ///
-/// Placeholders: `{path}` (the file relative to `root`, append-if-absent so
-/// `cmd` and `cmd {path}` behave identically) and `{root}` (the index root).
-/// `{path}` falls back to the absolute path when the file is not under `root`.
+/// Placeholders: `{path}` (the file's absolute path) and `{root}` (the index
+/// root). An absolute `{path}` is self-sufficient from any cwd, so a hook whose
+/// config lives outside the index still resolves it. A template that omits a
+/// placeholder simply never receives its value — nothing is appended.
 ///
 /// Per-file isolation: any failure — a spawn/exit/timeout error from
 /// [`command::run_command`], or output that is not a JSON array of objects —
@@ -1443,13 +1445,8 @@ fn run_on_file(
     root: &Path,
     timeout: Duration,
 ) -> Vec<Row> {
-    let abs = Path::new(abs_path);
-    let rel = abs
-        .strip_prefix(root)
-        .map(|p| p.to_string_lossy().into_owned())
-        .unwrap_or_else(|_| abs_path.to_string());
     let placeholders = [
-        Placeholder::append("path", rel),
+        Placeholder::new("path", abs_path),
         Placeholder::new("root", root.to_string_lossy().into_owned()),
     ];
 
@@ -2874,9 +2871,8 @@ mod internal_tests {
     fn run_on_file_parses_command_json_output() {
         let dir = TempDir::new().unwrap();
         let abs = dir.path().join("f.txt");
-        // `{path}` is append-if-absent, so the file path lands as a trailing
-        // argv element; `printf` with a conversion-free format ignores it,
-        // keeping the JSON payload clean.
+        // The template omits every placeholder, so nothing is appended; the
+        // `printf` payload is the whole output.
         let rows = run_on_file(
             "printf '[{\"n\":1}]'",
             &abs.to_string_lossy(),
@@ -2907,6 +2903,29 @@ mod internal_tests {
         assert_eq!(rows[0]["q"], Value::Text("{abspath}".into()));
     }
 
+    /// `{path}` interpolates the matched file's **absolute** path (not a
+    /// root-relative one). The command echoes its `{path}` argument back as a
+    /// row value, and we assert it is byte-for-byte the absolute path even when
+    /// the file sits directly under `root` (the case the old `strip_prefix`
+    /// would have shortened to a bare relative path).
+    #[test]
+    fn run_on_file_passes_absolute_path_for_path_placeholder() {
+        let dir = TempDir::new().unwrap();
+        let abs = dir.path().join("f.txt");
+        let rows = run_on_file(
+            r#"sh -c "printf '[{\"p\":\"%s\"}]' \"$1\"" sh {path}"#,
+            &abs.to_string_lossy(),
+            dir.path(),
+            dir.path(),
+            command::DEFAULT_COMMAND_TIMEOUT,
+        );
+        assert_eq!(rows.len(), 1);
+        assert_eq!(
+            rows[0]["p"],
+            Value::Text(abs.to_string_lossy().into_owned())
+        );
+    }
+
     /// A command that cannot be spawned yields no rows (per-file isolation).
     #[test]
     fn run_on_file_returns_no_rows_on_spawn_failure() {