maven-indexer-mcp 1.0.5 → 1.0.7

package/build/indexer.js

@@ -15,7 +15,8 @@ export class Indexer {
     isIndexing = false;
     watcher = null;
     debounceTimer = null;
-    constructor() { }
+    constructor() {
+    }
     static getInstance() {
         if (!Indexer.instance) {
             Indexer.instance = new Indexer();
@@ -44,7 +45,13 @@ export class Indexer {
         }
         console.error(`Starting file watcher on ${pathsToWatch.join(', ')}...`);
         this.watcher = chokidar.watch(pathsToWatch, {
-            ignored: /(^|[\/\\])\../, // ignore dotfiles
+            ignored: (p) => {
+                // Don't ignore the root paths themselves
+                if (pathsToWatch.includes(p))
+                    return false;
+                // Ignore dotfiles/dotdirs
+                return path.basename(p).startsWith('.');
+            },
             persistent: true,
             ignoreInitial: true,
             depth: 10 // Limit depth to avoid too much overhead? Standard maven repo depth is around 3-5
@@ -105,13 +112,13 @@ export class Indexer {
             let artifacts = [];
             if (repoPath && fsSync.existsSync(repoPath)) {
                 console.error(`Scanning Maven repo: ${repoPath}`);
-                const mavenArtifacts = await this.scanRepository(repoPath);
+                const mavenArtifacts = await this.scanRepository(repoPath, config.normalizedIncludedPackages);
                 console.error(`Found ${mavenArtifacts.length} Maven artifacts.`);
                 artifacts = artifacts.concat(mavenArtifacts);
             }
             if (gradleRepoPath && fsSync.existsSync(gradleRepoPath)) {
                 console.error(`Scanning Gradle repo: ${gradleRepoPath}`);
-                const gradleArtifacts = await this.scanGradleRepository(gradleRepoPath);
+                const gradleArtifacts = await this.scanGradleRepository(gradleRepoPath, config.normalizedIncludedPackages);
                 console.error(`Found ${gradleArtifacts.length} Gradle artifacts.`);
                 artifacts = artifacts.concat(gradleArtifacts);
             }
@@ -119,9 +126,10 @@ export class Indexer {
             // 2. Persist artifacts and determine what needs indexing
             // We use is_indexed = 0 for new artifacts.
             const insertArtifact = db.prepare(`
-            INSERT OR IGNORE INTO artifacts (group_id, artifact_id, version, abspath, has_source, is_indexed)
-            VALUES (@groupId, @artifactId, @version, @abspath, @hasSource, 0)
-        `);
+                INSERT
+                OR IGNORE INTO artifacts (group_id, artifact_id, version, abspath, has_source, is_indexed)
+                VALUES (@groupId, @artifactId, @version, @abspath, @hasSource, 0)
+            `);
             // Use a transaction only for the batch insert of artifacts
             db.transaction(() => {
                 for (const art of artifacts) {
@@ -144,10 +152,10 @@ export class Indexer {
             }
             // 3. Find artifacts that need indexing (is_indexed = 0)
             const artifactsToIndex = db.prepare(`
-            SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
-            FROM artifacts 
-            WHERE is_indexed = 0
-        `).all();
+                SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
+                FROM artifacts
+                WHERE is_indexed = 0
+            `).all();
             console.error(`${artifactsToIndex.length} artifacts need indexing.`);
             // 4. Scan JARs for classes and update DB
             const CHUNK_SIZE = 50;
@@ -171,8 +179,11 @@ export class Indexer {
     }
     /**
      * Recursively scans a directory for Maven artifacts (POM files).
+     *
+     * @param repoRoot The root directory of the Maven repository.
+     * @param normalizedPatterns List of normalized package patterns to include.
      */
-    async scanRepository(rootDir) {
+    async scanRepository(repoRoot, normalizedPatterns = []) {
         const results = [];
         const scanDir = async (dir) => {
             let entries;
@@ -188,7 +199,7 @@ export class Indexer {
                 const artifactDir = path.dirname(dir);
                 const artifactId = path.basename(artifactDir);
                 const groupDir = path.dirname(artifactDir);
-                const relGroupPath = path.relative(rootDir, groupDir);
+                const relGroupPath = path.relative(repoRoot, groupDir);
                 const groupId = relGroupPath.split(path.sep).join('.');
                 if (groupId && artifactId && version && !groupId.startsWith('..')) {
                     const sourceJarPath = path.join(dir, `${artifactId}-${version}-sources.jar`);
@@ -213,14 +224,49 @@ export class Indexer {
                 }
             }
         };
-        await scanDir(rootDir);
+        const startDirs = this.getMavenStartDirs(repoRoot, normalizedPatterns);
+        console.error(`Scanning Maven directories: ${startDirs.join(', ')}`);
+        for (const startDir of startDirs) {
+            await scanDir(startDir);
+        }
         return results;
     }
+    /**
+     * Calculates the starting directories for Maven scanning based on included packages.
+     *
+     * @param repoRoot The root of the Maven repository.
+     * @param normalizedPatterns The list of normalized included packages.
+     */
+    getMavenStartDirs(repoRoot, normalizedPatterns) {
+        if (normalizedPatterns.length === 0) {
+            return [repoRoot];
+        }
+        return normalizedPatterns.map(p => path.join(repoRoot, p.split('.').join(path.sep)));
+    }
+    /**
+     * Checks if a group ID is included in the normalized patterns.
+     *
+     * @param groupId The group ID (e.g., "com.google.guava").
+     * @param normalizedPatterns The list of normalized patterns.
+     */
+    isGroupIncluded(groupId, normalizedPatterns) {
+        if (!normalizedPatterns || normalizedPatterns.length === 0)
+            return true;
+        for (const pattern of normalizedPatterns) {
+            if (groupId === pattern || groupId.startsWith(pattern + '.')) {
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * Scans a Gradle cache directory for artifacts.
      * Structure: group/artifact/version/hash/file
+     *
+     * @param rootDir The root directory of the Gradle cache (e.g., ~/.gradle/caches/modules-2/files-2.1).
+     * @param normalizedPatterns List of normalized package patterns to include.
      */
-    async scanGradleRepository(rootDir) {
+    async scanGradleRepository(rootDir, normalizedPatterns = []) {
         const results = [];
         // Helper to read directory safely
         const readDirSafe = async (p) => {
@@ -236,6 +282,9 @@ export class Indexer {
             if (!groupEntry.isDirectory())
                 continue;
             const groupId = groupEntry.name;
+            if (!this.isGroupIncluded(groupId, normalizedPatterns)) {
+                continue;
+            }
             const groupPath = path.join(rootDir, groupId);
             const artifactDirs = await readDirSafe(groupPath);
             for (const artifactEntry of artifactDirs) {
@@ -302,7 +351,7 @@ export class Indexer {
             await fs.access(jarPath);
         }
         catch {
-            // If jar missing, mark as indexed so we don't retry endlessly? 
+            // If jar missing, mark as indexed so we don't retry endlessly?
             // Or maybe it's a pom-only artifact.
             db.prepare('UPDATE artifacts SET is_indexed = 1 WHERE id = ?').run(artifact.id);
             return;
@@ -333,13 +382,21 @@ export class Indexer {
                                     // Simple check to avoid module-info or invalid names
                                     if (!info.className.includes('$') && info.className.length > 0) {
                                         // Filter by includedPackages
-                                        if (this.isPackageIncluded(info.className, config.includedPackages)) {
+                                        if (this.isPackageIncluded(info.className, config.normalizedIncludedPackages)) {
                                             classes.push(info.className);
                                             if (info.superClass && info.superClass !== 'java.lang.Object') {
-                                                inheritance.push({ className: info.className, parent: info.superClass, type: 'extends' });
+                                                inheritance.push({
+                                                    className: info.className,
+                                                    parent: info.superClass,
+                                                    type: 'extends'
+                                                });
                                             }
                                             for (const iface of info.interfaces) {
-                                                inheritance.push({ className: info.className, parent: iface, type: 'implements' });
+                                                inheritance.push({
+                                                    className: info.className,
+                                                    parent: iface,
+                                                    type: 'implements'
+                                                });
                                             }
                                         }
                                     }
@@ -360,13 +417,13 @@ export class Indexer {
                     try {
                         db.transaction(() => {
                             const insertClass = db.prepare(`
-                              INSERT INTO classes_fts (artifact_id, class_name, simple_name)
-                              VALUES (?, ?, ?)
-                          `);
+                                INSERT INTO classes_fts (artifact_id, class_name, simple_name)
+                                VALUES (?, ?, ?)
+                            `);
                             const insertInheritance = db.prepare(`
-                              INSERT INTO inheritance (artifact_id, class_name, parent_class_name, type)
-                              VALUES (?, ?, ?, ?)
-                          `);
+                                INSERT INTO inheritance (artifact_id, class_name, parent_class_name, type)
+                                VALUES (?, ?, ?, ?)
+                            `);
                             for (const cls of classes) {
                                 const simpleName = cls.split('.').pop() || cls;
                                 insertClass.run(artifact.id, cls, simpleName);
@@ -391,23 +448,17 @@ export class Indexer {
     }
     /**
      * Checks if a class package is included in the configuration patterns.
+     *
+     * @param className The fully qualified class name.
+     * @param normalizedPatterns The list of normalized package patterns.
      */
-    isPackageIncluded(className, patterns) {
-        if (patterns.length === 0 || (patterns.length === 1 && patterns[0] === '*'))
+    isPackageIncluded(className, normalizedPatterns) {
+        if (!normalizedPatterns || normalizedPatterns.length === 0)
             return true;
-        for (const pattern of patterns) {
-            if (pattern === '*')
+        for (const pattern of normalizedPatterns) {
+            // Match exact package or subpackage
+            if (className === pattern || className.startsWith(pattern + '.')) {
                 return true;
-            if (pattern.endsWith('.*')) {
-                const prefix = pattern.slice(0, -2); // "com.example"
-                // Match exact package or subpackage
-                if (className === prefix || className.startsWith(prefix + '.'))
-                    return true;
-            }
-            else {
-                // Exact match
-                if (className === pattern)
-                    return true;
             }
         }
         return false;
@@ -419,11 +470,11 @@ export class Indexer {
         // Artifact coordinates search
         const db = DB.getInstance();
         const rows = db.prepare(`
-          SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
-          FROM artifacts
-          WHERE group_id LIKE ? OR artifact_id LIKE ?
-          LIMIT 50
-      `).all(`%${query}%`, `%${query}%`);
+            SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
+            FROM artifacts
+            WHERE group_id LIKE ?
+               OR artifact_id LIKE ? LIMIT 50
+        `).all(`%${query}%`, `%${query}%`);
         return rows;
     }
     /**
@@ -438,12 +489,19 @@ export class Indexer {
                 // Regex search
                 const regex = classNamePattern.substring(6);
                 rows = db.prepare(`
-                  SELECT c.class_name, c.simple_name, a.id, a.group_id, a.artifact_id, a.version, a.abspath, a.has_source
-                  FROM classes_fts c
-                  JOIN artifacts a ON c.artifact_id = a.id
-                  WHERE c.class_name REGEXP ? OR c.simple_name REGEXP ?
+                    SELECT c.class_name,
+                           c.simple_name,
+                           a.id,
+                           a.group_id,
+                           a.artifact_id,
+                           a.version,
+                           a.abspath,
+                           a.has_source
+                    FROM classes_fts c
+                             JOIN artifacts a ON c.artifact_id = a.id
+                    WHERE c.class_name REGEXP ? OR c.simple_name REGEXP ?
                   LIMIT 100
-              `).all(regex, regex);
+                `).all(regex, regex);
             }
             else if (classNamePattern.includes('*') || classNamePattern.includes('?')) {
                 // Glob-style search (using LIKE for standard wildcards)
@@ -451,12 +509,19 @@ export class Indexer {
                 // But standard glob is * and ?
                 const likePattern = classNamePattern.replace(/\*/g, '%').replace(/\?/g, '_');
                 rows = db.prepare(`
-                  SELECT c.class_name, c.simple_name, a.id, a.group_id, a.artifact_id, a.version, a.abspath, a.has_source
-                  FROM classes_fts c
-                  JOIN artifacts a ON c.artifact_id = a.id
-                  WHERE c.class_name LIKE ? OR c.simple_name LIKE ?
-                  LIMIT 100
-              `).all(likePattern, likePattern);
+                    SELECT c.class_name,
+                           c.simple_name,
+                           a.id,
+                           a.group_id,
+                           a.artifact_id,
+                           a.version,
+                           a.abspath,
+                           a.has_source
+                    FROM classes_fts c
+                             JOIN artifacts a ON c.artifact_id = a.id
+                    WHERE c.class_name LIKE ?
+                       OR c.simple_name LIKE ? LIMIT 100
+                `).all(likePattern, likePattern);
             }
             else {
                 // Use FTS for smart matching
@@ -468,13 +533,19 @@ export class Indexer {
                     ? `"${escapedPattern}"* OR ${safeQuery}`
                     : `"${escapedPattern}"*`;
                 rows = db.prepare(`
-                  SELECT c.class_name, c.simple_name, a.id, a.group_id, a.artifact_id, a.version, a.abspath, a.has_source
-                  FROM classes_fts c
-                  JOIN artifacts a ON c.artifact_id = a.id
-                  WHERE c.classes_fts MATCH ?
-                  ORDER BY rank
-                  LIMIT 100
-              `).all(query);
+                    SELECT c.class_name,
+                           c.simple_name,
+                           a.id,
+                           a.group_id,
+                           a.artifact_id,
+                           a.version,
+                           a.abspath,
+                           a.has_source
+                    FROM classes_fts c
+                             JOIN artifacts a ON c.artifact_id = a.id
+                    WHERE c.classes_fts MATCH ?
+                    ORDER BY rank LIMIT 100
+                `).all(query);
             }
             // Group by class name
             const resultMap = new Map();
@@ -516,16 +587,17 @@ export class Indexer {
             }
             // Recursive search for all implementations/subclasses
             const rows = db.prepare(`
-              WITH RECURSIVE hierarchy(class_name, artifact_id) AS (
-                SELECT class_name, artifact_id FROM inheritance WHERE parent_class_name = ?
-                UNION
-                SELECT i.class_name, i.artifact_id FROM inheritance i JOIN hierarchy h ON i.parent_class_name = h.class_name
-              )
-              SELECT DISTINCT h.class_name, a.id, a.group_id, a.artifact_id, a.version, a.abspath, a.has_source
-              FROM hierarchy h
-              JOIN artifacts a ON h.artifact_id = a.id
-              LIMIT 100
-          `).all(className);
+                WITH RECURSIVE hierarchy(class_name, artifact_id) AS (SELECT class_name, artifact_id
+                                                                      FROM inheritance
+                                                                      WHERE parent_class_name = ?
+                                                                      UNION
+                                                                      SELECT i.class_name, i.artifact_id
+                                                                      FROM inheritance i
+                                                                               JOIN hierarchy h ON i.parent_class_name = h.class_name)
+                SELECT DISTINCT h.class_name, a.id, a.group_id, a.artifact_id, a.version, a.abspath, a.has_source
+                FROM hierarchy h
+                         JOIN artifacts a ON h.artifact_id = a.id LIMIT 100
+            `).all(className);
             console.error(`Searching implementations for ${className}: found ${rows.length} rows.`);
             if (rows.length === 0) {
                 // Fallback: Try searching without recursion to see if direct children exist
@@ -563,9 +635,10 @@ export class Indexer {
     getArtifactById(id) {
         const db = DB.getInstance();
         const row = db.prepare(`
-          SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
-          FROM artifacts WHERE id = ?
-      `).get(id);
+            SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
+            FROM artifacts
+            WHERE id = ?
+        `).get(id);
         if (row) {
             return {
                 id: row.id,
@@ -584,10 +657,12 @@ export class Indexer {
     getArtifactByCoordinate(groupId, artifactId, version) {
         const db = DB.getInstance();
         const row = db.prepare(`
-          SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
-          FROM artifacts 
-          WHERE group_id = ? AND artifact_id = ? AND version = ?
-      `).get(groupId, artifactId, version);
+            SELECT id, group_id as groupId, artifact_id as artifactId, version, abspath, has_source as hasSource
+            FROM artifacts
+            WHERE group_id = ?
+              AND artifact_id = ?
+              AND version = ?
+        `).get(groupId, artifactId, version);
         if (row) {
             return {
                 id: row.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maven-indexer-mcp",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "MCP server for indexing local Maven repository",
   "main": "build/index.js",
   "type": "module",
@@ -46,10 +46,12 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.24.3",
+    "@types/semver": "^7.7.1",
     "@types/xml2js": "^0.4.14",
     "@types/yauzl": "^2.10.3",
     "better-sqlite3": "^12.5.0",
     "chokidar": "^5.0.0",
+    "semver": "^7.7.3",
     "xml2js": "^0.6.2",
     "yauzl": "^3.2.0",
     "zod": "^4.1.13"

package/build/reproduce_issue.js

@@ -1,20 +0,0 @@
-import { Indexer } from "./indexer.js";
-import { DB } from "./db/index.js";
-async function main() {
-    const db = DB.getInstance();
-    const indexer = Indexer.getInstance();
-    // We assume indexing is done since we just ran it.
-    console.log("Searching for 'Kotlin'...");
-    const kotlinResults = db.prepare("SELECT class_name FROM classes_fts WHERE class_name LIKE '%Kotlin%' LIMIT 10").all();
-    console.log("First 10 Kotlin classes:", kotlinResults);
-    console.log("Searching for 'AnAction'...");
-    const anActionResults = indexer.searchClass("AnAction");
-    console.log(`Found ${anActionResults.length} results for 'AnAction'.`);
-    if (anActionResults.length > 0) {
-        console.log(anActionResults[0]);
-    }
-    console.log("Searching for 'StringUtils'...");
-    const stringUtilsResults = indexer.searchClass("StringUtils");
-    console.log(`Found ${stringUtilsResults.length} results for 'StringUtils'.`);
-}
-main().catch(console.error);