dirsql 0.4.7 → 0.4.8

package/dist/cli/resolve-config-extensions.d.ts

@@ -1,5 +1,5 @@
 /**
- * Return `argv` augmented with `--extension <path>[::entrypoint]` flags when the
+ * Return `argv` augmented with `--extension <path>[::entrypoint]` flags when a
  * TOML config names an extension by package name; otherwise return `argv`
  * unchanged. Throws if a package name cannot be resolved (surfaced by the
  * launcher as a clean error).

package/dist/cli/resolve-config-extensions.js

@@ -1,11 +1,14 @@
-// Launcher-side resolution of a TOML config's `[[dirsql.extension]]` entries.
+// Launcher-side resolution of the TOML configs' `[[dirsql.extension]]` entries.
 //
 // The compiled `dirsql` binary loads config extensions literally — it has no
-// `require.resolve`, so it cannot resolve a bare **package name**. When a
-// TOML config names an extension by package name, the shared SDK resolver
-// resolves every entry and this launcher passes the resolved literal paths
-// to the binary via repeatable `--extension` flags; the binary then loads
-// those and ignores the config's own extension entries.
+// `require.resolve`, so it cannot resolve a bare **package name**. When any
+// TOML config in argv names an extension by package name, the shared SDK
+// resolver resolves every config's entries and this launcher passes the
+// resolved literal paths to the binary via repeatable `--extension` flags;
+// the binary then loads those and ignores the configs' own extension entries.
+//
+// The `-c`/`--config` flag is repeatable, so the scan collects every
+// occurrence, in argv order.
 //
 // Native-language configs (`.py`/`.js`/`.mjs`/`.cjs`) are untouched: the binary
 // dispatches those to `dirsql interpret`, whose handshake already carries
@@ -14,21 +17,37 @@ import { existsSync } from "node:fs";
 // Config extensions the binary dispatches to `dirsql interpret`; never
 // pre-resolved here (that path resolves via the handshake).
 const NATIVE_CONFIG_SUFFIXES = [".py", ".js", ".mjs", ".cjs"];
-/** The `--config` value from argv (`--config X` or `--config=X`), or the default. */
-function configPathFromArgv(argv) {
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i];
-        if (a === "--config") {
-            return argv[i + 1] ?? "";
+/**
+ * Every config value in argv, in order (`--config X`, `--config=X`, `-c X`,
+ * `-c=X`, `-cX`), or the default when none are given.
+ */
+function configPathsFromArgv(argv) {
+    const paths = [];
+    let expectValue = false;
+    for (const a of argv) {
+        if (expectValue) {
+            paths.push(a);
+            expectValue = false;
+        }
+        else if (a === "--config" || a === "-c") {
+            expectValue = true;
         }
-        if (a?.startsWith("--config=")) {
-            return a.slice("--config=".length);
+        else if (a.startsWith("--config=")) {
+            paths.push(a.slice("--config=".length));
         }
+        else if (a.startsWith("-c")) {
+            const value = a.slice("-c".length);
+            paths.push(value.startsWith("=") ? value.slice("=".length) : value);
+        }
+    }
+    if (expectValue) {
+        // A bare trailing flag (no following value) yields "".
+        paths.push("");
     }
-    return "./.dirsql.toml";
+    return paths.length > 0 ? paths : ["./.dirsql.toml"];
 }
 /**
- * Return `argv` augmented with `--extension <path>[::entrypoint]` flags when the
+ * Return `argv` augmented with `--extension <path>[::entrypoint]` flags when a
  * TOML config names an extension by package name; otherwise return `argv`
  * unchanged. Throws if a package name cannot be resolved (surfaced by the
  * launcher as a clean error).
@@ -37,18 +56,16 @@ export async function withResolvedExtensions(argv) {
     if (argv[0] === "init") {
         return argv;
     }
-    const configPath = configPathFromArgv(argv);
-    if (NATIVE_CONFIG_SUFFIXES.some((s) => configPath.endsWith(s))) {
-        return argv;
-    }
+    const configPaths = configPathsFromArgv(argv).filter((p) => !NATIVE_CONFIG_SUFFIXES.some((s) => p.endsWith(s)));
     // The shared resolver pulls in smol-toml, which only a TOML config on disk
     // can need. Guarding on the same `existsSync` the resolver itself starts
-    // with keeps the parser off the common launch path entirely (#720).
-    if (!existsSync(configPath)) {
+    // with keeps the parser off the common launch path entirely (#720); the
+    // resolver skips any individually-missing config on its own.
+    if (!configPaths.some((p) => existsSync(p))) {
         return argv;
     }
-    const { resolveConfigExtensionSpecs } = await import("../resolve-config-extensions.js");
-    const specs = resolveConfigExtensionSpecs(configPath);
+    const { resolveConfigsExtensionSpecs } = await import("../resolve-config-extensions.js");
+    const specs = resolveConfigsExtensionSpecs(configPaths);
     if (specs === null) {
         return argv;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dirsql",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Ephemeral SQL index over a local directory",
   "license": "MIT",
   "repository": "https://github.com/thekevinscott/dirsql",
@@ -212,15 +212,15 @@
     ]
   },
   "optionalDependencies": {
-    "@dirsql/lib-linux-x64-gnu": "0.4.7",
-    "@dirsql/lib-linux-arm64-gnu": "0.4.7",
-    "@dirsql/lib-darwin-x64": "0.4.7",
-    "@dirsql/lib-darwin-arm64": "0.4.7",
-    "@dirsql/lib-win32-x64-msvc": "0.4.7",
-    "@dirsql/cli-linux-x64-gnu": "0.4.7",
-    "@dirsql/cli-linux-arm64-gnu": "0.4.7",
-    "@dirsql/cli-darwin-x64": "0.4.7",
-    "@dirsql/cli-darwin-arm64": "0.4.7",
-    "@dirsql/cli-win32-x64-msvc": "0.4.7"
+    "@dirsql/lib-linux-x64-gnu": "0.4.8",
+    "@dirsql/lib-linux-arm64-gnu": "0.4.8",
+    "@dirsql/lib-darwin-x64": "0.4.8",
+    "@dirsql/lib-darwin-arm64": "0.4.8",
+    "@dirsql/lib-win32-x64-msvc": "0.4.8",
+    "@dirsql/cli-linux-x64-gnu": "0.4.8",
+    "@dirsql/cli-linux-arm64-gnu": "0.4.8",
+    "@dirsql/cli-darwin-x64": "0.4.8",
+    "@dirsql/cli-darwin-arm64": "0.4.8",
+    "@dirsql/cli-win32-x64-msvc": "0.4.8"
   }
 }