scip-query 0.3.5 → 0.4.0

package/dist/reindex-worker.js

@@ -1,58 +1,165 @@
 import {
   describeIndexerBinary,
+  getIndexerExecutionEnv,
   isBinaryAvailable,
   isIndexerInstalled,
   resolveIndexerBinary,
+  resolveProjectLocalIndexerBinary,
   tryInstallIndexer,
   tryInstallScipCli
-} from "./chunk-NG5F43OU.js";
+} from "./chunk-P3VCDYMJ.js";
 
 // src/reindex/index.ts
 import { execFileSync } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync3, renameSync } from "fs";
+import { join as join3 } from "path";
 
 // src/reindex/detect.ts
-import { existsSync } from "fs";
-import { join } from "path";
+import { existsSync, readdirSync } from "fs";
+import { extname, join } from "path";
+var IGNORED_DIRS = /* @__PURE__ */ new Set([
+  ".git",
+  ".hg",
+  ".svn",
+  ".idea",
+  ".vscode",
+  "node_modules",
+  "vendor",
+  "dist",
+  "build",
+  "target",
+  "bin",
+  "obj",
+  ".dart_tool",
+  ".gradle",
+  ".next",
+  ".venv",
+  "venv",
+  "__pycache__"
+]);
 var LANGUAGE_MARKERS = [
-  { language: "typescript", files: ["tsconfig.json", "tsconfig.base.json"] },
-  { language: "rust", files: ["Cargo.toml"] },
-  { language: "go", files: ["go.mod"] },
-  { language: "java", files: ["pom.xml", "build.gradle", "build.gradle.kts"] },
-  { language: "kotlin", files: ["build.gradle.kts"] },
-  { language: "scala", files: ["build.sbt"] },
-  { language: "python", files: ["pyproject.toml", "setup.py", "setup.cfg", "Pipfile"] },
-  { language: "ruby", files: ["Gemfile"] },
-  { language: "csharp", files: ["*.csproj", "*.sln"] },
-  { language: "dart", files: ["pubspec.yaml"] },
-  { language: "php", files: ["composer.json"] },
-  { language: "javascript", files: ["package.json"] }
-  // Last — very common, low specificity
+  { language: "typescript", files: ["tsconfig.json", "tsconfig.base.json"], extensions: [".ts", ".tsx", ".mts", ".cts"] },
+  { language: "rust", files: ["Cargo.toml"], extensions: [".rs"] },
+  { language: "go", files: ["go.mod"], extensions: [".go"] },
+  { language: "java", files: ["pom.xml", "build.gradle", "build.gradle.kts"], extensions: [".java"] },
+  { language: "kotlin", files: ["build.gradle.kts"], extensions: [".kt", ".kts"] },
+  { language: "scala", files: ["build.sbt"], extensions: [".scala"] },
+  { language: "python", files: ["pyproject.toml", "setup.py", "setup.cfg", "Pipfile"], extensions: [".py", ".pyi"] },
+  { language: "ruby", files: ["Gemfile"], extensions: [".rb"] },
+  { language: "cpp", files: ["compile_commands.json", "CMakeLists.txt", "Makefile"], extensions: [".cc", ".cpp", ".cxx", ".hpp", ".hh", ".hxx"] },
+  { language: "c", files: ["compile_commands.json", "CMakeLists.txt", "Makefile"], extensions: [".c", ".h"] },
+  { language: "csharp", globs: ["*.csproj", "*.sln"], extensions: [".cs"] },
+  { language: "vb", globs: ["*.vbproj"], extensions: [".vb"] },
+  { language: "dart", files: ["pubspec.yaml"], extensions: [".dart"] },
+  { language: "php", files: ["composer.json"], extensions: [".php"] },
+  { language: "javascript", files: ["package.json"], extensions: [".js", ".jsx", ".mjs", ".cjs"] }
+  // Last — very common
 ];
 function detectLanguages(projectRoot2) {
   const detected = [];
+  const rootEntries = safeReadDir(projectRoot2);
+  const extensionSet = collectExtensions(projectRoot2);
   for (const marker of LANGUAGE_MARKERS) {
-    for (const file of marker.files) {
-      if (file.includes("*")) {
-        continue;
+    if (hasMarkerFile(projectRoot2, marker.files)) {
+      detected.push(marker.language);
+      continue;
+    }
+    if (matchesRootGlob(rootEntries, marker.globs)) {
+      detected.push(marker.language);
+      continue;
+    }
+    if (hasExtension(extensionSet, marker.extensions)) {
+      detected.push(marker.language);
+    }
+  }
+  if (detected.includes("typescript")) {
+    removeLanguage(detected, "javascript");
+  }
+  if (detected.includes("cpp") && !extensionSet.has(".c")) {
+    removeLanguage(detected, "c");
+  }
+  return detected;
+}
+function safeReadDir(projectRoot2) {
+  try {
+    return readdirSync(projectRoot2);
+  } catch {
+    return [];
+  }
+}
+function hasMarkerFile(projectRoot2, files) {
+  if (!files?.length) {
+    return false;
+  }
+  return files.some((file) => existsSync(join(projectRoot2, file)));
+}
+function matchesRootGlob(entries, globs) {
+  if (!globs?.length) {
+    return false;
+  }
+  return entries.some((entry) => globs.some((glob) => matchesSimpleGlob(entry, glob)));
+}
+function matchesSimpleGlob(entry, pattern) {
+  if (pattern === "*") {
+    return true;
+  }
+  if (!pattern.includes("*")) {
+    return entry === pattern;
+  }
+  const [prefix, suffix] = pattern.split("*");
+  return entry.startsWith(prefix ?? "") && entry.endsWith(suffix ?? "");
+}
+function collectExtensions(projectRoot2) {
+  const found = /* @__PURE__ */ new Set();
+  const stack = [projectRoot2];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    if (!current) {
+      continue;
+    }
+    let entries;
+    try {
+      entries = readdirSync(current, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (entry.name.startsWith(".") && !entry.name.endsWith("proj") && !entry.name.endsWith("sln")) {
+        if (entry.isDirectory()) {
+          continue;
+        }
       }
-      if (existsSync(join(projectRoot2, file))) {
-        if (!detected.includes(marker.language)) {
-          detected.push(marker.language);
+      const fullPath = join(current, entry.name);
+      if (entry.isDirectory()) {
+        if (!IGNORED_DIRS.has(entry.name)) {
+          stack.push(fullPath);
         }
-        break;
+        continue;
+      }
+      const extension = extname(entry.name).toLowerCase();
+      if (extension) {
+        found.add(extension);
       }
     }
   }
-  if (detected.includes("typescript")) {
-    const jsIdx = detected.indexOf("javascript");
-    if (jsIdx !== -1) detected.splice(jsIdx, 1);
+  return found;
+}
+function hasExtension(extensionSet, extensions) {
+  if (!extensions?.length) {
+    return false;
+  }
+  return extensions.some((extension) => extensionSet.has(extension));
+}
+function removeLanguage(detected, language) {
+  const index = detected.indexOf(language);
+  if (index !== -1) {
+    detected.splice(index, 1);
   }
-  return detected;
 }
 
 // src/reindex/indexers.ts
+import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
+import { join as join2 } from "path";
 var INDEXER_CONFIGS = {
   typescript: {
     language: "typescript",
@@ -92,9 +199,7 @@ var INDEXER_CONFIGS = {
       args: ["index", "--output", outputPath]
     }),
     markerFiles: ["pom.xml", "build.gradle"],
-    installMethods: [
-      { label: "coursier", prerequisite: "cs", binary: "cs", args: ["install", "scip-java"] }
-    ],
+    installMethods: [],
     installUrl: "https://github.com/sourcegraph/scip-java/releases"
   },
   scala: {
@@ -106,9 +211,7 @@ var INDEXER_CONFIGS = {
       args: ["index", "--output", outputPath]
     }),
     markerFiles: ["build.sbt"],
-    installMethods: [
-      { label: "coursier", prerequisite: "cs", binary: "cs", args: ["install", "scip-java"] }
-    ],
+    installMethods: [],
     installUrl: "https://github.com/sourcegraph/scip-java/releases"
   },
   kotlin: {
@@ -120,9 +223,7 @@ var INDEXER_CONFIGS = {
       args: ["index", "--output", outputPath]
     }),
     markerFiles: ["build.gradle.kts"],
-    installMethods: [
-      { label: "coursier", prerequisite: "cs", binary: "cs", args: ["install", "scip-java"] }
-    ],
+    installMethods: [],
     installUrl: "https://github.com/sourcegraph/scip-java/releases"
   },
   rust: {
@@ -158,10 +259,11 @@ var INDEXER_CONFIGS = {
     language: "ruby",
     indexerBinary: "scip-ruby",
     checkCommand: "scip-ruby --version",
-    indexArgs: ({ outputPath }) => ({
-      binary: "scip-ruby",
-      args: ["--output", outputPath]
+    indexArgs: ({ indexerBinary }) => ({
+      binary: indexerBinary,
+      args: ["--dir", "."]
     }),
+    defaultOutputPath: "index.scip",
     markerFiles: ["Gemfile"],
     installMethods: [],
     installUrl: "https://github.com/sourcegraph/scip-ruby/releases"
@@ -186,7 +288,7 @@ var INDEXER_CONFIGS = {
     checkCommand: "scip-clang --version",
     indexArgs: ({ outputPath }) => ({
       binary: "scip-clang",
-      args: ["--output", outputPath]
+      args: ["--compdb-path", "compile_commands.json", "--index-output-path", outputPath]
     }),
     markerFiles: ["CMakeLists.txt", "Makefile"],
     installMethods: [],
@@ -198,7 +300,7 @@ var INDEXER_CONFIGS = {
     checkCommand: "scip-clang --version",
     indexArgs: ({ outputPath }) => ({
       binary: "scip-clang",
-      args: ["--output", outputPath]
+      args: ["--compdb-path", "compile_commands.json", "--index-output-path", outputPath]
     }),
     markerFiles: ["CMakeLists.txt", "Makefile"],
     installMethods: [],
@@ -208,11 +310,25 @@ var INDEXER_CONFIGS = {
     language: "csharp",
     indexerBinary: "scip-dotnet",
     checkCommand: "scip-dotnet --version",
-    indexArgs: ({ outputPath }) => ({
+    indexArgs: ({ projectRoot: projectRoot2, outputPath }) => ({
       binary: "scip-dotnet",
-      args: ["index", "--output", outputPath]
+      args: ["index", resolveDotnetProject(projectRoot2, [".sln", ".csproj"]) ?? projectRoot2, "--output", outputPath, "--working-directory", projectRoot2]
+    }),
+    markerFiles: ["*.csproj", "*.sln"],
+    installMethods: [
+      { label: "dotnet", prerequisite: "dotnet", binary: "dotnet", args: ["tool", "install", "--global", "scip-dotnet"] }
+    ],
+    installUrl: "https://github.com/sourcegraph/scip-dotnet/releases"
+  },
+  vb: {
+    language: "vb",
+    indexerBinary: "scip-dotnet",
+    checkCommand: "scip-dotnet --version",
+    indexArgs: ({ projectRoot: projectRoot2, outputPath }) => ({
+      binary: "scip-dotnet",
+      args: ["index", resolveDotnetProject(projectRoot2, [".sln", ".vbproj"]) ?? projectRoot2, "--output", outputPath, "--working-directory", projectRoot2]
     }),
-    markerFiles: [],
+    markerFiles: ["*.vbproj", "*.sln"],
     installMethods: [
       { label: "dotnet", prerequisite: "dotnet", binary: "dotnet", args: ["tool", "install", "--global", "scip-dotnet"] }
     ],
@@ -222,9 +338,9 @@ var INDEXER_CONFIGS = {
     language: "dart",
     indexerBinary: "scip-dart",
     checkCommand: "scip-dart --version",
-    indexArgs: ({ outputPath }) => ({
-      binary: "scip-dart",
-      args: ["index", "--output", outputPath]
+    indexArgs: ({ indexerBinary, outputPath }) => ({
+      binary: indexerBinary,
+      args: ["--output", outputPath]
     }),
     markerFiles: ["pubspec.yaml"],
     installMethods: [
@@ -235,21 +351,44 @@ var INDEXER_CONFIGS = {
   php: {
     language: "php",
     indexerBinary: "scip-php",
+    projectLocalBinaries: ["vendor/davidrjenni/scip-php/bin/scip-php", "vendor/bin/scip-php"],
     checkCommand: "scip-php --version",
-    indexArgs: ({ outputPath }) => ({
-      binary: "scip-php",
-      args: ["index", "--output", outputPath]
-    }),
+    indexArgs: ({ projectRoot: projectRoot2, indexerBinary }) => {
+      const localBinary = join2(projectRoot2, "vendor", "bin", "scip-php");
+      const nestedLocalBinary = join2(projectRoot2, "vendor", "davidrjenni", "scip-php", "bin", "scip-php");
+      const targetBinary = existsSync2(nestedLocalBinary) ? nestedLocalBinary : existsSync2(localBinary) ? localBinary : indexerBinary;
+      return {
+        binary: "php",
+        args: [
+          "-d",
+          "error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED",
+          targetBinary
+        ]
+      };
+    },
+    defaultOutputPath: "index.scip",
     markerFiles: ["composer.json"],
-    installMethods: [
-      { label: "composer", prerequisite: "composer", binary: "composer", args: ["global", "require", "davidrjenni/scip-php"] }
-    ],
+    installMethods: [],
     installUrl: "https://github.com/davidrjenni/scip-php/releases"
   }
 };
 function getIndexerConfig(language) {
   return INDEXER_CONFIGS[language];
 }
+function resolveDotnetProject(projectRoot2, suffixes) {
+  let entries;
+  try {
+    entries = readdirSync2(projectRoot2);
+  } catch {
+    return null;
+  }
+  for (const entry of entries) {
+    if (suffixes.some((suffix) => entry.endsWith(suffix))) {
+      return join2(projectRoot2, entry);
+    }
+  }
+  return null;
+}
 
 // src/reindex/index.ts
 async function reindex(opts) {
@@ -259,8 +398,8 @@ async function reindex(opts) {
     onStatus = console.log,
     skipAutoInstall = false
   } = opts;
-  const outputScip2 = opts.outputScip ?? join2(projectRoot2, "index.scip");
-  const outputDb2 = opts.outputDb ?? join2(projectRoot2, "index.db");
+  const outputScip2 = opts.outputScip ?? join3(projectRoot2, "index.scip");
+  const outputDb2 = opts.outputDb ?? join3(projectRoot2, "index.db");
   const start = Date.now();
   const languages2 = opts.languages ?? detectLanguages(projectRoot2);
   if (languages2.length === 0) {
@@ -289,7 +428,8 @@ async function reindex(opts) {
   for (const lang of languages2) {
     const config = getIndexerConfig(lang);
     const binaryLabel = describeIndexerBinary(config);
-    if (!isIndexerInstalled(config)) {
+    const projectLocalBinary = resolveProjectLocalIndexerBinary(config, projectRoot2);
+    if (!projectLocalBinary && !isIndexerInstalled(config)) {
       if (skipAutoInstall) {
         throw new Error(
           `${binaryLabel} is required to index ${lang} but not found on PATH.
@@ -304,7 +444,7 @@ async function reindex(opts) {
         );
       }
     }
-    const resolvedBinary = resolveIndexerBinary(config);
+    const resolvedBinary = projectLocalBinary ?? resolveIndexerBinary(config);
     if (!resolvedBinary) {
       throw new Error(
         `${binaryLabel} is required to index ${lang} but was not found on PATH after installation checks.
@@ -312,6 +452,7 @@ async function reindex(opts) {
       );
     }
     onStatus(`Indexing ${lang} with ${resolvedBinary}...`);
+    const indexerEnv = getIndexerExecutionEnv(config, env, resolvedBinary);
     const { binary, args } = config.indexArgs({
       projectRoot: projectRoot2,
       outputPath: outputScip2,
@@ -321,7 +462,7 @@ async function reindex(opts) {
     try {
       execFileSync(binary, args, {
         cwd: projectRoot2,
-        env,
+        env: indexerEnv,
         stdio: "pipe",
         maxBuffer: 50 * 1024 * 1024
       });
@@ -332,9 +473,10 @@ async function reindex(opts) {
 Make sure ${binaryLabel} is installed and available on PATH.`
       );
     }
+    moveDefaultOutputIfNeeded(config, projectRoot2, outputScip2);
   }
   onStatus("Converting to SQLite...");
-  if (!existsSync2(outputScip2)) {
+  if (!existsSync3(outputScip2)) {
     throw new Error(`SCIP index not found at ${outputScip2} after indexing`);
   }
   try {
@@ -351,6 +493,15 @@ Make sure ${binaryLabel} is installed and available on PATH.`
   onStatus(`Done in ${(durationMs / 1e3).toFixed(1)}s`);
   return { languages: languages2, indexPath: outputScip2, dbPath: outputDb2, durationMs };
 }
+function moveDefaultOutputIfNeeded(config, projectRoot2, outputScip2) {
+  if (!config.defaultOutputPath) {
+    return;
+  }
+  const defaultOutputPath = join3(projectRoot2, config.defaultOutputPath);
+  if (outputScip2 !== defaultOutputPath && existsSync3(defaultOutputPath)) {
+    renameSync(defaultOutputPath, outputScip2);
+  }
+}
 
 // src/reindex-worker.ts
 var projectRoot = process.env["SCIP_REINDEX_PROJECT_ROOT"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scip-query",
-  "version": "0.3.5",
+  "version": "0.4.0",
   "description": "Language-agnostic code intelligence CLI powered by SCIP indexes",
   "type": "module",
   "main": "dist/index.js",