archtracker-mcp 0.4.2 → 0.4.3

package/dist/mcp/index.js

@@ -604,7 +604,7 @@ var RegexEngine = class {
         continue;
       }
       const stripped = stripComments(content, this.config.commentStyle);
-      const imports = this.extractImports(stripped);
+      const imports = this.extractImports(stripped, filePath, absRootDir, projectFileSet);
       for (const importPath of imports) {
         const resolved = this.config.resolveImport(
           importPath,
@@ -638,9 +638,9 @@ var RegexEngine = class {
       totalEdges: edges.length
     };
   }
-  extractImports(content) {
+  extractImports(content, filePath, rootDir, projectFiles) {
     if (this.config.extractImports) {
-      return this.config.extractImports(content);
+      return this.config.extractImports(content, filePath, rootDir, projectFiles);
     }
     const imports = [];
     for (const pattern of this.config.importPatterns) {
@@ -841,19 +841,20 @@ var python = {
   extensions: [".py"],
   commentStyle: "python",
   importPatterns: [
-    // from package.module import something
-    { regex: /^from\s+(\.[\w.]*|\w[\w.]*)\s+import\b/gm }
+    // from package.module import something (including indented, e.g. inside try/except)
+    { regex: /^\s*from\s+(\.[\w.]*|\w[\w.]*)\s+import\b/gm }
     // import package.module (handled by extractImports for multi-module case)
   ],
   // Bug #1 fix: custom extractImports to handle `import a, b, c`
+  // Bug #12 fix: allow leading whitespace to catch try/except indented imports
   extractImports(content) {
     const imports = [];
-    const fromRegex = /^from\s+(\.[\w.]*|\w[\w.]*)\s+import\b/gm;
+    const fromRegex = /^\s*from\s+(\.[\w.]*|\w[\w.]*)\s+import\b/gm;
     let match;
     while ((match = fromRegex.exec(content)) !== null) {
       imports.push(match[1]);
     }
-    const importRegex = /^import\s+([\w.]+(?:\s*,\s*[\w.]+)*)/gm;
+    const importRegex = /^\s*import\s+([\w.]+(?:\s*,\s*[\w.]+)*)/gm;
     while ((match = importRegex.exec(content)) !== null) {
       const modules = match[1].split(",");
       for (const mod of modules) {
@@ -1212,17 +1213,48 @@ var kotlin = {
   },
   defaultExclude: ["build", "\\.gradle", "\\.idea"]
 };
+var CS_SKIP_CLASSNAMES = /* @__PURE__ */ new Set(["AssemblyInfo", "GlobalUsings"]);
 var cSharp = {
   id: "c-sharp",
   extensions: [".cs"],
   commentStyle: "c-style",
-  importPatterns: [
-    // using Namespace; and using Namespace.SubNamespace;
-    // using static Namespace.Class;
-    // Skip: using Alias = Namespace.Class; (captured but resolved same way)
-    { regex: /^using\s+(?:static\s+)?([\w.]+)\s*;/gm }
-  ],
+  importPatterns: [],
+  // handled by extractImports
+  extractImports(content, filePath, _rootDir, projectFiles) {
+    const imports = [];
+    const usingRegex = /^\s*(?:global\s+)?using\s+(?:static\s+)?([\w.]+)\s*;/gm;
+    let match;
+    while ((match = usingRegex.exec(content)) !== null) {
+      imports.push(match[1]);
+    }
+    const classMap = /* @__PURE__ */ new Map();
+    for (const f of projectFiles) {
+      if (f === filePath) continue;
+      if (!f.endsWith(".cs")) continue;
+      const basename = f.split("/").pop();
+      const className = basename.replace(/\.xaml\.cs$/i, "").replace(/\.cs$/i, "");
+      if (!className || CS_SKIP_CLASSNAMES.has(className)) continue;
+      classMap.set(className, f);
+    }
+    if (classMap.size > 0) {
+      const escaped = [...classMap.keys()].map(
+        (n) => n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+      );
+      const combined = new RegExp(`\\b(${escaped.join("|")})\\b`, "g");
+      const matched = /* @__PURE__ */ new Set();
+      while ((match = combined.exec(content)) !== null) {
+        const className = match[1];
+        const targetPath = classMap.get(className);
+        if (targetPath && !matched.has(targetPath)) {
+          matched.add(targetPath);
+          imports.push(targetPath);
+        }
+      }
+    }
+    return imports;
+  },
   resolveImport(importPath, _sourceFile, rootDir, projectFiles) {
+    if (projectFiles.has(importPath)) return importPath;
     const segments = importPath.split(".");
     for (let i = segments.length; i > 0; i--) {
       const filePath = segments.slice(0, i).join("/") + ".cs";