dirsql 0.4.78__tar.gz → 0.4.79__tar.gz

{dirsql-0.4.78 → dirsql-0.4.79}/Cargo.lock

@@ -552,7 +552,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.78"
+version = "0.4.79"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -602,7 +602,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.78"
+version = "0.4.79"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.78 → dirsql-0.4.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.78
+Version: 0.4.79
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.78 → dirsql-0.4.79}/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.4.78"
+version = "0.4.79"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.79/packages/python/e2e-attestations/claude-1351-dot-dirs.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1791299799,
+  "exit_code": 0,
+  "commit": "bc8156e317596d423f903feb4014d3ddda21c960",
+  "branch": "claude/1351-dot-dirs"
+}

{dirsql-0.4.78 → dirsql-0.4.79}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.78"
+version = "0.4.79"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.78 → dirsql-0.4.79}/packages/rust/src/scanner.rs

@@ -168,8 +168,10 @@ fn is_wanted(glob: &PathGlob, ignore: &TableMatcher, rel_path: &Path) -> bool {
 /// where the walk may follow a symlink.
 ///
 /// A component beginning with `.` is spelled; `.claude` and `.env` admit
-/// exactly those names, `.*` any dot-named entry, as in the shell. Every
-/// other dot-named file or directory is skipped, the rule `ls` and `fd` use.
+/// exactly those names, `.*` any dot-named entry, as in the shell, and only at
+/// the depth the component sits: `**` never consumes a dot-named directory.
+/// Every other dot-named file or directory is skipped, the rule `ls` and `fd`
+/// use.
 /// A dot-named symlink is a dot-named entry like any other.
 ///
 /// The symlink rule is bash's (`globstar`, 4.3 and later). A symlinked file
@@ -191,6 +193,9 @@ pub struct PathGlob {
 enum Component {
     AnyDepth,
     Name(Pattern),
+    /// A component spelled with a leading `.`, the only kind that consumes a
+    /// dot-named entry.
+    DotName(Pattern),
     End,
 }
 
@@ -224,11 +229,16 @@ impl PathGlob {
     /// `states`; an `End` means a whole word has matched.
     fn step(&self, states: &[usize], name: &OsStr, kind: Kind) -> Vec<usize> {
         let mut next = Vec::new();
+        let dot_named = is_dot_named(name);
         for &i in states {
             match self.components.get(i) {
+                Some(Component::AnyDepth) if dot_named => {}
                 Some(Component::AnyDepth) if kind == Kind::LinkedDir => next.push(i + 1),
                 Some(Component::AnyDepth) => next.push(i),
-                Some(Component::Name(m)) if m.is_match(Path::new(name)) => next.push(i + 1),
+                Some(Component::Name(m)) if !dot_named && m.is_match(Path::new(name)) => {
+                    next.push(i + 1)
+                }
+                Some(Component::DotName(m)) if m.is_match(Path::new(name)) => next.push(i + 1),
                 _ => {}
             }
         }
@@ -306,6 +316,7 @@ fn compile_components(word: &str) -> Option<Vec<Component>> {
         .split('/')
         .map(|c| match c {
             "**" => Ok(Component::AnyDepth),
+            _ if is_dot_named(OsStr::new(c)) => Pattern::new(c).map(Component::DotName),
             _ => Pattern::new(c).map(Component::Name),
         })
         .collect::<Result<Vec<_>, _>>()
@@ -1294,6 +1305,28 @@ mod tests {
         assert_eq!(states_after(&glob, &[("a", Kind::File)]), vec![0, 1]);
     }
 
+    #[test]
+    fn a_double_star_never_consumes_a_dot_named_entry() {
+        let glob = compile_glob("**/.*").unwrap();
+        assert_eq!(states_after(&glob, &[(".cache", Kind::Dir)]), vec![2]);
+        assert!(states_after(&glob, &[(".cache", Kind::Dir), (".z", Kind::File)]).is_empty());
+    }
+
+    #[test]
+    fn only_a_component_spelled_with_a_dot_consumes_a_dot_named_entry() {
+        let glob = compile_glob("*/x").unwrap();
+        assert!(states_after(&glob, &[(".d", Kind::Dir)]).is_empty());
+        let glob = compile_glob(".*/x").unwrap();
+        assert_eq!(states_after(&glob, &[(".d", Kind::Dir)]), vec![1]);
+    }
+
+    #[test]
+    fn a_spelled_dot_component_consumes_only_the_names_it_matches() {
+        let glob = compile_glob(".claude/x").unwrap();
+        assert_eq!(states_after(&glob, &[(".claude", Kind::Dir)]), vec![1]);
+        assert!(states_after(&glob, &[(".env", Kind::Dir)]).is_empty());
+    }
+
     #[test]
     fn a_double_star_stops_on_a_symlinked_directory() {
         let glob = compile_glob("**/x").unwrap();