@ff-labs/fff-bun 0.1.0-nightly.fcdf4a9 → 0.2.4-dev.8d9ef38

package/src/finder.ts

@@ -40,33 +40,7 @@ import type {
   SearchResult,
 } from "./types";
 
-import {
-  createGrepCursor,
-  err,
-  toInternalGrepOptions,
-  toInternalInitOptions,
-  toInternalMultiGrepOptions,
-  toInternalSearchOptions,
-} from "./types";
-
-/** Transform raw FFI grep result into typed GrepResult with opaque cursor. */
-function transformGrepResult(result: Result<unknown>): Result<GrepResult> {
-  if (!result.ok) {
-    return result;
-  }
-  const raw = result.value as Record<string, unknown>;
-  const nextFileOffset = raw.nextFileOffset as number;
-  const grepResult: GrepResult = {
-    items: raw.items as GrepResult["items"],
-    totalMatched: raw.totalMatched as number,
-    totalFilesSearched: raw.totalFilesSearched as number,
-    totalFiles: raw.totalFiles as number,
-    filteredFileCount: raw.filteredFileCount as number,
-    nextCursor: nextFileOffset > 0 ? createGrepCursor(nextFileOffset) : null,
-    regexFallbackError: raw.regexFallbackError as string | undefined,
-  };
-  return { ok: true, value: grepResult };
-}
+import { err } from "./types";
 
 /**
  * FileFinder - Fast file finder with fuzzy search
@@ -127,8 +101,14 @@ export class FileFinder {
    * ```
    */
   static create(options: InitOptions): Result<FileFinder> {
-    const internalOpts = toInternalInitOptions(options);
-    const result = ffiCreate(JSON.stringify(internalOpts));
+    const result = ffiCreate(
+      options.basePath,
+      options.frecencyDbPath ?? "",
+      options.historyDbPath ?? "",
+      options.useUnsafeNoLock ?? false,
+      options.warmupMmapCache ?? false,
+      options.aiMode ?? false,
+    );
 
     if (!result.ok) {
       return result;
@@ -192,18 +172,20 @@ export class FileFinder {
    * }
    * ```
    */
-  search(query: string, options?: SearchOptions): Result<SearchResult> {
+  fileSearch(query: string, options?: SearchOptions): Result<SearchResult> {
     const guard = this.ensureAlive();
     if (!guard.ok) return guard;
 
-    const internalOpts = toInternalSearchOptions(options);
-    const result = ffiSearch(guard.value, query, JSON.stringify(internalOpts));
-
-    if (!result.ok) {
-      return result;
-    }
-
-    return result as Result<SearchResult>;
+    return ffiSearch(
+      guard.value,
+      query,
+      options?.currentFile ?? "",
+      options?.maxThreads ?? 0,
+      options?.pageIndex ?? 0,
+      options?.pageSize ?? 0,
+      options?.comboBoostMultiplier ?? 0,
+      options?.minComboCount ?? 0,
+    );
   }
 
   /**
@@ -228,28 +210,38 @@ export class FileFinder {
    * @example
    * ```typescript
    * // First page
-   * const result = finder.liveGrep("TODO", { mode: "plain" });
+   * const result = finder.grep("TODO", { mode: "plain" });
    * if (result.ok) {
    *   for (const match of result.value.items) {
    *     console.log(`${match.relativePath}:${match.lineNumber}: ${match.lineContent}`);
    *   }
    *   // Fetch next page
    *   if (result.value.nextCursor) {
-   *     const page2 = finder.liveGrep("TODO", {
+   *     const page2 = finder.grep("TODO", {
    *       cursor: result.value.nextCursor,
    *     });
    *   }
    * }
    * ```
    */
-  liveGrep(query: string, options?: GrepOptions): Result<GrepResult> {
+  grep(query: string, options?: GrepOptions): Result<GrepResult> {
     const guard = this.ensureAlive();
     if (!guard.ok) return guard;
 
-    const internalOpts = toInternalGrepOptions(options);
-    const result = ffiLiveGrep(guard.value, query, JSON.stringify(internalOpts));
-
-    return transformGrepResult(result);
+    return ffiLiveGrep(
+      guard.value,
+      query,
+      options?.mode ?? "plain",
+      options?.maxFileSize ?? 0,
+      options?.maxMatchesPerFile ?? 0,
+      options?.smartCase ?? true,
+      options?.cursor?._offset ?? 0,
+      0, // page_limit (0 = default 50)
+      options?.timeBudgetMs ?? 0,
+      options?.beforeContext ?? 0,
+      options?.afterContext ?? 0,
+      false,
+    );
   }
 
   /**
@@ -285,10 +277,20 @@ export class FileFinder {
       return err("patterns array must have at least 1 element");
     }
 
-    const internalOpts = toInternalMultiGrepOptions(options);
-    const result = ffiMultiGrep(guard.value, JSON.stringify(internalOpts));
-
-    return transformGrepResult(result);
+    return ffiMultiGrep(
+      guard.value,
+      options.patterns.join("\n"),
+      options.constraints ?? "",
+      options.maxFileSize ?? 0,
+      options.maxMatchesPerFile ?? 0,
+      options.smartCase ?? true,
+      options.cursor?._offset ?? 0,
+      0, // page_limit (0 = default 50)
+      options.timeBudgetMs ?? 0,
+      options.beforeContext ?? 0,
+      options.afterContext ?? 0,
+      false,
+    );
   }
 
   /**
@@ -412,14 +414,9 @@ export class FileFinder {
     return isAvailable();
   }
 
-  /**
-   * Ensure the native library is loaded.
-   *
-   * This will download the binary if needed and load it.
-   * Useful for preloading before first use.
-   */
-  static async ensureLoaded(): Promise<void> {
-    return ensureLoaded();
+  /** Ensure the native library is loaded. */
+  static ensureLoaded(): void {
+    ensureLoaded();
   }
 
   /**
@@ -433,3 +430,4 @@ export class FileFinder {
     return ffiHealthCheck(null, testPath || "") as Result<HealthCheck>;
   }
 }
+

package/src/git-lifecycle.test.ts

@@ -51,7 +51,7 @@ function sleep(ms: number) {
 }
 
 function findFile(finder: FileFinder, name: string): FileItem | undefined {
-  const result = finder.search(name, { pageSize: 200 });
+  const result = finder.fileSearch(name, { pageSize: 200 });
   if (!result.ok) throw new Error(`search failed: ${result.error}`);
   return result.value.items.find((item) => item.fileName === name);
 }
@@ -99,15 +99,15 @@ async function waitForFileGone(finder: FileFinder, name: string): Promise<boolea
 async function waitForFileCount(finder: FileFinder, count: number): Promise<number> {
   const start = Date.now();
   while (Date.now() - start < WATCHER_TIMEOUT_MS) {
-    const result = finder.search("", { pageSize: 200 });
+    const result = finder.fileSearch("", { pageSize: 200 });
     if (result.ok && result.value.totalFiles === count) return count;
     await sleep(POLL_INTERVAL_MS);
   }
-  const result = finder.search("", { pageSize: 200 });
+  const result = finder.fileSearch("", { pageSize: 200 });
   return result.ok ? result.value.totalFiles : -1;
 }
 
-/** Poll liveGrep until predicate on totalMatched is satisfied, or the timeout is exceeded. */
+/** Poll grep until predicate on totalMatched is satisfied, or the timeout is exceeded. */
 async function waitForGrep(
   finder: FileFinder,
   pattern: string,
@@ -116,11 +116,11 @@ async function waitForGrep(
 ) {
   const start = Date.now();
   while (Date.now() - start < WATCHER_TIMEOUT_MS) {
-    const result = finder.liveGrep(pattern, options);
+    const result = finder.grep(pattern, options);
     if (result.ok && predicate(result.value.totalMatched)) return result;
     await sleep(POLL_INTERVAL_MS);
   }
-  return finder.liveGrep(pattern, options);
+  return finder.grep(pattern, options);
 }
 
 describe.skipIf(process.platform === "win32")("Git lifecycle integration", () => {
@@ -161,7 +161,7 @@ describe.skipIf(process.platform === "win32")("Git lifecycle integration", () =>
   });
 
   test("initial scan indexes all committed files", () => {
-    const result = finder.search("", { pageSize: 200 });
+    const result = finder.fileSearch("", { pageSize: 200 });
     expect(result.ok).toBe(true);
     if (!result.ok) return;
 

package/src/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { findBinary, getDevBinaryPath } from "./download";
+import { findBinary } from "./download";
 import { FileFinder } from "./index";
 import { getLibExtension, getLibFilename, getTriple } from "./platform";
 
@@ -46,14 +46,6 @@ describe("Platform Detection", () => {
 });
 
 describe("Binary Detection", () => {
-  test("getDevBinaryPath finds local build", () => {
-    const devPath = getDevBinaryPath();
-    expect(devPath).not.toBeNull();
-    // Normalize path for cross-platform comparison (Windows uses backslashes)
-    const normalizedPath = normalizePath(devPath);
-    expect(normalizedPath).toContain("target/release");
-  });
-
   test("findBinary returns a path", () => {
     const path = findBinary();
     expect(path).not.toBeNull();
@@ -120,7 +112,7 @@ describe("FileFinder - Full Lifecycle", () => {
     if (progress.ok) {
     }
 
-    const result = finder.search("");
+    const result = finder.fileSearch("");
     expect(result.ok).toBe(true);
 
     if (result.ok) {
@@ -140,7 +132,7 @@ describe("FileFinder - Full Lifecycle", () => {
   });
 
   test("search returns a valid result structure", () => {
-    const result = finder.search("Cargo.toml");
+    const result = finder.fileSearch("Cargo.toml");
     expect(result.ok).toBe(true);
 
     if (result.ok) {
@@ -152,7 +144,7 @@ describe("FileFinder - Full Lifecycle", () => {
   });
 
   test("search returns empty for non-matching query", () => {
-    const result = finder.search("xyznonexistentfilenamexyz123456");
+    const result = finder.fileSearch("xyznonexistentfilenamexyz123456");
     expect(result.ok).toBe(true);
 
     if (result.ok) {
@@ -162,7 +154,7 @@ describe("FileFinder - Full Lifecycle", () => {
   });
 
   test("search respects pageSize option", () => {
-    const result = finder.search("ts", { pageSize: 3 });
+    const result = finder.fileSearch("ts", { pageSize: 3 });
     expect(result.ok).toBe(true);
 
     if (result.ok) {
@@ -170,8 +162,8 @@ describe("FileFinder - Full Lifecycle", () => {
     }
   });
 
-  test("liveGrep plain text returns matching lines", () => {
-    const result = finder.liveGrep("fff-core", {
+  test("grep plain text returns matching lines", () => {
+    const result = finder.grep("fff-core", {
       mode: "plain",
     });
     expect(result.ok).toBe(true);
@@ -205,9 +197,9 @@ describe("FileFinder - Full Lifecycle", () => {
     }
   });
 
-  test("liveGrep fuzzy mode returns results with scores", () => {
+  test("grep fuzzy mode returns results with scores", () => {
     // Intentional typo: "depdnency" instead of "dependency" to exercise fuzzy matching
-    const result = finder.liveGrep("depdnency", {
+    const result = finder.grep("depdnency", {
       mode: "fuzzy",
     });
     expect(result.ok).toBe(true);
@@ -273,8 +265,8 @@ describe("FileFinder - Full Lifecycle", () => {
       const finder2 = result2.value;
 
       // Both should work independently
-      const search1 = finder.search("Cargo");
-      const search2 = finder2.search("Cargo");
+      const search1 = finder.fileSearch("Cargo");
+      const search2 = finder2.fileSearch("Cargo");
 
       expect(search1.ok).toBe(true);
       expect(search2.ok).toBe(true);
@@ -282,7 +274,7 @@ describe("FileFinder - Full Lifecycle", () => {
       // Destroying one should not affect the other
       finder2.destroy();
 
-      const search3 = finder.search("Cargo");
+      const search3 = finder.fileSearch("Cargo");
       expect(search3.ok).toBe(true);
     }
   });
@@ -297,7 +289,7 @@ describe("FileFinder - Error Handling", () => {
     const f = createResult.value;
     f.destroy();
 
-    const result = f.search("test");
+    const result = f.fileSearch("test");
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toContain("destroyed");

package/src/index.ts

@@ -23,7 +23,7 @@
  * finder.waitForScan(5000);
  *
  * // Search for files
- * const search = finder.search("main.ts");
+ * const search = finder.fileSearch("main.ts");
  * if (search.ok) {
  *   for (const item of search.value.items) {
  *     console.log(item.relativePath);
@@ -37,15 +37,11 @@
  * @packageDocumentation
  */
 
-export { FileFinder } from "./finder";
-
 export {
   binaryExists,
-  downloadBinary,
-  ensureBinary,
   findBinary,
-  getBinaryPath,
 } from "./download";
+export { FileFinder } from "./finder";
 
 export {
   getLibExtension,

package/src/platform.ts

@@ -95,20 +95,20 @@ export function getLibFilename(): string {
  * Map from Rust target triple to npm platform package name
  */
 const TRIPLE_TO_NPM_PACKAGE: Record<string, string> = {
-  "aarch64-apple-darwin": "@ff-labs/fff-bun-darwin-arm64",
-  "x86_64-apple-darwin": "@ff-labs/fff-bun-darwin-x64",
-  "x86_64-unknown-linux-gnu": "@ff-labs/fff-bun-linux-x64-gnu",
-  "aarch64-unknown-linux-gnu": "@ff-labs/fff-bun-linux-arm64-gnu",
-  "x86_64-unknown-linux-musl": "@ff-labs/fff-bun-linux-x64-musl",
-  "aarch64-unknown-linux-musl": "@ff-labs/fff-bun-linux-arm64-musl",
-  "x86_64-pc-windows-msvc": "@ff-labs/fff-bun-win32-x64",
-  "aarch64-pc-windows-msvc": "@ff-labs/fff-bun-win32-arm64",
+  "aarch64-apple-darwin": "@ff-labs/fff-bin-darwin-arm64",
+  "x86_64-apple-darwin": "@ff-labs/fff-bin-darwin-x64",
+  "x86_64-unknown-linux-gnu": "@ff-labs/fff-bin-linux-x64-gnu",
+  "aarch64-unknown-linux-gnu": "@ff-labs/fff-bin-linux-arm64-gnu",
+  "x86_64-unknown-linux-musl": "@ff-labs/fff-bin-linux-x64-musl",
+  "aarch64-unknown-linux-musl": "@ff-labs/fff-bin-linux-arm64-musl",
+  "x86_64-pc-windows-msvc": "@ff-labs/fff-bin-win32-x64",
+  "aarch64-pc-windows-msvc": "@ff-labs/fff-bin-win32-arm64",
 };
 
 /**
  * Get the npm package name for the current platform's native binary.
  *
- * @returns Package name like "@ff-labs/fff-bun-darwin-arm64"
+ * @returns Package name like "@ff-labs/fff-bin-darwin-arm64"
  * @throws If the current platform is not supported
  */
 export function getNpmPackageName(): string {

package/src/types.ts

@@ -208,62 +208,6 @@ export interface HealthCheck {
   };
 }
 
-/**
- * Internal: Options format sent to Rust FFI
- * @internal
- */
-export interface InitOptionsInternal {
-  base_path: string;
-  frecency_db_path?: string;
-  history_db_path?: string;
-  use_unsafe_no_lock: boolean;
-  warmup_mmap_cache: boolean;
-  ai_mode: boolean;
-}
-
-/**
- * Internal: Search options format sent to Rust FFI
- * @internal
- */
-export interface SearchOptionsInternal {
-  max_threads?: number;
-  current_file?: string;
-  combo_boost_multiplier?: number;
-  min_combo_count?: number;
-  page_index?: number;
-  page_size?: number;
-}
-
-/**
- * Convert public InitOptions to internal format
- * @internal
- */
-export function toInternalInitOptions(opts: InitOptions): InitOptionsInternal {
-  return {
-    base_path: opts.basePath,
-    frecency_db_path: opts.frecencyDbPath,
-    history_db_path: opts.historyDbPath,
-    use_unsafe_no_lock: opts.useUnsafeNoLock ?? false,
-    warmup_mmap_cache: opts.warmupMmapCache ?? false,
-    ai_mode: opts.aiMode ?? false,
-  };
-}
-
-/**
- * Convert public SearchOptions to internal format
- * @internal
- */
-export function toInternalSearchOptions(opts?: SearchOptions): SearchOptionsInternal {
-  return {
-    max_threads: opts?.maxThreads,
-    current_file: opts?.currentFile,
-    combo_boost_multiplier: opts?.comboBoostMultiplier,
-    min_combo_count: opts?.minComboCount,
-    page_index: opts?.pageIndex,
-    page_size: opts?.pageSize,
-  };
-}
-
 /**
  * Grep search mode
  */
@@ -417,78 +361,3 @@ export interface MultiGrepOptions {
   afterContext?: number;
 }
 
-/**
- * Internal: Multi-grep options format sent to Rust FFI
- * @internal
- */
-export interface MultiGrepOptionsInternal {
-  patterns: string[];
-  constraints?: string;
-  max_file_size?: number;
-  max_matches_per_file?: number;
-  smart_case?: boolean;
-  file_offset?: number;
-  page_limit?: number;
-  time_budget_ms?: number;
-  before_context?: number;
-  after_context?: number;
-}
-
-/**
- * Convert public MultiGrepOptions to internal format
- * @internal
- */
-export function toInternalMultiGrepOptions(
-  opts: MultiGrepOptions,
-  pageLimit?: number,
-): MultiGrepOptionsInternal {
-  return {
-    patterns: opts.patterns,
-    constraints: opts.constraints,
-    max_file_size: opts.maxFileSize,
-    max_matches_per_file: opts.maxMatchesPerFile,
-    smart_case: opts.smartCase,
-    file_offset: opts.cursor?._offset ?? 0,
-    page_limit: pageLimit,
-    time_budget_ms: opts.timeBudgetMs,
-    before_context: opts.beforeContext,
-    after_context: opts.afterContext,
-  };
-}
-
-/**
- * Internal: Grep options format sent to Rust FFI
- * @internal
- */
-export interface GrepOptionsInternal {
-  max_file_size?: number;
-  max_matches_per_file?: number;
-  smart_case?: boolean;
-  file_offset?: number;
-  page_limit?: number;
-  mode?: string;
-  time_budget_ms?: number;
-  before_context?: number;
-  after_context?: number;
-}
-
-/**
- * Convert public GrepOptions to internal format
- * @internal
- */
-export function toInternalGrepOptions(
-  opts?: GrepOptions,
-  pageLimit?: number,
-): GrepOptionsInternal {
-  return {
-    max_file_size: opts?.maxFileSize,
-    max_matches_per_file: opts?.maxMatchesPerFile,
-    smart_case: opts?.smartCase,
-    file_offset: opts?.cursor?._offset ?? 0,
-    page_limit: pageLimit,
-    mode: opts?.mode,
-    time_budget_ms: opts?.timeBudgetMs,
-    before_context: opts?.beforeContext,
-    after_context: opts?.afterContext,
-  };
-}

package/scripts/cli.ts

@@ -1,116 +0,0 @@
-#!/usr/bin/env bun
-/**
- * CLI tool for fff package management
- *
- * Usage:
- *   bunx fff download [tag]     - Download native binary from GitHub
- *   bunx fff info               - Show platform and binary info
- */
-
-import { downloadBinary, getBinaryPath, findBinary } from "../src/download";
-import {
-  getTriple,
-  getLibExtension,
-  getLibFilename,
-  getNpmPackageName,
-} from "../src/platform";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const args = process.argv.slice(2);
-const command = args[0];
-
-interface PackageJson {
-  version: string;
-}
-
-async function getPackageInfo(): Promise<PackageJson> {
-  const currentDir = dirname(fileURLToPath(import.meta.url));
-  const packageJsonPath = join(currentDir, "..", "package.json");
-
-  try {
-    return await Bun.file(packageJsonPath).json();
-  } catch {
-    return { version: "unknown" };
-  }
-}
-
-async function main() {
-  switch (command) {
-    case "download": {
-      const tag = args[1];
-      console.log("fff: Downloading native library from GitHub...");
-      try {
-        const resolvedTag = await downloadBinary(tag);
-        console.log(`fff: Download complete! (${resolvedTag})`);
-      } catch (error) {
-        console.error("fff: Download failed:", error);
-        process.exit(1);
-      }
-      break;
-    }
-
-    case "info": {
-      const pkg = await getPackageInfo();
-      let npmPackage: string;
-      try {
-        npmPackage = getNpmPackageName();
-      } catch {
-        npmPackage = "unsupported";
-      }
-
-      console.log("fff - Fast File Finder");
-      console.log(`Package version: ${pkg.version}`);
-      console.log("");
-      console.log("Platform Information:");
-      console.log(`  Triple: ${getTriple()}`);
-      console.log(`  Extension: ${getLibExtension()}`);
-      console.log(`  Library name: ${getLibFilename()}`);
-      console.log(`  npm package: ${npmPackage}`);
-      console.log("");
-      console.log("Binary Status:");
-      const existing = findBinary();
-      if (existing) {
-        console.log(`  Found: ${existing}`);
-      } else {
-        console.log(`  Not found`);
-        console.log(`  Expected path: ${getBinaryPath()}`);
-        console.log(`  Try: bun add ${npmPackage}`);
-      }
-      break;
-    }
-
-    case "version":
-    case "--version":
-    case "-v": {
-      const pkg = await getPackageInfo();
-      console.log(pkg.version);
-      break;
-    }
-
-    default: {
-      const pkg = await getPackageInfo();
-      console.log(`fff - Fast File Finder CLI v${pkg.version}`);
-      console.log("");
-      console.log("Usage:");
-      console.log(
-        "  bunx fff download [tag]    Download native binary from GitHub (fallback)",
-      );
-      console.log("  bunx fff info              Show platform and binary info");
-      console.log("  bunx fff version           Show version");
-      console.log("  bunx fff help              Show this help message");
-      console.log("");
-      console.log("Examples:");
-      console.log("  bunx fff download          Download latest binary from GitHub");
-      console.log("  bunx fff download abc1234  Download specific release tag");
-      console.log("");
-      console.log(
-        "Note: Binaries are normally provided via platform-specific npm packages.",
-      );
-      console.log("The download command is a fallback for when those aren't available.");
-      break;
-    }
-  }
-}
-
-main();