ucn 3.7.20 → 3.7.22

package/core/output.js

@@ -8,6 +8,17 @@
 const fs = require('fs');
 const path = require('path');
 
+const FILE_ERROR_MESSAGES = {
+    'file-not-found': 'File not found in project',
+    'file-ambiguous': 'Ambiguous file match'
+};
+
+function formatFileError(errorObj, fallbackPath) {
+    const msg = FILE_ERROR_MESSAGES[errorObj.error] || errorObj.error;
+    const file = errorObj.filePath || fallbackPath || '';
+    return `Error: ${msg}: ${file}`;
+}
+
 /**
  * Normalize parameters for display
  * Collapses multiline params to single line
@@ -381,7 +392,7 @@ function formatSearchJson(results, term) {
  * Format imports as JSON
  */
 function formatImportsJson(imports, filePath) {
-    if (imports?.error === 'file-not-found') return JSON.stringify({ found: false, error: 'File not found', file: imports.filePath }, null, 2);
+    if (imports?.error) return JSON.stringify({ found: false, error: imports.error, file: imports.filePath || filePath }, null, 2);
     return JSON.stringify({
         file: filePath,
         importCount: imports.length,
@@ -406,7 +417,7 @@ function formatStatsJson(stats) {
  * Format dependency graph as JSON
  */
 function formatGraphJson(graph) {
-    if (graph?.error === 'file-not-found') return JSON.stringify({ found: false, error: 'File not found', file: graph.filePath }, null, 2);
+    if (graph?.error) return JSON.stringify({ found: false, error: graph.error, file: graph.filePath }, null, 2);
     return JSON.stringify({
         file: graph.file,
         depth: graph.depth,
@@ -456,7 +467,7 @@ function formatSmartJson(result) {
  * Format imports command output - text
  */
 function formatImports(imports, filePath) {
-    if (imports?.error === 'file-not-found') return `Error: File not found in project: ${imports.filePath}`;
+    if (imports?.error) return formatFileError(imports, filePath);
     const lines = [`Imports in ${filePath}:\n`];
 
     const internal = imports.filter(i => !i.isExternal && !i.isDynamic);
@@ -505,7 +516,7 @@ function formatImports(imports, filePath) {
  * Format exporters command output - text
  */
 function formatExporters(exporters, filePath) {
-    if (exporters?.error === 'file-not-found') return `Error: File not found in project: ${exporters.filePath}`;
+    if (exporters?.error) return formatFileError(exporters, filePath);
     const lines = [`Files that import ${filePath}:\n`];
 
     if (exporters.length === 0) {
@@ -641,7 +652,7 @@ function formatDisambiguation(matches, name, command) {
  * Format exporters as JSON
  */
 function formatExportersJson(exporters, filePath) {
-    if (exporters?.error === 'file-not-found') return JSON.stringify({ found: false, error: 'File not found', file: exporters.filePath }, null, 2);
+    if (exporters?.error) return JSON.stringify({ found: false, error: exporters.error, file: exporters.filePath || filePath }, null, 2);
     return JSON.stringify({
         file: filePath,
         importerCount: exporters.length,
@@ -743,10 +754,13 @@ function formatTrace(trace, options = {}) {
         if (node.callCount) {
             label += ` ${node.callCount}x`;
         }
+        if (node.alreadyShown) {
+            label += ' (see above)';
+        }
 
         lines.push(prefix + connector + label);
 
-        if (node.children) {
+        if (node.children && !node.alreadyShown) {
             const hasMore = node.truncatedChildren > 0;
             for (let i = 0; i < node.children.length; i++) {
                 const isChildLast = !hasMore && i === node.children.length - 1;
@@ -1815,7 +1829,7 @@ function formatGraph(graph, options = {}) {
     if (typeof options === 'boolean') {
         options = { showAll: options };
     }
-    if (graph?.error === 'file-not-found') return `Error: File not found in project: ${graph.filePath}`;
+    if (graph?.error) return formatFileError(graph);
     if (graph.nodes.length === 0) {
         const file = options.file || graph.root || '';
         return file ? `File not found: ${file}` : 'File not found.';
@@ -1985,7 +1999,7 @@ function formatSearch(results, term) {
  * Format file-exports command output
  */
 function formatFileExports(exports, filePath) {
-    if (exports?.error === 'file-not-found') return `Error: File not found in project: ${exports.filePath}`;
+    if (exports?.error) return formatFileError(exports, filePath);
     if (exports.length === 0) return `No exports found in ${filePath}`;
 
     const lines = [];

package/core/parser.js

@@ -67,6 +67,9 @@ const { detectLanguage, getParser, getLanguageModule, isSupported, PARSE_OPTIONS
  * @returns {ParseResult}
  */
 function parse(code, language) {
+    if (!language) {
+        throw new Error('Language parameter is required');
+    }
     // Detect language if file path provided
     if (language.includes('.') || language.includes('/')) {
         language = detectLanguage(language);

package/core/project.js

@@ -1514,6 +1514,7 @@ class ProjectIndex {
             }
 
             const tree = safeParse(parser, content);
+            if (!tree) return false;
 
             // Find all occurrences of name in the line
             const nameRegex = new RegExp('(?<![a-zA-Z0-9_$])' + escapeRegExp(name) + '(?![a-zA-Z0-9_$])', 'g');
@@ -2120,6 +2121,7 @@ class ProjectIndex {
             }
 
             const tree = safeParse(parser, content);
+            if (!tree) return false;
             const tokenType = getTokenTypeAtPosition(tree.rootNode, lineNum, column);
             return tokenType === 'comment' || tokenType === 'string';
         } catch (e) {
@@ -3005,10 +3007,30 @@ class ProjectIndex {
                 // Filter out usages that are at the definition location
                 // nameLine: when decorators/annotations are present, startLine is the decorator line
                 // but the name identifier is on a different line (nameLine). Check both.
-                const nonDefUsages = allUsages.filter(u =>
+                let nonDefUsages = allUsages.filter(u =>
                     !(u.file === symbol.file && (u.line === symbol.startLine || u.line === symbol.nameLine))
                 );
 
+                // For exported symbols in --include-exported mode, also filter out export-site
+                // references (e.g., `module.exports = { helperC }` or `export { helperC }`).
+                // These are just re-statements of the export, not actual consumption.
+                if (isExported && options.includeExported) {
+                    nonDefUsages = nonDefUsages.filter(u => {
+                        if (u.file !== symbol.file) return true; // cross-file usage always counts
+                        // Check if same-file usage is on an export line
+                        const content = this._readFile(u.file);
+                        if (!content) return true;
+                        const lines = content.split('\n');
+                        const line = lines[u.line - 1] || '';
+                        const trimmed = line.trim();
+                        // CJS: module.exports = { ... } or exports.name = ...
+                        if (trimmed.startsWith('module.exports') || /^exports\.\w+\s*=/.test(trimmed)) return false;
+                        // ESM: export { ... } or export default
+                        if (/^export\s*\{/.test(trimmed) || /^export\s+default\s/.test(trimmed)) return false;
+                        return true;
+                    });
+                }
+
                 // Total includes all usage types (calls, references, callbacks, re-exports)
                 const totalUsages = nonDefUsages.length;
 
@@ -3374,10 +3396,22 @@ class ProjectIndex {
 
         const buildTree = (funcDef, currentDepth, dir) => {
             const funcName = funcDef.name;
-            if (currentDepth > maxDepth || visited.has(`${funcDef.file}:${funcDef.startLine}`)) {
+            const key = `${funcDef.file}:${funcDef.startLine}`;
+            if (currentDepth > maxDepth) {
                 return null;
             }
-            visited.add(`${funcDef.file}:${funcDef.startLine}`);
+            if (visited.has(key)) {
+                // Already explored — show as leaf node without recursing (prevents infinite loops)
+                return {
+                    name: funcName,
+                    file: funcDef.relativePath,
+                    line: funcDef.startLine,
+                    type: funcDef.type,
+                    children: [],
+                    alreadyShown: true
+                };
+            }
+            visited.add(key);
 
             const node = {
                 name: funcName,
@@ -4009,10 +4043,12 @@ class ProjectIndex {
                 params = params.slice(1);
             }
         }
-        const expectedParamCount = params.length;
-        const optionalCount = params.filter(p => p.optional || p.default !== undefined).length;
-        const minArgs = expectedParamCount - optionalCount;
         const hasRest = params.some(p => p.rest);
+        // Rest params don't count toward expected/min — they accept 0+ extra args
+        const nonRestParams = params.filter(p => !p.rest);
+        const expectedParamCount = nonRestParams.length;
+        const optionalCount = nonRestParams.filter(p => p.optional || p.default !== undefined).length;
+        const minArgs = expectedParamCount - optionalCount;
 
         // Get all call sites
         const usages = this.usages(name, { codeOnly: true });
@@ -5009,6 +5045,7 @@ class ProjectIndex {
             const parser = getParser(language);
             const content = this._readFile(filePath);
             const tree = safeParse(parser, content);
+            if (!tree) return result;
 
             const row = lineNum - 1;
             const node = tree.rootNode.descendantForPosition({ row, column: 0 });

package/languages/go.js

@@ -448,6 +448,7 @@ function findCallsInCode(code, parser) {
         if (node.type === 'short_var_declaration' || node.type === 'var_declaration') {
             // Check if RHS contains a func_literal
             const hasFunc = (n) => {
+                if (!n) return false;
                 if (n.type === 'func_literal') return true;
                 for (let i = 0; i < n.childCount; i++) {
                     if (hasFunc(n.child(i))) return true;
@@ -518,7 +519,7 @@ function findCallsInCode(code, parser) {
         onLeave: (node) => {
             if (isFunctionNode(node)) {
                 const leaving = functionStack.pop();
-                closureScopes.delete(leaving.startLine);
+                if (leaving) closureScopes.delete(leaving.startLine);
             }
         }
     });

package/languages/javascript.js

@@ -1453,7 +1453,9 @@ function findImportsInCode(code, parser) {
                         }
                     }
 
-                    imports.push({ module: modulePath, names, type: 'require', line, dynamic });
+                    if (modulePath) {
+                        imports.push({ module: modulePath, names, type: 'require', line, dynamic });
+                    }
                 }
             }
 
@@ -1466,8 +1468,8 @@ function findImportsInCode(code, parser) {
                     if (firstArg && firstArg.type === 'string') {
                         const modulePath = firstArg.text.slice(1, -1);
                         imports.push({ module: modulePath, names: [], type: 'dynamic', line, dynamic: false });
-                    } else {
-                        imports.push({ module: firstArg ? firstArg.text : null, names: [], type: 'dynamic', line, dynamic: true });
+                    } else if (firstArg) {
+                        imports.push({ module: firstArg.text, names: [], type: 'dynamic', line, dynamic: true });
                     }
                 }
             }

package/languages/rust.js

@@ -845,7 +845,7 @@ function findImportsInCode(code, parser) {
         if (node.type === 'macro_invocation') {
             const nameNode = node.childForFieldName('macro');
             if (nameNode && /^include(_str|_bytes)?$/.test(nameNode.text)) {
-                const argsNode = node.childForFieldName('argument_list');
+                const argsNode = node.namedChildren.find(c => c.type === 'token_tree');
                 const arg = argsNode?.namedChild(0);
                 const dynamic = !arg || arg.type !== 'string_literal';
                 const modulePath = arg ? arg.text.replace(/^["']|["']$/g, '') : null;

package/languages/utils.js

@@ -96,8 +96,9 @@ function parseJSParam(param, info) {
         if (patternNode) info.name = patternNode.text;
         if (typeNode) info.type = typeNode.text.replace(/^:\s*/, '');
         if (param.type === 'optional_parameter') info.optional = true;
-    } else if (param.type === 'rest_parameter') {
-        const patternNode = param.childForFieldName('pattern');
+    } else if (param.type === 'rest_parameter' || param.type === 'rest_pattern') {
+        // rest_parameter = TypeScript, rest_pattern = JavaScript
+        const patternNode = param.childForFieldName('pattern') || param.namedChild(0);
         if (patternNode) info.name = patternNode.text;
         info.rest = true;
     } else if (param.type === 'assignment_pattern') {

package/mcp/server.js

@@ -108,6 +108,7 @@ const server = new McpServer({
 const MAX_OUTPUT_CHARS = 100000; // ~100KB, safe for all MCP clients
 
 function toolResult(text) {
+    if (!text) return { content: [{ type: 'text', text: '(no output)' }] };
     if (text.length > MAX_OUTPUT_CHARS) {
         const truncated = text.substring(0, MAX_OUTPUT_CHARS);
         // Cut at last newline to avoid breaking mid-line

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucn",
-  "version": "3.7.20",
+  "version": "3.7.22",
   "mcpName": "io.github.mleoca/ucn",
   "description": "Universal Code Navigator — AST-based call graph analysis for AI agents. Find callers, trace impact, detect dead code across JS/TS, Python, Go, Rust, Java, and HTML. CLI, MCP server, and agent skill.",
   "main": "index.js",