dirsql 0.3.88__tar.gz → 0.3.89__tar.gz

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

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

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

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

{dirsql-0.3.88/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.88/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**. `on-file = "extract.py {path}"` |
-| `{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.88 → 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.88"
+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.88/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.88 → 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**. `on-file = "extract.py {path}"` |
-| `{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.88 → 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": 1783633566,
+  "ran_at": 1783636465,
   "exit_code": 0,
-  "commit": "8c54e97f3b78c679885b4a2fd7b7d0f8a543001b"
+  "commit": "3b275ebe12b28777822a7dbcc9d8c155697106d7"
 }

{dirsql-0.3.88 → 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.88 → 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**. `on-file = "extract.py {path}"` |
-| `{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.88 → 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,10 +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`) and `{root}` (the
-/// index root). `{path}` falls back to the absolute path when the file is not
-/// under `root`. A template that omits a placeholder simply never receives its
-/// value — nothing is appended.
+/// 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 —
@@ -1444,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::new("path", rel),
+        Placeholder::new("path", abs_path),
         Placeholder::new("root", root.to_string_lossy().into_owned()),
     ];
 
@@ -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() {