dirsql 0.3.85__tar.gz → 0.3.87__tar.gz

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

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

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

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

{dirsql-0.3.85/packages/rust → dirsql-0.3.87}/docs/reference/config.md

@@ -3,7 +3,9 @@
 `.dirsql.toml` is a TOML file with one optional `[dirsql]` section, zero or
 more `[[dirsql.extension]]` entries, and zero or more `[[table]]` entries.
 An empty file is valid. A missing `[dirsql]` section behaves as an
-all-defaults one. Unknown keys are ignored.
+all-defaults one. Unknown keys are a parse error at every level (top level,
+`[dirsql]`, `[[table]]`, `[[dirsql.extension]]`) — a typo or a removed key
+fails loudly, naming the offending key, rather than silently no-opping.
 
 The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
@@ -136,6 +138,8 @@ Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the
 SDKs raise/reject) when:
 
 - The TOML is malformed.
+- Any table contains an unknown key (top level, `[dirsql]`, `[[table]]`, or
+  `[[dirsql.extension]]`). The error names the offending key.
 - A `[[table]]` entry omits `ddl` or `glob`.
 - A `[[dirsql.extension]]` entry omits `path`, or `path` is empty.
 - `on-file`, `pre-query`, or `post-query` is present but empty/whitespace.

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

@@ -102,7 +102,6 @@ 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. |
-| `{abspath}` | The matched file's absolute path. |
 | `{root}` | The index root directory. |
 
 ### `pre-query`

{dirsql-0.3.85 → dirsql-0.3.87}/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.85"
+version = "0.3.87"
 # 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.85 → dirsql-0.3.87/packages/python}/docs/reference/config.md

@@ -3,7 +3,9 @@
 `.dirsql.toml` is a TOML file with one optional `[dirsql]` section, zero or
 more `[[dirsql.extension]]` entries, and zero or more `[[table]]` entries.
 An empty file is valid. A missing `[dirsql]` section behaves as an
-all-defaults one. Unknown keys are ignored.
+all-defaults one. Unknown keys are a parse error at every level (top level,
+`[dirsql]`, `[[table]]`, `[[dirsql.extension]]`) — a typo or a removed key
+fails loudly, naming the offending key, rather than silently no-opping.
 
 The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
@@ -136,6 +138,8 @@ Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the
 SDKs raise/reject) when:
 
 - The TOML is malformed.
+- Any table contains an unknown key (top level, `[dirsql]`, `[[table]]`, or
+  `[[dirsql.extension]]`). The error names the offending key.
 - A `[[table]]` entry omits `ddl` or `glob`.
 - A `[[dirsql.extension]]` entry omits `path`, or `path` is empty.
 - `on-file`, `pre-query`, or `post-query` is present but empty/whitespace.

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

@@ -102,7 +102,6 @@ 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. |
-| `{abspath}` | The matched file's absolute path. |
 | `{root}` | The index root directory. |
 
 ### `pre-query`

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

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

{dirsql-0.3.85/packages/python → dirsql-0.3.87/packages/rust}/docs/reference/config.md

@@ -3,7 +3,9 @@
 `.dirsql.toml` is a TOML file with one optional `[dirsql]` section, zero or
 more `[[dirsql.extension]]` entries, and zero or more `[[table]]` entries.
 An empty file is valid. A missing `[dirsql]` section behaves as an
-all-defaults one. Unknown keys are ignored.
+all-defaults one. Unknown keys are a parse error at every level (top level,
+`[dirsql]`, `[[table]]`, `[[dirsql.extension]]`) — a typo or a removed key
+fails loudly, naming the offending key, rather than silently no-opping.
 
 The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
@@ -136,6 +138,8 @@ Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the
 SDKs raise/reject) when:
 
 - The TOML is malformed.
+- Any table contains an unknown key (top level, `[dirsql]`, `[[table]]`, or
+  `[[dirsql.extension]]`). The error names the offending key.
 - A `[[table]]` entry omits `ddl` or `glob`.
 - A `[[dirsql.extension]]` entry omits `path`, or `path` is empty.
 - `on-file`, `pre-query`, or `post-query` is present but empty/whitespace.

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

@@ -102,7 +102,6 @@ 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. |
-| `{abspath}` | The matched file's absolute path. |
 | `{root}` | The index root directory. |
 
 ### `pre-query`

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

@@ -9,7 +9,7 @@
 //!   single argument — but no shell is ever invoked: there is no globbing,
 //!   piping, or variable expansion. To get a real shell, ask for one
 //!   explicitly (`sh -c '…'`).
-//! - **Placeholders.** `{path}`, `{args}`, `{abspath}`, `{root}` (and any
+//! - **Placeholders.** `{path}`, `{args}`, `{root}` (and any
 //!   others a caller supplies) are substituted into whole argv tokens, every
 //!   occurrence. Substitution is single-pass and left-to-right per token, so a
 //!   value that itself contains `{…}` is never re-scanned — a substituted value
@@ -437,10 +437,7 @@ mod tests {
 
     #[test]
     fn substitute_only_placeholder_is_dropped_when_absent() {
-        assert_eq!(
-            argv("run", &[Placeholder::new("abspath", "/tmp/x")]),
-            ["run"]
-        );
+        assert_eq!(argv("run", &[Placeholder::new("extra", "/tmp/x")]), ["run"]);
     }
 
     #[test]

{dirsql-0.3.85 → dirsql-0.3.87}/packages/rust/src/config.rs

@@ -269,12 +269,14 @@ pub struct TableConfig {
 }
 
 #[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
 struct RawConfig {
     dirsql: Option<RawDirsql>,
     table: Option<Vec<RawTable>>,
 }
 
 #[derive(Deserialize, Default)]
+#[serde(deny_unknown_fields)]
 struct RawDirsql {
     root: Option<PathBuf>,
     ignore: Option<Vec<String>>,
@@ -290,12 +292,14 @@ struct RawDirsql {
 }
 
 #[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
 struct RawExtension {
     path: Option<String>,
     entrypoint: Option<String>,
 }
 
 #[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
 struct RawTable {
     ddl: Option<String>,
     glob: Option<String>,
@@ -587,17 +591,55 @@ glob = "c/*.yaml"
     }
 
     #[test]
-    fn unknown_top_level_keys_in_table_are_rejected() {
-        // serde ignores unknown table keys, so configs still carrying removed
-        // keys (e.g. `format`) load with the key dropped.
+    fn unknown_key_in_table_is_rejected() {
+        // An unknown `[[table]]` key (a removed key like `format`, or a typo)
+        // is a hard parse error naming the key, never silently dropped.
         let toml = r#"
 [[table]]
 ddl = "CREATE TABLE t (path TEXT)"
 glob = "*.json"
 format = "json"
 "#;
-        let config = load_config_str(toml).unwrap();
-        assert_eq!(config.tables.len(), 1);
+        let err = load_config_str(toml).unwrap_err();
+        assert!(matches!(err, ConfigError::Toml(_)), "got: {err:?}");
+        assert!(err.to_string().contains("format"), "got: {err}");
+    }
+
+    #[test]
+    fn unknown_key_in_dirsql_section_is_rejected() {
+        // A misspelled `[dirsql]` key (`persistpath` for `persist_path`) errors
+        // rather than silently no-opping.
+        let toml = r#"
+[dirsql]
+persistpath = "cache.db"
+"#;
+        let err = load_config_str(toml).unwrap_err();
+        assert!(matches!(err, ConfigError::Toml(_)), "got: {err:?}");
+        assert!(err.to_string().contains("persistpath"), "got: {err}");
+    }
+
+    #[test]
+    fn unknown_top_level_key_is_rejected() {
+        // A stray key outside any known section (`glbo` for `[dirsql]`) errors.
+        let toml = r#"
+glbo = "typo"
+"#;
+        let err = load_config_str(toml).unwrap_err();
+        assert!(matches!(err, ConfigError::Toml(_)), "got: {err:?}");
+        assert!(err.to_string().contains("glbo"), "got: {err}");
+    }
+
+    #[test]
+    fn unknown_key_in_extension_is_rejected() {
+        // A misspelled `[[dirsql.extension]]` key (`entrypont`) errors.
+        let toml = r#"
+[[dirsql.extension]]
+path = "vec0.so"
+entrypont = "sqlite3_vec_init"
+"#;
+        let err = load_config_str(toml).unwrap_err();
+        assert!(matches!(err, ConfigError::Toml(_)), "got: {err:?}");
+        assert!(err.to_string().contains("entrypont"), "got: {err}");
     }
 
     #[test]

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

@@ -1428,9 +1428,8 @@ fn build_tables_from_config(
 /// into rows.
 ///
 /// Placeholders: `{path}` (the file relative to `root`, append-if-absent so
-/// `cmd` and `cmd {path}` behave identically), `{abspath}` (the absolute path),
-/// and `{root}` (the index root). `{path}` falls back to the absolute path
-/// when the file is not under `root`.
+/// `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`.
 ///
 /// Per-file isolation: any failure — a spawn/exit/timeout error from
 /// [`command::run_command`], or output that is not a JSON array of objects —
@@ -1451,7 +1450,6 @@ fn run_on_file(
         .unwrap_or_else(|_| abs_path.to_string());
     let placeholders = [
         Placeholder::append("path", rel),
-        Placeholder::new("abspath", abs_path),
         Placeholder::new("root", root.to_string_lossy().into_owned()),
     ];
 
@@ -2890,6 +2888,25 @@ mod internal_tests {
         assert_eq!(rows[0]["n"], Value::Integer(1));
     }
 
+    /// `{abspath}` is not in the substitution table: it is left literal like any
+    /// unknown `{…}`, so `printf` receives the string `{abspath}` verbatim. The
+    /// template references `{path}` so that arg is the real path (and no path is
+    /// appended), isolating the `{abspath}` behavior in the `q` column.
+    #[test]
+    fn run_on_file_does_not_substitute_abspath() {
+        let dir = TempDir::new().unwrap();
+        let abs = dir.path().join("f.txt");
+        let rows = run_on_file(
+            r#"printf '[{"p":"%s","q":"%s"}]' {path} {abspath}"#,
+            &abs.to_string_lossy(),
+            dir.path(),
+            dir.path(),
+            command::DEFAULT_COMMAND_TIMEOUT,
+        );
+        assert_eq!(rows.len(), 1);
+        assert_eq!(rows[0]["q"], Value::Text("{abspath}".into()));
+    }
+
     /// A command that cannot be spawned yields no rows (per-file isolation).
     #[test]
     fn run_on_file_returns_no_rows_on_spawn_failure() {