@mishasinitcyn/betterrank 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mishasinitcyn/betterrank",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Structural code index with PageRank-ranked repo maps, symbol search, call-graph queries, and dependency analysis. Built on tree-sitter and graphology.",
   "type": "module",
   "main": "src/index.js",
@@ -35,6 +35,12 @@
     "tree-sitter-javascript": "0.23.1",
     "tree-sitter-typescript": "0.23.2",
     "tree-sitter-python": "0.23.6",
+    "graphology": "^0.25.4",
+    "graphology-metrics": "^2.4.0",
+    "graphology-types": "^0.24.7",
+    "glob": "^11.0.1"
+  },
+  "optionalDependencies": {
     "tree-sitter-rust": "0.23.2",
     "tree-sitter-go": "0.23.4",
     "tree-sitter-ruby": "0.23.1",
@@ -42,11 +48,7 @@
     "tree-sitter-c": "0.23.4",
     "tree-sitter-cpp": "0.23.4",
     "tree-sitter-c-sharp": "0.23.1",
-    "tree-sitter-php": "0.23.11",
-    "graphology": "^0.25.4",
-    "graphology-metrics": "^2.4.0",
-    "graphology-types": "^0.24.7",
-    "glob": "^11.0.1"
+    "tree-sitter-php": "0.23.11"
   },
   "overrides": {
     "tree-sitter": "0.22.4"

package/src/cache.js

@@ -24,38 +24,90 @@ function getPlatformCacheDir() {
 const CACHE_DIR = getPlatformCacheDir();
 
 const IGNORE_PATTERNS = [
-  // Dependencies & generated
+  // ── JS / Node ──────────────────────────────────────────
   '**/node_modules/**',
-  '**/dist/**',
-  '**/build/**',
-  '**/coverage/**',
-  '**/vendor/**',
+  '**/.npm/**',
+  '**/.yarn/**',
+  '**/.pnp.*',
+  '**/bower_components/**',
   '**/*.min.js',
   '**/*.bundle.js',
   '**/*.map',
 
-  // VCS & tool caches
-  '**/.git/**',
-  '**/.code-index/**',
-  '**/.claude/**',
-  '**/.cursor/**',
-
-  // Language-specific caches
+  // ── Python ─────────────────────────────────────────────
   '**/__pycache__/**',
   '**/.venv/**',
+  '**/venv/**',
+  '**/env/**',
+  '**/.env/**',
+  '**/.virtualenvs/**',
+  '**/site-packages/**',
+  '**/*.egg-info/**',
+  '**/.eggs/**',
+  '**/.tox/**',
+  '**/.mypy_cache/**',
+  '**/.pytest_cache/**',
+  '**/.ruff_cache/**',
+
+  // ── Rust ───────────────────────────────────────────────
+  '**/target/debug/**',
+  '**/target/release/**',
+
+  // ── Java / JVM ─────────────────────────────────────────
+  '**/.gradle/**',
+  '**/.m2/**',
+
+  // ── Ruby ───────────────────────────────────────────────
+  '**/.bundle/**',
+
+  // ── C / C++ ────────────────────────────────────────────
+  '**/cmake-build-*/**',
+  '**/CMakeFiles/**',
+
+  // ── Go ─────────────────────────────────────────────────
+  '**/vendor/**',
+
+  // ── Build output & generated ───────────────────────────
+  '**/dist/**',
+  '**/build/**',
+  '**/out/**',
+  '**/coverage/**',
+
+  // ── Frameworks ─────────────────────────────────────────
   '**/.next/**',
   '**/.nuxt/**',
-
-  // iOS / mobile vendor
+  '**/.output/**',
+  '**/.svelte-kit/**',
+  '**/.angular/**',
+  '**/.turbo/**',
+  '**/.parcel-cache/**',
+  '**/.cache/**',
+
+  // ── iOS / mobile ───────────────────────────────────────
   '**/Pods/**',
   '**/*.xcframework/**',
 
-  // UI component libraries (shadcn, etc.) — high fan-in but rarely investigation targets.
+  // ── Infrastructure / deploy ────────────────────────────
+  '**/.terraform/**',
+  '**/.serverless/**',
+  '**/cdk.out/**',
+  '**/.vercel/**',
+  '**/.netlify/**',
+
+  // ── VCS & tool caches ──────────────────────────────────
+  '**/.git/**',
+  '**/.code-index/**',
+  '**/.claude/**',
+  '**/.cursor/**',
+  '**/.nx/**',
+
+  // ── UI component libraries ─────────────────────────────
+  // shadcn, etc. — high fan-in but rarely investigation targets.
   // To re-include, add "!**/components/ui/**" in .code-index/config.json ignore list,
   // or pass --ignore '!**/components/ui/**' on the CLI.
   '**/components/ui/**',
 
-  // Scratch / temp
+  // ── Scratch / temp ─────────────────────────────────────
   'tmp/**',
 ];
 

package/src/index.js

@@ -78,13 +78,13 @@ class CodeIndex {
    * @param {boolean} [opts.count] - If true, return only { total }
    * @returns {{content, shownFiles, shownSymbols, totalFiles, totalSymbols}|{total: number}}
    */
-  async map({ focusFiles = [], offset, limit, count = false } = {}) {
+  async map({ focusFiles = [], offset, limit, count = false, structured = false } = {}) {
     await this._ensureReady();
     const graph = this.cache.getGraph();
     if (!graph || graph.order === 0) {
-      return count
-        ? { total: 0 }
-        : { content: '(empty index)', shownFiles: 0, shownSymbols: 0, totalFiles: 0, totalSymbols: 0 };
+      if (count) return { total: 0 };
+      if (structured) return { files: [], shownFiles: 0, shownSymbols: 0, totalFiles: 0, totalSymbols: 0 };
+      return { content: '(empty index)', shownFiles: 0, shownSymbols: 0, totalFiles: 0, totalSymbols: 0 };
     }
 
     // Count totals from the graph
@@ -97,7 +97,7 @@ class CodeIndex {
 
     const ranked = this._getRanked(focusFiles);
 
-    // Collect all symbol entries ranked by PageRank
+    // Collect all symbol entries ranked by PageRank (rich data for both formats)
     const allEntries = [];
     for (const [symbolKey, _score] of ranked) {
       let attrs;
@@ -108,18 +108,48 @@ class CodeIndex {
       }
       if (attrs.type !== 'symbol') continue;
 
-      const line = `  ${String(attrs.lineStart).padStart(4)}│ ${attrs.signature}`;
-      allEntries.push({ file: attrs.file, line });
+      allEntries.push({
+        file: attrs.file,
+        name: attrs.name,
+        kind: attrs.kind,
+        lineStart: attrs.lineStart,
+        lineEnd: attrs.lineEnd,
+        signature: attrs.signature,
+      });
     }
 
     if (count) return { total: allEntries.length };
 
     const { items } = paginate(allEntries, { offset, limit });
 
+    // Structured format: return file objects with nested symbol arrays
+    if (structured) {
+      const fileGroups = new Map();
+      for (const entry of items) {
+        if (!fileGroups.has(entry.file)) fileGroups.set(entry.file, []);
+        fileGroups.get(entry.file).push({
+          name: entry.name,
+          kind: entry.kind,
+          lineStart: entry.lineStart,
+          lineEnd: entry.lineEnd,
+          signature: entry.signature,
+        });
+      }
+      return {
+        files: [...fileGroups.entries()].map(([path, symbols]) => ({ path, symbols })),
+        shownFiles: fileGroups.size,
+        shownSymbols: items.length,
+        totalFiles,
+        totalSymbols,
+      };
+    }
+
+    // Text format (CLI output)
     const fileGroups = new Map();
     for (const entry of items) {
       if (!fileGroups.has(entry.file)) fileGroups.set(entry.file, []);
-      fileGroups.get(entry.file).push(entry.line);
+      const line = `  ${String(entry.lineStart).padStart(4)}│ ${entry.signature}`;
+      fileGroups.get(entry.file).push(line);
     }
 
     const lines = [];

package/src/parser.js

@@ -3,25 +3,37 @@ const require = createRequire(import.meta.url);
 
 const Parser = require('tree-sitter');
 
-// Load native grammars eagerly — no WASM, no async init needed
+function tryRequire(mod) {
+  try { return require(mod); } catch { return null; }
+}
+
+// Core grammars (always installed)
 const tsGrammars = require('tree-sitter-typescript');
-const phpModule = require('tree-sitter-php');
 
 const GRAMMARS = {
   javascript: require('tree-sitter-javascript'),
   typescript: tsGrammars.typescript,
   tsx: tsGrammars.tsx,
   python: require('tree-sitter-python'),
-  rust: require('tree-sitter-rust'),
-  go: require('tree-sitter-go'),
-  ruby: require('tree-sitter-ruby'),
-  java: require('tree-sitter-java'),
-  c: require('tree-sitter-c'),
-  cpp: require('tree-sitter-cpp'),
-  c_sharp: require('tree-sitter-c-sharp'),
-  php: phpModule.php || phpModule,
 };
 
+// Optional grammars (install individually if needed)
+const optGrammars = [
+  ['rust', 'tree-sitter-rust'],
+  ['go', 'tree-sitter-go'],
+  ['ruby', 'tree-sitter-ruby'],
+  ['java', 'tree-sitter-java'],
+  ['c', 'tree-sitter-c'],
+  ['cpp', 'tree-sitter-cpp'],
+  ['c_sharp', 'tree-sitter-c-sharp'],
+];
+for (const [name, mod] of optGrammars) {
+  const g = tryRequire(mod);
+  if (g) GRAMMARS[name] = g;
+}
+const phpModule = tryRequire('tree-sitter-php');
+if (phpModule) GRAMMARS.php = phpModule.php || phpModule;
+
 const LANG_MAP = {
   '.js': 'javascript',
   '.mjs': 'javascript',
@@ -43,7 +55,11 @@ const LANG_MAP = {
   '.php': 'php',
 };
 
-const SUPPORTED_EXTENSIONS = Object.keys(LANG_MAP);
+// Only include extensions for grammars that are actually installed
+const SUPPORTED_EXTENSIONS = Object.keys(LANG_MAP).filter(ext => {
+  const lang = LANG_MAP[ext];
+  return GRAMMARS[lang] != null;
+});
 
 function getLanguage(ext) {
   const langName = LANG_MAP[ext];

package/src/server.js

@@ -139,10 +139,12 @@ const routes = {
     const p = params(req.url);
     const focus = p.get('focus', '');
     const focusFiles = focus ? focus.split(',') : [];
+    const format = p.get('format', 'text');
     const result = await currentIndex.map({
       focusFiles,
       offset: p.getInt('offset', undefined),
       limit: p.getInt('limit', 50),
+      structured: format === 'structured',
     });
     json(res, result);
   },

package/src/ui.html

@@ -475,6 +475,100 @@
     border-color: var(--accent);
     background: rgba(37, 99, 235, 0.08);
   }
+
+  /* Expandable map cards */
+  .map-card {
+    border-bottom: 1px solid var(--border);
+  }
+  .map-card-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 12px 16px 4px;
+    cursor: pointer;
+    border-radius: 6px 6px 0 0;
+    transition: background 0.1s;
+  }
+  .map-card-header:hover { background: var(--bg-raised); }
+  .map-chevron {
+    font-size: 10px;
+    color: var(--text-faint);
+    transition: transform 0.2s ease;
+    flex-shrink: 0;
+    width: 14px;
+    text-align: center;
+    user-select: none;
+  }
+  .map-card.expanded .map-chevron { transform: rotate(90deg); }
+  .map-symbols {
+    padding: 2px 16px 10px 38px;
+  }
+  .map-expand {
+    display: none;
+    padding: 10px 16px 14px 38px;
+    background: var(--bg-raised);
+    margin: 0 8px 8px;
+    border-radius: 6px;
+  }
+  .map-card.expanded .map-expand { display: block; }
+  .map-expand-section {
+    margin-bottom: 10px;
+  }
+  .map-expand-section:last-child { margin-bottom: 0; }
+  .map-expand-title {
+    font-family: var(--mono);
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0.3px;
+    color: var(--text-dim);
+    margin-bottom: 4px;
+  }
+  .map-expand-title .arrow { margin-right: 2px; }
+  .map-dep-item {
+    font-family: var(--mono);
+    font-size: 12px;
+    padding: 2px 0;
+    color: var(--accent);
+    cursor: pointer;
+    transition: color 0.1s;
+  }
+  .map-dep-item:hover { text-decoration: underline; }
+  .map-expand-empty {
+    font-family: var(--mono);
+    font-size: 11px;
+    color: var(--text-faint);
+    font-style: italic;
+    padding: 2px 0;
+  }
+  .map-expand-loading {
+    font-family: var(--mono);
+    font-size: 11px;
+    color: var(--text-dim);
+    padding: 4px 0;
+  }
+  .map-sym-item {
+    font-family: var(--mono);
+    font-size: 12px;
+    padding: 2px 0;
+    color: var(--text-dim);
+    cursor: pointer;
+    transition: color 0.1s;
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+  }
+  .map-sym-item:hover { color: var(--text); }
+  .map-sym-item .result-kind {
+    opacity: 0.55;
+    font-size: 9px;
+    flex-shrink: 0;
+  }
+  .map-sym-item .sym-line {
+    color: var(--text-faint);
+    min-width: 32px;
+    text-align: right;
+    flex-shrink: 0;
+  }
 </style>
 </head>
 <body>
@@ -588,6 +682,7 @@ let pageSize = 20;
 let totalResults = 0;
 let indexed = false;
 let loading = false;
+const expandCache = new Map(); // file -> { dependents, deps } for map expansion
 
 // Elements
 const repoInput = $('#repoPath');
@@ -786,10 +881,11 @@ btnIndex.onclick = async () => {
 
     addRecentRepo(root);
     indexed = true;
+    expandCache.clear();
     showStats(data.stats, data.elapsed);
     await loadPickerData();
-    resultsEl.innerHTML = `<div class="empty-state"><p>Indexed <strong>${data.stats.files}</strong> files, <strong>${data.stats.symbols}</strong> symbols in ${data.elapsed}ms.<br>Start typing to search.</p></div>`;
-    queryInput.focus();
+    // Auto-switch to Map tab to show the ranked overview
+    document.querySelector('[data-tool="map"]').click();
   } catch (e) {
     resultsEl.innerHTML = `<div class="error-msg">${esc(e.message)}</div>`;
   } finally {
@@ -991,7 +1087,7 @@ async function runQuery() {
         if (kindFilter.value) url += `&kind=${kindFilter.value}`;
         break;
       case 'map':
-        url = `${API}/api/map?offset=${offset}&limit=${pageSize}`;
+        url = `${API}/api/map?offset=${offset}&limit=${pageSize}&format=structured`;
         if (query) url += `&focus=${enc(query)}`;
         break;
       case 'symbols':
@@ -1098,34 +1194,138 @@ function renderMap(data) {
   totalResults = data.totalSymbols || 0;
   resultCount.textContent = `${data.shownSymbols} of ${data.totalSymbols} symbols across ${data.shownFiles} of ${data.totalFiles} files`;
 
-  if (!data.content || data.content === '(empty index)') {
+  if (!data.files || data.files.length === 0) {
     resultsEl.innerHTML = '<div class="empty-state"><p>Empty index.</p></div>';
     pagination.style.display = 'none';
     return;
   }
 
-  // Parse map output into structured cards
-  const lines = data.content.split('\n');
+  resultsEl.innerHTML = data.files.map(f => {
+    const symsHtml = f.symbols.map(s =>
+      `<div class="result-sig" style="font-size:12px">` +
+        `<span class="result-kind kind-${s.kind || 'variable'}" style="font-size:9px">${s.kind || '?'}</span>` +
+        `<span class="result-line">${s.lineStart}</span> ${highlightSig(s.signature || s.name)}` +
+      `</div>`
+    ).join('');
+
+    return `<div class="map-card" data-file="${esc(f.path)}">` +
+      `<div class="map-card-header">` +
+        `<span class="map-chevron">&#x25B8;</span>` +
+        `<a class="result-file" href="#" onclick="openFile('${escJs(f.path)}'); event.stopPropagation(); return false" title="Open in editor">${esc(f.path)}</a>` +
+      `</div>` +
+      `<div class="map-symbols">${symsHtml}</div>` +
+      `<div class="map-expand"></div>` +
+    `</div>`;
+  }).join('');
+
+  // Attach expand/collapse handlers via delegation
+  resultsEl.querySelectorAll('.map-card-header').forEach(header => {
+    header.onclick = (e) => {
+      if (e.target.closest('.result-file')) return;
+      const card = header.closest('.map-card');
+      toggleMapExpand(card);
+    };
+  });
+
+  updatePagination();
+}
+
+async function toggleMapExpand(card) {
+  const file = card.dataset.file;
+  const expandEl = card.querySelector('.map-expand');
+  const isExpanded = card.classList.contains('expanded');
+
+  if (isExpanded) {
+    card.classList.remove('expanded');
+    return;
+  }
+
+  card.classList.add('expanded');
+
+  // Check cache
+  if (expandCache.has(file)) {
+    renderExpandContent(expandEl, expandCache.get(file));
+    return;
+  }
+
+  expandEl.innerHTML = '<div class="map-expand-loading">Loading dependencies...</div>';
+
+  try {
+    const [depsRes, dependentsRes, symbolsRes] = await Promise.all([
+      fetch(`${API}/api/deps?file=${enc(file)}&limit=15`).then(r => r.json()),
+      fetch(`${API}/api/dependents?file=${enc(file)}&limit=15`).then(r => r.json()),
+      fetch(`${API}/api/symbols?file=${enc(file)}&limit=500`).then(r => r.json()),
+    ]);
+
+    const data = {
+      dependents: dependentsRes.results || [],
+      dependentsTotal: dependentsRes.total || 0,
+      deps: depsRes.results || [],
+      depsTotal: depsRes.total || 0,
+      symbols: (symbolsRes.results || []).sort((a, b) => a.lineStart - b.lineStart),
+    };
+    expandCache.set(file, data);
+    renderExpandContent(expandEl, data);
+  } catch (e) {
+    expandEl.innerHTML = `<div class="error-msg">${esc(e.message)}</div>`;
+  }
+}
+
+function renderExpandContent(el, data) {
   let html = '';
-  let currentFile = null;
-
-  for (const line of lines) {
-    if (line.endsWith(':') && !line.startsWith(' ')) {
-      currentFile = line.slice(0, -1);
-      html += `<div class="result-card" style="padding-bottom:4px"><a class="result-file" href="#" onclick="openFile('${currentFile}'); return false" title="Open in editor">${esc(currentFile)}</a>`;
-    } else if (line.trim() === '') {
-      if (currentFile) { html += '</div>'; currentFile = null; }
-    } else if (currentFile) {
-      const match = line.match(/^\s*(\d+)\│\s*(.*)$/);
-      if (match) {
-        html += `<div class="result-sig" style="margin-left:12px;font-size:12px"><span class="result-line">${match[1]}</span> ${highlightSig(match[2])}</div>`;
-      }
+
+  // Imported by (dependents)
+  html += '<div class="map-expand-section">';
+  html += `<div class="map-expand-title"><span class="arrow">&larr;</span> Imported by (${data.dependentsTotal})</div>`;
+  if (data.dependents.length === 0) {
+    html += '<div class="map-expand-empty">No dependents</div>';
+  } else {
+    for (const f of data.dependents) {
+      const fp = typeof f === 'string' ? f : f.file;
+      html += `<div class="map-dep-item" onclick="openFile('${escJs(fp)}')">${esc(fp)}</div>`;
+    }
+    if (data.dependentsTotal > data.dependents.length) {
+      html += `<div class="map-expand-empty">...and ${data.dependentsTotal - data.dependents.length} more</div>`;
     }
   }
-  if (currentFile) html += '</div>';
+  html += '</div>';
 
-  resultsEl.innerHTML = html;
-  updatePagination();
+  // Depends on (deps)
+  html += '<div class="map-expand-section">';
+  html += `<div class="map-expand-title"><span class="arrow">&rarr;</span> Depends on (${data.depsTotal})</div>`;
+  if (data.deps.length === 0) {
+    html += '<div class="map-expand-empty">No dependencies</div>';
+  } else {
+    for (const f of data.deps) {
+      const fp = typeof f === 'string' ? f : f.file;
+      html += `<div class="map-dep-item" onclick="openFile('${escJs(fp)}')">${esc(fp)}</div>`;
+    }
+    if (data.depsTotal > data.deps.length) {
+      html += `<div class="map-expand-empty">...and ${data.depsTotal - data.deps.length} more</div>`;
+    }
+  }
+  html += '</div>';
+
+  // All symbols in source order
+  if (data.symbols && data.symbols.length > 0) {
+    html += '<div class="map-expand-section">';
+    html += `<div class="map-expand-title">All symbols (${data.symbols.length})</div>`;
+    for (const s of data.symbols) {
+      html += `<div class="map-sym-item" onclick="openFile('${escJs(s.file)}', ${s.lineStart})">` +
+        `<span class="result-kind kind-${s.kind || 'variable'}">${s.kind || '?'}</span>` +
+        `<span class="sym-line">${s.lineStart}</span> ${esc(s.signature || s.name)}` +
+      `</div>`;
+    }
+    html += '</div>';
+  }
+
+  el.innerHTML = html;
+}
+
+// Escape for use in JS string literals (single-quoted onclick handlers)
+function escJs(s) {
+  if (!s) return '';
+  return s.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
 }
 
 function renderNeighborhood(data) {