dirsql 0.3.99__tar.gz → 0.3.100__tar.gz

{dirsql-0.3.99 → dirsql-0.3.100}/Cargo.lock

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

{dirsql-0.3.99 → dirsql-0.3.100}/PKG-INFO

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

{dirsql-0.3.99 → dirsql-0.3.100}/dirsql/_async.py

@@ -4,7 +4,7 @@ import asyncio
 import os
 
 from dirsql._dirsql import DirSQL as _RustDirSQL
-from dirsql.resolve_config_extensions import resolve_config_extension_specs
+from dirsql.resolve_config_extensions import resolve_configs_extension_specs
 from dirsql.resolve_extension import resolve_extension_path
 
 
@@ -85,6 +85,15 @@ class DirSQL:
         self._tables = tables
         self._ignore = ignore
         self._config = config
+        # A single path or a list of paths; the list merges in order (each
+        # config's [[table]] / ignore / [[dirsql.extension]] accumulate).
+        self._config_paths = (
+            []
+            if config is None
+            else [config]
+            if isinstance(config, str)
+            else list(config)
+        )
         self._persist = persist
         self._persist_path = persist_path
         self._extensions = extensions
@@ -116,8 +125,8 @@ class DirSQL:
         """
         extensions = self._resolved_extensions()
         suppress = False
-        if self._config is not None:
-            config_extensions = resolve_config_extension_specs(self._config)
+        if self._config_paths:
+            config_extensions = resolve_configs_extension_specs(self._config_paths)
             if config_extensions is not None:
                 extensions = [*(extensions or []), *config_extensions]
                 suppress = True
@@ -125,7 +134,7 @@ class DirSQL:
             self._root,
             tables=self._tables,
             ignore=self._ignore,
-            config=self._config,
+            config=self._config_paths or None,
             persist=self._persist,
             persist_path=self._persist_path,
             extensions=extensions,

{dirsql-0.3.99 → dirsql-0.3.100}/dirsql/_dirsql.pyi

@@ -65,7 +65,7 @@ class DirSQL:
         *,
         tables: list[Table] | None = None,
         ignore: list[str] | None = None,
-        config: str | None = None,
+        config: list[str] | None = None,
         persist: bool = False,
         persist_path: str | PathLike[str] | None = None,
         extensions: list[ExtensionSpec] | None = None,

{dirsql-0.3.99 → dirsql-0.3.100}/dirsql/resolve_config_extensions.py

@@ -19,16 +19,11 @@ import tomllib
 from .resolve_extension import is_bare_name, resolve_extension_path
 
 
-def resolve_config_extension_specs(config_path):
-    """Resolve a TOML config's ``[[dirsql.extension]]`` entries to literal paths.
+def _load_extension_entries(config_path):
+    """Return ``(entries, base_dir)`` for a config's ``[[dirsql.extension]]``.
 
-    Returns a list of ``{"path", "entrypoint"}`` dicts -- every entry resolved
-    via :func:`resolve_extension_path` against the config file's parent
-    directory -- when at least one entry's ``path`` is a bare package name.
-    Returns ``None`` when the caller should not intervene: the config is
-    missing, malformed, declares no extensions, or uses only literal paths --
-    leaving the core's own loading (and error reporting) untouched. Raises if
-    a package name cannot be resolved.
+    ``None`` when the config is missing, unreadable/malformed, or declares no
+    extension array -- the caller should leave such configs to the core.
     """
     if not os.path.isfile(config_path):
         return None
@@ -39,20 +34,22 @@ def resolve_config_extension_specs(config_path):
         # Leave a malformed / unreadable config for the core to report.
         return None
 
-    cfg = doc.get("dirsql") or {}
-    entries = cfg.get("extension")
+    entries = (doc.get("dirsql") or {}).get("extension")
     if not isinstance(entries, list):
         return None
-    # Only intervene when at least one path is a bare package name.
-    if not any(
+    return entries, os.path.dirname(os.path.abspath(config_path))
+
+
+def _has_bare_name(entries):
+    return any(
         isinstance(e, dict)
         and isinstance(e.get("path"), str)
         and is_bare_name(e["path"])
         for e in entries
-    ):
-        return None
+    )
 
-    base = os.path.dirname(os.path.abspath(config_path))
+
+def _resolve_entries(entries, base):
     specs = []
     for e in entries:
         entrypoint = e.get("entrypoint")
@@ -65,3 +62,47 @@ def resolve_config_extension_specs(config_path):
             }
         )
     return specs
+
+
+def resolve_config_extension_specs(config_path):
+    """Resolve a TOML config's ``[[dirsql.extension]]`` entries to literal paths.
+
+    Returns a list of ``{"path", "entrypoint"}`` dicts -- every entry resolved
+    via :func:`resolve_extension_path` against the config file's parent
+    directory -- when at least one entry's ``path`` is a bare package name.
+    Returns ``None`` when the caller should not intervene: the config is
+    missing, malformed, declares no extensions, or uses only literal paths --
+    leaving the core's own loading (and error reporting) untouched. Raises if
+    a package name cannot be resolved.
+    """
+    loaded = _load_extension_entries(config_path)
+    if loaded is None:
+        return None
+    entries, base = loaded
+    if not _has_bare_name(entries):
+        return None
+    return _resolve_entries(entries, base)
+
+
+def resolve_configs_extension_specs(config_paths):
+    """Resolve the ``[[dirsql.extension]]`` entries of several configs, in order.
+
+    The SDK intervenes for the whole set only when **some** config names an
+    extension by bare package name (the core can resolve neither package names
+    nor -- once globally suppressed -- the literal entries of the other
+    configs). When it intervenes it resolves **every** config's entries, each
+    against that config's own parent directory, concatenated in ``config_paths``
+    order; the caller suppresses the core's config-extension loading and passes
+    the resolved list. Returns ``None`` when no config uses a package name,
+    leaving every config's loading to the core.
+    """
+    loaded = [_load_extension_entries(p) for p in config_paths]
+    if not any(item is not None and _has_bare_name(item[0]) for item in loaded):
+        return None
+    specs = []
+    for item in loaded:
+        if item is None:
+            continue
+        entries, base = item
+        specs.extend(_resolve_entries(entries, base))
+    return specs

{dirsql-0.3.99/packages/rust → dirsql-0.3.100}/docs/reference/sdk.md

@@ -54,7 +54,7 @@ DirSQL(
     *,
     tables: list[Table] | None = None,
     ignore: list[str] | None = None,
-    config: str | None = None,
+    config: str | list[str] | None = None,
     persist: bool = False,
     persist_path: str | None = None,
     extensions: list[dict] | None = None,  # [{ "path": str, "entrypoint"?: str }]
@@ -68,7 +68,7 @@ new DirSQL({
     root?: string,
     tables?: TableDef[],
     ignore?: string[],
-    config?: string,
+    config?: string | string[],
     persist?: boolean,
     persistPath?: string,
     extensions?: ExtensionSpec[],  // [{ path: string, entrypoint?: string }]
@@ -108,12 +108,13 @@ never sets the root.
   entries are appended after any programmatic `tables`; its `ignore`
   patterns and `[[dirsql.extension]]` entries are appended likewise. The
   config file does **not** set the index root: with no explicit `root`, the
-  index roots at the process cwd. In **Rust**, the builder's `.config()` is
-  **repeatable** — call it once per file and the configs merge in call order
-  (`[[table]]` / `ignore` / `[[dirsql.extension]]` accumulate; a duplicate
-  table name across configs errors), mirroring the CLI's repeatable
-  [`-c/--config`](./cli.md#flags). Python and TypeScript currently accept a
-  single `config` path.
+  index roots at the process cwd. **Multiple configs merge in order** on
+  every SDK — **Python** `config` accepts a `str` or a `list[str]`, the
+  **Rust** builder's `.config()` is repeatable (call it once per file), and
+  **TypeScript** `config` accepts a `string` or a `string[]`; the configs
+  merge in call order (`[[table]]` / `ignore` / `[[dirsql.extension]]`
+  accumulate; a duplicate table name across configs errors), mirroring the
+  CLI's repeatable [`-c/--config`](./cli.md#flags).
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

{dirsql-0.3.99 → dirsql-0.3.100}/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.99"
+version = "0.3.100"
 # 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.99 → dirsql-0.3.100/packages/python}/docs/reference/sdk.md

@@ -54,7 +54,7 @@ DirSQL(
     *,
     tables: list[Table] | None = None,
     ignore: list[str] | None = None,
-    config: str | None = None,
+    config: str | list[str] | None = None,
     persist: bool = False,
     persist_path: str | None = None,
     extensions: list[dict] | None = None,  # [{ "path": str, "entrypoint"?: str }]
@@ -68,7 +68,7 @@ new DirSQL({
     root?: string,
     tables?: TableDef[],
     ignore?: string[],
-    config?: string,
+    config?: string | string[],
     persist?: boolean,
     persistPath?: string,
     extensions?: ExtensionSpec[],  // [{ path: string, entrypoint?: string }]
@@ -108,12 +108,13 @@ never sets the root.
   entries are appended after any programmatic `tables`; its `ignore`
   patterns and `[[dirsql.extension]]` entries are appended likewise. The
   config file does **not** set the index root: with no explicit `root`, the
-  index roots at the process cwd. In **Rust**, the builder's `.config()` is
-  **repeatable** — call it once per file and the configs merge in call order
-  (`[[table]]` / `ignore` / `[[dirsql.extension]]` accumulate; a duplicate
-  table name across configs errors), mirroring the CLI's repeatable
-  [`-c/--config`](./cli.md#flags). Python and TypeScript currently accept a
-  single `config` path.
+  index roots at the process cwd. **Multiple configs merge in order** on
+  every SDK — **Python** `config` accepts a `str` or a `list[str]`, the
+  **Rust** builder's `.config()` is repeatable (call it once per file), and
+  **TypeScript** `config` accepts a `string` or a `string[]`; the configs
+  merge in call order (`[[table]]` / `ignore` / `[[dirsql.extension]]`
+  accumulate; a duplicate table name across configs errors), mirroring the
+  CLI's repeatable [`-c/--config`](./cli.md#flags).
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

dirsql-0.3.100/packages/python/e2e-attestations/claude-open-issues-review-le8hm5-588.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1783957933,
+  "exit_code": 0,
+  "commit": "6902471b89bd398969cd6c07e177ba88cd159fab",
+  "branch": "claude/open-issues-review-le8hm5-588"
+}

{dirsql-0.3.99 → dirsql-0.3.100}/packages/python/src/lib.rs

@@ -118,7 +118,7 @@ mod python {
             root: Option<String>,
             tables: Option<Vec<PyRef<'_, PyTable>>>,
             ignore: Option<Vec<String>>,
-            config: Option<String>,
+            config: Option<Vec<String>>,
             persist: bool,
             persist_path: Option<PathBuf>,
             extensions: Option<Vec<PyExtensionSpec>>,
@@ -150,7 +150,7 @@ mod python {
                     if let Some(ig) = ignore {
                         builder = builder.ignore(ig);
                     }
-                    if let Some(c) = config {
+                    for c in config.into_iter().flatten() {
                         builder = builder.config(c);
                     }
                     if persist {

{dirsql-0.3.99/packages/python → dirsql-0.3.100/packages/rust}/docs/reference/sdk.md

@@ -54,7 +54,7 @@ DirSQL(
     *,
     tables: list[Table] | None = None,
     ignore: list[str] | None = None,
-    config: str | None = None,
+    config: str | list[str] | None = None,
     persist: bool = False,
     persist_path: str | None = None,
     extensions: list[dict] | None = None,  # [{ "path": str, "entrypoint"?: str }]
@@ -68,7 +68,7 @@ new DirSQL({
     root?: string,
     tables?: TableDef[],
     ignore?: string[],
-    config?: string,
+    config?: string | string[],
     persist?: boolean,
     persistPath?: string,
     extensions?: ExtensionSpec[],  // [{ path: string, entrypoint?: string }]
@@ -108,12 +108,13 @@ never sets the root.
   entries are appended after any programmatic `tables`; its `ignore`
   patterns and `[[dirsql.extension]]` entries are appended likewise. The
   config file does **not** set the index root: with no explicit `root`, the
-  index roots at the process cwd. In **Rust**, the builder's `.config()` is
-  **repeatable** — call it once per file and the configs merge in call order
-  (`[[table]]` / `ignore` / `[[dirsql.extension]]` accumulate; a duplicate
-  table name across configs errors), mirroring the CLI's repeatable
-  [`-c/--config`](./cli.md#flags). Python and TypeScript currently accept a
-  single `config` path.
+  index roots at the process cwd. **Multiple configs merge in order** on
+  every SDK — **Python** `config` accepts a `str` or a `list[str]`, the
+  **Rust** builder's `.config()` is repeatable (call it once per file), and
+  **TypeScript** `config` accepts a `string` or a `string[]`; the configs
+  merge in call order (`[[table]]` / `ignore` / `[[dirsql.extension]]`
+  accumulate; a duplicate table name across configs errors), mirroring the
+  CLI's repeatable [`-c/--config`](./cli.md#flags).
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

dirsql-0.3.99/packages/python/e2e-attestations/claude-open-issues-review-le8hm5-red-570.json

@@ -1,7 +0,0 @@
-{
-  "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1783948915,
-  "exit_code": 0,
-  "commit": "4c827cbcd164e9273c8738e95328dd88d4c2548f",
-  "branch": "claude/open-issues-review-le8hm5-red-570"
-}