dirsql 0.4.12 → 0.4.13

package/dist/cli/main.js

@@ -1,23 +1,75 @@
-// Launcher entry: resolve the bundled `dirsql` binary and forward argv,
-// exit code, and signals to it. The launcher is a transparent forwarder —
-// every argv (including any subcommand) goes straight to the Rust binary,
-// which owns subcommand dispatch and clap-rejects unknown ones.
-import { spawnSync } from "node:child_process";
+// Launcher entry: run the CLI in-process through the napi addon.
+//
+// The launcher is a transparent forwarder — every argv (including any
+// subcommand) goes straight to the core's `runCli`, which owns subcommand
+// dispatch and clap-rejects unknown ones. Nothing is spawned: the same
+// `@dirsql/lib-*` addon the SDK loads carries the CLI, so a package ships one
+// copy of the core instead of two (#739).
+import { mainInProcess } from "bin-shim";
+import { loadNativeCore } from "../load-native-core.js";
 import { die } from "./die.js";
-import { resolveBinary } from "./resolve-binary.js";
 import { withResolvedExtensions } from "./resolve-config-extensions.js";
+/**
+ * Resolve `runCli` off the same addon the SDK loads.
+ *
+ * bin-shim can resolve an addon itself, but its default naming is
+ * `@{scope}/lib-{platform}-{arch}`, which cannot express the ABI suffix
+ * dirsql's packages carry (`@dirsql/lib-linux-x64-gnu`). Reusing
+ * `loadNativeCore` keeps one resolution rule for the SDK and the CLI —
+ * including its dev fallback to a locally built `dirsql.node` — so a
+ * monorepo checkout and a published install take the same path.
+ */
+function resolveRunCli() {
+    const core = loadNativeCore();
+    if (typeof core.runCli !== "function") {
+        throw new Error("dirsql: the native addon has no callable `runCli` export; " +
+            "it was built without the `cli` feature.");
+    }
+    return core.runCli;
+}
+/**
+ * Keep Ctrl-C fatal while the CLI runs in-process.
+ *
+ * The core installs tokio signal handlers for `dirsql server`, and
+ * signal-hook (which tokio uses) *chains*: it runs its own actions and then
+ * the handler installed before it. CPython installs `default_int_handler` at
+ * startup, so the pip launcher gets a terminating disposition for free —
+ * bare Node leaves `SIG_DFL`, which signal-hook does not emulate, so the
+ * signal is swallowed and the process becomes SIGKILL-only (measured: a
+ * probe ignored SIGTERM for 143 seconds).
+ *
+ * Registering a JS listener first gives signal-hook a real prior handler to
+ * chain to. This cannot be fixed after the fact: `removeAllListeners` only
+ * drops JS listeners and cannot touch a disposition installed by native
+ * code, and `unregister_signal` leaves the OS handler in place. One listener
+ * is the whole remedy — no `unsafe`, no `sigaction`.
+ */
+function keepSignalsFatal() {
+    // While the core is running, its own handler drives shutdown and this
+    // listener is the tail of the chain; it matters for signals arriving
+    // outside that window, where exiting is exactly right.
+    process.on("SIGINT", () => process.exit(130));
+    process.on("SIGTERM", () => process.exit(143));
+}
 export async function main(argv = process.argv.slice(2)) {
-    const binary = resolveBinary();
-    // Resolve any package-name extensions in a TOML config here (the binary
+    keepSignalsFatal();
+    // Resolve any package-name extensions in a TOML config here (the core
     // can't) and pass them as `--extension` flags; a no-op otherwise.
-    const result = spawnSync(binary, await withResolvedExtensions(argv), {
-        stdio: "inherit",
-    });
-    if (result.error) {
-        die(result.error.message, 1);
+    const resolved = await withResolvedExtensions(argv);
+    let code;
+    try {
+        code = await mainInProcess({
+            argv: resolved,
+            binaryName: "dirsql",
+            // Resolution is ours (see `resolveRunCli`), so bin-shim never consults
+            // its own naming; `from` only satisfies the shared options type.
+            from: import.meta.url,
+            runCli: resolveRunCli(),
+        });
     }
-    if (result.signal) {
-        process.kill(process.pid, result.signal);
+    catch (e) {
+        die(e instanceof Error ? e.message : String(e), 1);
+        return;
     }
-    process.exit(result.status ?? 1);
+    process.exit(code);
 }

package/dist/platforms.d.ts

@@ -5,8 +5,6 @@ export interface Platform {
     nodePlatform: NodeJS.Platform;
     /** Node `process.arch` value for this target. */
     nodeArch: NodeJS.Architecture;
-    /** CLI sub-package name (`@dirsql/cli-<slug>`). */
-    name: string;
     /** napi library sub-package name (`@dirsql/lib-<slug>`). */
     libName: string;
     /** Wheel-style `os` constraint for the sub-package's package.json. */
@@ -15,14 +13,8 @@ export interface Platform {
     cpu: string[];
     /** libc constraint (Linux only). */
     libc?: string[];
-    /** Archive extension cargo-dist emits for this target. */
-    ext: "tar.xz" | "zip";
-    /** Whether the binary has a `.exe` suffix on this platform. */
-    exe?: boolean;
 }
 export declare const PLATFORMS: readonly Platform[];
-/** Node `${platform}-${arch}` → `@dirsql/cli-*` sub-package name. */
-export declare function nodeTriples(): Record<string, string>;
 /** Node `${platform}-${arch}` → `@dirsql/lib-*` napi sub-package name. */
 export declare function libTriples(): Record<string, string>;
 /**

package/dist/platforms.js

@@ -1,82 +1,61 @@
 // Single source of truth for the target platforms `dirsql` publishes.
 //
-// Every target triple generates two npm sub-packages:
+// Every target triple generates ONE npm sub-package: `@dirsql/lib-<slug>`,
+// holding the napi-rs `.node` addon. It backs both layers — the TypeScript
+// SDK loads it via `loadNativeCore()`, and since #739 the `dirsql` CLI runs
+// in-process through its `runCli` export rather than spawning a binary. The
+// second family, `@dirsql/cli-<slug>`, shipped a redundant copy of the same
+// core and is gone.
 //
-// 1. `@dirsql/cli-<slug>` — holds the standalone `dirsql` CLI binary
-//    (from cargo-dist). Consumed at runtime by `src/cli/resolveBinary.ts`
-//    when a user runs the `dirsql` CLI.
-// 2. `@dirsql/lib-<slug>` — holds the napi-rs `.node` addon used by the
-//    TypeScript SDK. Consumed at runtime by `loadNativeCore()` in
-//    `src/index.ts` when a user `import`s from `dirsql`.
+// The sub-packages are `optionalDependencies` of the main `dirsql` package,
+// so npm/pnpm install only the one matching the host's OS/arch.
 //
-// Both sub-package sets use `optionalDependencies` on the main `dirsql`
-// package so npm/pnpm install only the one matching the host's OS/arch.
-//
-// `nodeTriples()` / `libTriples()` return `${process.platform}-${process.arch}`
-// → sub-package-name maps for the respective layer.
+// `libTriples()` returns a `${process.platform}-${process.arch}` →
+// sub-package-name map.
 export const PLATFORMS = [
     {
         triple: "x86_64-unknown-linux-gnu",
         nodePlatform: "linux",
         nodeArch: "x64",
-        name: "@dirsql/cli-linux-x64-gnu",
         libName: "@dirsql/lib-linux-x64-gnu",
         os: ["linux"],
         cpu: ["x64"],
         libc: ["glibc"],
-        ext: "tar.xz",
     },
     {
         triple: "aarch64-unknown-linux-gnu",
         nodePlatform: "linux",
         nodeArch: "arm64",
-        name: "@dirsql/cli-linux-arm64-gnu",
         libName: "@dirsql/lib-linux-arm64-gnu",
         os: ["linux"],
         cpu: ["arm64"],
         libc: ["glibc"],
-        ext: "tar.xz",
     },
     {
         triple: "x86_64-apple-darwin",
         nodePlatform: "darwin",
         nodeArch: "x64",
-        name: "@dirsql/cli-darwin-x64",
         libName: "@dirsql/lib-darwin-x64",
         os: ["darwin"],
         cpu: ["x64"],
-        ext: "tar.xz",
     },
     {
         triple: "aarch64-apple-darwin",
         nodePlatform: "darwin",
         nodeArch: "arm64",
-        name: "@dirsql/cli-darwin-arm64",
         libName: "@dirsql/lib-darwin-arm64",
         os: ["darwin"],
         cpu: ["arm64"],
-        ext: "tar.xz",
     },
     {
         triple: "x86_64-pc-windows-msvc",
         nodePlatform: "win32",
         nodeArch: "x64",
-        name: "@dirsql/cli-win32-x64-msvc",
         libName: "@dirsql/lib-win32-x64-msvc",
         os: ["win32"],
         cpu: ["x64"],
-        ext: "zip",
-        exe: true,
     },
 ];
-/** Node `${platform}-${arch}` → `@dirsql/cli-*` sub-package name. */
-export function nodeTriples() {
-    const out = {};
-    for (const p of PLATFORMS) {
-        out[`${p.nodePlatform}-${p.nodeArch}`] = p.name;
-    }
-    return out;
-}
 /** Node `${platform}-${arch}` → `@dirsql/lib-*` napi sub-package name. */
 export function libTriples() {
     const out = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dirsql",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "description": "Ephemeral SQL index over a local directory",
   "license": "MIT",
   "repository": "https://github.com/thekevinscott/dirsql",
@@ -190,6 +190,7 @@
     }
   },
   "dependencies": {
+    "bin-shim": "^0.2.0",
     "smol-toml": "^1.6.1"
   },
   "devDependencies": {
@@ -212,15 +213,10 @@
     ]
   },
   "optionalDependencies": {
-    "@dirsql/lib-linux-x64-gnu": "0.4.12",
-    "@dirsql/lib-linux-arm64-gnu": "0.4.12",
-    "@dirsql/lib-darwin-x64": "0.4.12",
-    "@dirsql/lib-darwin-arm64": "0.4.12",
-    "@dirsql/lib-win32-x64-msvc": "0.4.12",
-    "@dirsql/cli-linux-x64-gnu": "0.4.12",
-    "@dirsql/cli-linux-arm64-gnu": "0.4.12",
-    "@dirsql/cli-darwin-x64": "0.4.12",
-    "@dirsql/cli-darwin-arm64": "0.4.12",
-    "@dirsql/cli-win32-x64-msvc": "0.4.12"
+    "@dirsql/lib-linux-x64-gnu": "0.4.13",
+    "@dirsql/lib-linux-arm64-gnu": "0.4.13",
+    "@dirsql/lib-darwin-x64": "0.4.13",
+    "@dirsql/lib-darwin-arm64": "0.4.13",
+    "@dirsql/lib-win32-x64-msvc": "0.4.13"
   }
 }

package/dist/cli/platform-key.d.ts

@@ -1 +0,0 @@
-export declare function platformKey(): string;

package/dist/cli/platform-key.js

@@ -1,5 +0,0 @@
-// Return the `platform-arch` key used to look up the per-platform
-// optional-dependency package (e.g. `linux-x64`, `darwin-arm64`).
-export function platformKey() {
-    return `${process.platform}-${process.arch}`;
-}

package/dist/cli/resolve-binary.d.ts

@@ -1,5 +0,0 @@
-/** A minimal `require.resolve`-shaped function. Injectable for tests. */
-export type Resolver = (specifier: string) => string;
-/** Default resolver: a CJS-style `require.resolve` rooted at this ESM module. */
-export declare function defaultResolver(): Resolver;
-export declare function resolveBinary(key?: string, resolver?: Resolver): string;

package/dist/cli/resolve-binary.js

@@ -1,25 +0,0 @@
-// Resolve the absolute path of the prebuilt `dirsql` binary shipped by
-// whichever `@dirsql/cli-<triple>` optional-dependency package matched
-// the host at `npm install` time.
-import { createRequire } from "node:module";
-import { nodeTriples } from "../platforms.js";
-import { die } from "./die.js";
-import { platformKey } from "./platform-key.js";
-/** Default resolver: a CJS-style `require.resolve` rooted at this ESM module. */
-export function defaultResolver() {
-    return createRequire(import.meta.url).resolve;
-}
-export function resolveBinary(key = platformKey(), resolver = defaultResolver()) {
-    const triples = nodeTriples();
-    const pkg = triples[key];
-    if (!pkg) {
-        die(`no prebuilt binary for ${key}. Build from source with \`cargo install dirsql --features cli\`.`);
-    }
-    const bin = process.platform === "win32" ? "dirsql.exe" : "dirsql";
-    try {
-        return resolver(`${pkg}/${bin}`);
-    }
-    catch {
-        die(`${pkg} is not installed. If you ran \`npm install --no-optional\` or \`--ignore-optional\`, re-install without that flag.`);
-    }
-}