dirsql 0.4.92__tar.gz → 0.4.93__tar.gz

{dirsql-0.4.92 → dirsql-0.4.93}/Cargo.lock

@@ -552,7 +552,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.92"
+version = "0.4.93"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -603,7 +603,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.92"
+version = "0.4.93"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.92 → dirsql-0.4.93}/PKG-INFO

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

{dirsql-0.4.92 → dirsql-0.4.93}/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.92"
+version = "0.4.93"
 # 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.93/packages/python/changelog.d/2026-10-06-config-links.md

@@ -0,0 +1,3 @@
+**Changed** A declared `[[table]] glob` skips `node_modules` unless the glob
+names it, and follows symlinks, as a path-table does. `**/*.js` no longer lists
+`node_modules/...`; `link.md -> top.md` and `linkdir/*` now list their rows.

dirsql-0.4.93/packages/python/e2e-attestations/claude-1258-config-links.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/glob_speed_symlink_test.py tests/e2e/glob_speed_node_modules_test.py tests/e2e/glob_speed_dotfiles_test.py tests/e2e/glob_speed_matchers_test.py tests/e2e/query_contract_test.py -x -q",
+  "ran_at": 1791338642,
+  "exit_code": 0,
+  "commit": "81890d53f01c2d6e6e833e0748a6ff952e3382c5",
+  "branch": "claude/1258-config-links"
+}

dirsql-0.4.93/packages/python/migrations.d/2026-10-06-config-links.md

@@ -0,0 +1,43 @@
+### Config globs skip node_modules unless named, and follow symlinks
+
+#### Summary
+
+`glob = "**/*.js"` used to list files under any `node_modules`; it now does
+not, unless a component of the glob is `node_modules`. Symlinked files and
+directories, which a config glob used to ignore, are now followed as in a
+path-table and in bash.
+
+#### Required changes
+
+| Before | After |
+| --- | --- |
+| `glob = "**/*.js"` (included `node_modules/`) | `glob = "node_modules/**/*.js"` to list it |
+
+#### Deprecations removed
+
+_None._
+
+#### Behavior changes without code changes
+
+- A glob with no `node_modules` component never matches under one.
+- A symlinked file or directory the glob reaches now yields rows.
+
+#### Verification
+
+```bash
+cd "$(mktemp -d)"
+mkdir real node_modules
+echo '[{"p":"r"}]' > real/r.json
+echo '[{"p":"n"}]' > node_modules/n.json
+ln -s real linkdir
+cat > .dirsql.toml <<'TOML'
+[[table]]
+name = "t"
+glob = "**/*.json"
+ddl = "CREATE TABLE t (p TEXT)"
+on-file = "jq -sc add"
+TOML
+dirsql query "SELECT p FROM t" -c .dirsql.toml
+# expected: no row from node_modules; rows for real/ (symlinked linkdir/ is
+# reached by `linkdir/*.json`, not by `**`)
+```

{dirsql-0.4.92 → dirsql-0.4.93}/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.92"
+version = "0.4.93"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.92 → dirsql-0.4.93}/packages/rust/src/matcher.rs

@@ -1,5 +1,5 @@
 use crate::posix_class::expand_posix_classes;
-use crate::scanner::{PathGlob, compile_glob};
+use crate::scanner::{PathGlob, compile_glob, compile_globs};
 use globset::GlobBuilder;
 use regex::{Regex, RegexBuilder};
 use std::ffi::OsStr;
@@ -80,23 +80,30 @@ pub struct MatchResult {
     pub table_name: String,
 }
 
+const NODE_MODULES: &str = "node_modules";
+
 #[derive(Clone)]
 struct PatternEntry {
     pattern: PathGlob,
     table_name: String,
+    names_node_modules: bool,
 }
 
 /// Maps file paths to table names based on glob patterns.
 /// Every matching pattern fires: a file matching N patterns yields N
 /// `MatchResult`s (one per table), so a file can belong to multiple tables.
-/// An ignore list filters paths entirely. `{name}` placeholders in glob
-/// patterns are accepted and behave like `*`.
+/// An ignore list filters paths entirely.
 #[derive(Clone)]
 pub struct TableMatcher {
     entries: Vec<PatternEntry>,
     ignore_set: Vec<Pattern>,
     ignore_dir_set: Vec<Pattern>,
     gitignore: bool,
+    walk: PathGlob,
+}
+
+fn has_node_modules_component(path: &Path) -> bool {
+    path.components().any(|c| c.as_os_str() == NODE_MODULES)
 }
 
 impl TableMatcher {
@@ -107,8 +114,11 @@ impl TableMatcher {
             entries.push(PatternEntry {
                 pattern: compile_glob(pattern)?,
                 table_name: table_name.to_string(),
+                names_node_modules: pattern.split('/').any(|c| c == NODE_MODULES),
             });
         }
+        let globs: Vec<&str> = mappings.iter().map(|(pattern, _)| *pattern).collect();
+        let walk = compile_globs(&globs)?;
 
         let mut ignore_set = Vec::new();
         let mut ignore_dir_set = Vec::new();
@@ -124,6 +134,7 @@ impl TableMatcher {
             ignore_set,
             ignore_dir_set,
             gitignore: false,
+            walk,
         })
     }
 
@@ -143,18 +154,27 @@ impl TableMatcher {
     pub fn match_all(&self, path: &Path) -> Vec<MatchResult> {
         self.entries
             .iter()
-            .filter(|entry| entry.pattern.is_match_unhidden(path))
+            .filter(|entry| {
+                entry.pattern.is_match_unhidden(path)
+                    && (entry.names_node_modules || !has_node_modules_component(path))
+            })
             .map(|entry| MatchResult {
                 table_name: entry.table_name.clone(),
             })
             .collect()
     }
 
-    /// Whether any table's glob spells the dot-named `name`.
-    pub(crate) fn spells_dot_name(&self, name: &OsStr) -> bool {
-        self.entries
-            .iter()
-            .any(|entry| entry.pattern.spells_dot_name(name))
+    /// The one glob a walk for every table at once follows.
+    pub(crate) fn walk_glob(&self) -> &PathGlob {
+        &self.walk
+    }
+
+    /// Whether the walk may skip a directory called `name` outright: it is
+    /// `node_modules` and no table's glob names it.
+    pub(crate) fn prunes_directory(&self, name: &OsStr) -> bool {
+        name == NODE_MODULES
+            && !self.entries.is_empty()
+            && !self.entries.iter().any(|e| e.names_node_modules)
     }
 
     /// Returns true if the path matches any ignore pattern.
@@ -196,6 +216,30 @@ mod tests {
         assert!(matcher.with_gitignore(true).respects_gitignore());
     }
 
+    #[test]
+    fn node_modules_is_skipped_unless_a_table_names_it() {
+        let matcher =
+            TableMatcher::new(&[("**/*.js", "all"), ("node_modules/*.js", "nm")], &[]).unwrap();
+        assert_eq!(names(&matcher, "pkg/a.js"), vec!["all"]);
+        assert_eq!(
+            names(&matcher, "pkg/node_modules/a.js"),
+            Vec::<String>::new()
+        );
+        assert_eq!(names(&matcher, "node_modules/a.js"), vec!["nm"]);
+    }
+
+    #[test]
+    fn the_walk_prunes_node_modules_only_while_no_table_names_it() {
+        let name = OsStr::new("node_modules");
+        let plain = TableMatcher::new(&[("**/*.js", "t")], &[]).unwrap();
+        let naming = TableMatcher::new(&[("node_modules/*.js", "t")], &[]).unwrap();
+        let none = TableMatcher::new(&[], &[]).unwrap();
+        assert!(plain.prunes_directory(name));
+        assert!(!plain.prunes_directory(OsStr::new("src")));
+        assert!(!naming.prunes_directory(name));
+        assert!(!none.prunes_directory(name));
+    }
+
     #[test]
     fn match_all_returns_empty_for_no_match() {
         let matcher = TableMatcher::new(&[("*.csv", "data")], &[]).unwrap();

{dirsql-0.4.92 → dirsql-0.4.93}/packages/rust/src/scanner.rs

@@ -104,7 +104,7 @@ fn scan_below(
     // regardless of the absolute root directory.
     let walker = Walk {
         ignore: matcher,
-        glob: None,
+        glob: Some(matcher.walk_glob()),
         gitignore,
         in_repo: repo.is_some(),
         frames: repo.map_or_else(Vec::new, |top| {
@@ -318,7 +318,16 @@ impl PathGlob {
 /// it a lone `*` would cross `/` and the explicit non-recursive spelling would
 /// silently recurse. `**` still crosses separators.
 pub fn compile_glob(pattern: &str) -> Result<PathGlob, GlobError> {
-    let words = crate::brace::expand(pattern);
+    compile_globs(&[pattern])
+}
+
+/// One [`PathGlob`] over every word of every pattern: the walk a set of
+/// tables shares, entering what any of them could reach.
+pub fn compile_globs(patterns: &[&str]) -> Result<PathGlob, GlobError> {
+    let words: Vec<String> = patterns
+        .iter()
+        .flat_map(|pattern| crate::brace::expand(pattern))
+        .collect();
     let mut files = Vec::new();
     let mut spelled_dot_names = Vec::new();
     for word in &words {
@@ -403,7 +412,11 @@ fn walk(
     visit: &mut dyn FnMut(PathBuf, &Path),
 ) {
     let rel = start.strip_prefix(root).unwrap_or(start);
-    let states = walker.glob.map_or_else(Vec::new, PathGlob::start);
+    let states = walker.glob.map_or_else(Vec::new, |glob| {
+        rel.components().fold(glob.start(), |states, component| {
+            glob.step(&states, component.as_os_str(), Kind::Dir)
+        })
+    });
     let place = Place {
         walk: walker,
         dir: start.to_path_buf(),
@@ -590,16 +603,16 @@ impl Walk<'_> {
     /// `.gitignore` files in force.
     fn admits(&self, depth: usize, is_dir: bool, name: &OsStr, path: &Path, rel: &Path) -> bool {
         should_descend(depth, is_dir, name, rel, self.ignore)
+            && !(is_dir && self.ignore.prunes_directory(name))
             && self.admits_name(name)
             && (self.frames.is_empty() || !is_gitignored(&self.frames, path, is_dir))
     }
 
     fn admits_name(&self, name: &OsStr) -> bool {
-        !is_dot_named(name)
-            || match self.glob {
-                Some(glob) => glob.spells_dot_name(name),
-                None => self.ignore.spells_dot_name(name),
-            }
+        match self.glob {
+            Some(glob) => !is_dot_named(name) || glob.spells_dot_name(name),
+            None => true,
+        }
     }
 
     fn next_states(&self, states: &[usize], name: &OsStr, kind: Kind) -> Vec<usize> {
@@ -1405,23 +1418,21 @@ mod tests {
     }
 
     #[test]
-    fn a_table_walk_admits_a_dot_name_only_a_table_glob_spells() {
-        let ignore = TableMatcher::new(&[(".env", "t")], &[]).unwrap();
-        let walk = walk_with(&ignore, None, Vec::new());
-        assert!(walk.admits(
-            1,
-            false,
-            OsStr::new(".env"),
-            Path::new("/r/.env"),
-            Path::new(".env")
-        ));
-        assert!(!walk.admits(
-            1,
-            false,
-            OsStr::new(".other"),
-            Path::new("/r/.other"),
-            Path::new(".other")
-        ));
+    fn a_table_walk_skips_a_node_modules_directory_no_table_names() {
+        let ignore = TableMatcher::new(&[("**/*.js", "t")], &[]).unwrap();
+        let walk = walk_with(&ignore, Some(ignore.walk_glob()), Vec::new());
+        let admits = |is_dir, name: &str| {
+            walk.admits(
+                1,
+                is_dir,
+                OsStr::new(name),
+                Path::new(name),
+                Path::new(name),
+            )
+        };
+        assert!(!admits(true, "node_modules"));
+        assert!(admits(false, "node_modules"));
+        assert!(admits(true, "src"));
     }
 
     #[test]