@mishasinitcyn/betterrank 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mishasinitcyn/betterrank",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "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",

package/src/graph.js

@@ -25,6 +25,13 @@ const IMPORT_RESOLVE_EXTENSIONS = [
   '.py', '.rs', '.go', '.rb', '.java',
   '.c', '.h', '.cpp', '.hpp', '.cc', '.cs', '.php',
 ];
+const FOCUS_MAX_HOPS = 2;
+const FOCUS_DISTANCE_WEIGHTS = new Map([
+  [0, 250],
+  [1, 12],
+  [2, 2.5],
+]);
+const FOCUS_DEFAULT_WEIGHT = 0.15;
 
 /**
  * Disambiguate which targets a reference should wire to.
@@ -133,7 +140,14 @@ function wireSymbolReferences(records, graph, defIndex, addedRefs, addedImports)
       const targets = defIndex.get(ref.name);
       if (!targets) continue;
 
-      const resolvedTargets = disambiguateTargets(targets, file, graph);
+      const filteredTargets = ref.kind === 'property'
+        ? targets.filter(target => {
+          try { return graph.getNodeAttribute(target, 'kind') === 'property'; } catch { return false; }
+        })
+        : targets;
+      if (filteredTargets.length === 0) continue;
+
+      const resolvedTargets = disambiguateTargets(filteredTargets, file, graph);
 
       for (const target of resolvedTargets) {
         const targetFile = graph.getNodeAttribute(target, 'file');
@@ -263,6 +277,56 @@ function removeFileNodes(graph, filePath) {
   }
 }
 
+function buildFocusDistanceMap(graph, focusFiles, maxHops = FOCUS_MAX_HOPS) {
+  const distances = new Map();
+  const queue = [];
+
+  for (const file of focusFiles) {
+    if (!graph.hasNode(file)) continue;
+    const attrs = graph.getNodeAttributes(file);
+    if (attrs.type !== 'file') continue;
+    distances.set(file, 0);
+    queue.push(file);
+  }
+
+  for (let i = 0; i < queue.length; i++) {
+    const current = queue[i];
+    const currentDistance = distances.get(current);
+    if (currentDistance >= maxHops) continue;
+
+    const visitNeighbor = neighbor => {
+      if (!graph.hasNode(neighbor)) return;
+      const neighborAttrs = graph.getNodeAttributes(neighbor);
+      if (neighborAttrs.type !== 'file') return;
+
+      const nextDistance = currentDistance + 1;
+      const existing = distances.get(neighbor);
+      if (existing !== undefined && existing <= nextDistance) return;
+      distances.set(neighbor, nextDistance);
+      queue.push(neighbor);
+    };
+
+    graph.forEachOutEdge(current, (_edge, attrs, _source, target) => {
+      if (attrs.type !== 'IMPORTS') return;
+      visitNeighbor(target);
+    });
+
+    graph.forEachInEdge(current, (_edge, attrs, source) => {
+      if (attrs.type !== 'IMPORTS') return;
+      visitNeighbor(source);
+    });
+  }
+
+  return distances;
+}
+
+function getFocusWeight(filePath, focusDistances) {
+  if (!focusDistances || focusDistances.size === 0) return 1.0;
+  const distance = focusDistances.get(filePath);
+  if (distance === undefined) return FOCUS_DEFAULT_WEIGHT;
+  return FOCUS_DISTANCE_WEIGHTS.get(distance) || FOCUS_DEFAULT_WEIGHT;
+}
+
 // Path-tier dampening: files outside core source directories get their
 // PageRank scores multiplied by a fraction. This prevents scripts, tests,
 // and temp files from dominating the map output over actual source code.
@@ -298,6 +362,7 @@ function rankedSymbols(graph, focusFiles = [], pathTiers = DEFAULT_PATH_TIERS) {
   if (graph.order === 0) return [];
 
   const g = graph.copy();
+  const focusDistances = focusFiles.length > 0 ? buildFocusDistanceMap(graph, focusFiles) : null;
 
   if (focusFiles.length > 0) {
     g.mergeNode('__focus__', { type: 'virtual' });
@@ -329,7 +394,7 @@ function rankedSymbols(graph, focusFiles = [], pathTiers = DEFAULT_PATH_TIERS) {
     .map(([key, score]) => {
       try {
         const file = graph.getNodeAttribute(key, 'file');
-        return [key, score * getPathWeight(file, pathTiers)];
+        return [key, score * getPathWeight(file, pathTiers) * getFocusWeight(file, focusDistances)];
       } catch {
         return [key, score];
       }

package/src/index.js

@@ -579,6 +579,8 @@ class CodeIndex {
       const escaped = symbol.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
       const callPattern = new RegExp(`(?<![a-zA-Z0-9_])${escaped}\\s*\\(`);
       const jsxPattern = new RegExp(`<\\s*${escaped}(?=[\\s>/.]|$)`);
+      const memberPattern = new RegExp(`\\.\\s*${escaped}\\b`);
+      const bracketPattern = new RegExp(`\\[\\s*['"\`]${escaped}['"\`]\\s*\\]`);
       // Fallback: import/from lines that reference the symbol
       const importPattern = new RegExp(`(?:import|from)\\s.*\\b${escaped}\\b`);
 
@@ -605,7 +607,13 @@ class CodeIndex {
             if (inDef) continue;
 
             const line = lines[i];
-            if (!callPattern.test(line) && !jsxPattern.test(line) && !importPattern.test(line)) continue;
+            if (
+              !callPattern.test(line) &&
+              !jsxPattern.test(line) &&
+              !memberPattern.test(line) &&
+              !bracketPattern.test(line) &&
+              !importPattern.test(line)
+            ) continue;
 
             const start = Math.max(0, i - context);
             const end = Math.min(lines.length - 1, i + context);

package/src/parser.js

@@ -188,6 +188,7 @@ const REF_QUERIES = {
     (call_expression function: (identifier) @ref)
     (import_specifier name: (identifier) @ref)
     (import_clause (identifier) @ref)
+    (member_expression property: (property_identifier) @prop_ref)
     (jsx_opening_element (identifier) @jsx_ref)
     (jsx_self_closing_element (identifier) @jsx_ref)
     (jsx_opening_element (member_expression (identifier) @jsx_ref))
@@ -198,6 +199,7 @@ const REF_QUERIES = {
     (call_expression function: (identifier) @ref)
     (import_specifier name: (identifier) @ref)
     (import_clause (identifier) @ref)
+    (member_expression property: (property_identifier) @prop_ref)
     (type_identifier) @ref
   `,
 
@@ -205,6 +207,7 @@ const REF_QUERIES = {
     (call_expression function: (identifier) @ref)
     (import_specifier name: (identifier) @ref)
     (import_clause (identifier) @ref)
+    (member_expression property: (property_identifier) @prop_ref)
     (type_identifier) @ref
     (jsx_opening_element (identifier) @jsx_ref)
     (jsx_self_closing_element (identifier) @jsx_ref)
@@ -287,8 +290,12 @@ const KIND_MAP = {
 };
 
 const OUTLINE_EXTRA_LANGUAGES = new Set(['javascript', 'typescript', 'tsx']);
+const INDEX_EXTRA_LANGUAGES = new Set(['javascript', 'typescript', 'tsx']);
 const OUTLINE_BODY_TYPES = new Set(['statement_block', 'class_body', 'object', 'array']);
 const OUTLINE_CALL_TYPES = new Set(['call_expression', 'new_expression']);
+const SEMANTIC_CONTAINER_NAME_RE = /(router|routes|handlers|actions|reducers|selectors|queries|mutations|registry|registries|map|maps|config|configs|options|endpoints|procedures)$/i;
+const NON_SEMANTIC_CONTAINER_NAME_RE = /(schema|shape|validator|payload|params?|props?|input|output|response|request|dto)$/i;
+const NON_SEMANTIC_CALLEE_NAME_RE = /^(object|array|enum|union|literal|record|tuple|pick|omit|extend|merge|intersection|partial|strictObject|looseObject)$/i;
 
 /**
  * Walk an AST subtree and count node types that reveal structural shape.
@@ -488,6 +495,111 @@ function hasMultilinePairChildren(node) {
   return false;
 }
 
+function isTopLevelVariableDeclarator(node) {
+  if (!node || node.type !== 'variable_declarator') return false;
+  const decl = node.parent;
+  if (!decl || decl.type !== 'lexical_declaration') return false;
+  const container = decl.parent;
+  return !!container && (container.type === 'program' || container.type === 'export_statement');
+}
+
+function extractDeclaratorName(node) {
+  const nameNode = node?.childForFieldName('name');
+  return nameNode?.type === 'identifier' ? nameNode.text : null;
+}
+
+function extractCalleeLeafName(node) {
+  if (!node) return null;
+
+  if (['identifier', 'property_identifier', 'private_property_identifier', 'type_identifier'].includes(node.type)) {
+    return node.text;
+  }
+
+  if (node.type === 'member_expression') {
+    const propertyNode = node.childForFieldName('property');
+    if (propertyNode) return extractCalleeLeafName(propertyNode);
+    return extractCalleeLeafName(node.namedChild(node.namedChildCount - 1));
+  }
+
+  return null;
+}
+
+function extractCallLikeCalleeName(node) {
+  if (!node || (node.type !== 'call_expression' && node.type !== 'new_expression')) return null;
+
+  const calleeNode = node.childForFieldName('function')
+    || node.childForFieldName('constructor')
+    || node.namedChild(0);
+  return extractCalleeLeafName(calleeNode);
+}
+
+function shouldIndexSemanticObjectMembers(node) {
+  if (!isTopLevelVariableDeclarator(node)) return false;
+
+  const variableName = extractDeclaratorName(node);
+  const valueNode = node.childForFieldName('value');
+  const calleeName = extractCallLikeCalleeName(valueNode);
+
+  const hasSemanticVariableName = !!variableName
+    && SEMANTIC_CONTAINER_NAME_RE.test(variableName)
+    && !NON_SEMANTIC_CONTAINER_NAME_RE.test(variableName);
+  const hasSemanticCalleeName = !!calleeName && !NON_SEMANTIC_CALLEE_NAME_RE.test(calleeName);
+
+  if (valueNode?.type === 'object') {
+    return hasSemanticVariableName;
+  }
+
+  if (valueNode?.type === 'call_expression' || valueNode?.type === 'new_expression') {
+    return hasSemanticVariableName || hasSemanticCalleeName;
+  }
+
+  return false;
+}
+
+function collectDirectPairDefinitions(node, filePath, langName) {
+  if (!node || node.type !== 'object') return [];
+
+  const definitions = [];
+  for (let i = 0; i < node.namedChildCount; i++) {
+    const child = node.namedChild(i);
+    if (child.type !== 'pair') continue;
+
+    const name = extractPairName(child);
+    if (!name) continue;
+    if (child.endPosition.row <= child.startPosition.row) continue;
+
+    definitions.push(createDefinition(name, child, filePath, langName, {
+      bodyStartLine: child.startPosition.row + 2,
+      kind: 'property',
+    }));
+  }
+
+  return definitions;
+}
+
+function collectIndexDefinitions(rootNode, filePath, langName) {
+  if (!INDEX_EXTRA_LANGUAGES.has(langName)) return [];
+
+  const definitions = [];
+
+  function visit(node) {
+    if (node.type === 'variable_declarator' && shouldIndexSemanticObjectMembers(node)) {
+      const bodyNode = findBodyNode(node);
+      if (bodyNode && bodyNode.type === 'object') {
+        definitions.push(...collectDirectPairDefinitions(bodyNode, filePath, langName));
+      }
+      return;
+    }
+
+    for (let i = 0; i < node.namedChildCount; i++) {
+      visit(node.namedChild(i));
+    }
+  }
+
+  visit(rootNode);
+  return definitions;
+}
+
 function collectOutlineDefinitions(rootNode, filePath, langName) {
   if (!OUTLINE_EXTRA_LANGUAGES.has(langName)) return [];
 
@@ -618,6 +730,8 @@ function parseFile(filePath, source, { includeOutlineDefinitions = false } = {})
     }
   }
 
+  definitions.push(...collectIndexDefinitions(tree.rootNode, filePath, langName));
+
   if (includeOutlineDefinitions) {
     definitions.push(...collectOutlineDefinitions(tree.rootNode, filePath, langName));
   }
@@ -628,11 +742,12 @@ function parseFile(filePath, source, { includeOutlineDefinitions = false } = {})
       const refQuery = new Parser.Query(lang, refQueryStr);
       for (const match of refQuery.matches(tree.rootNode)) {
         for (const capture of match.captures) {
-          if (capture.name !== 'ref' && capture.name !== 'jsx_ref') continue;
+          if (capture.name !== 'ref' && capture.name !== 'jsx_ref' && capture.name !== 'prop_ref') continue;
           const name = normalizeReferenceCapture(capture);
           if (!name) continue;
           references.push({
             name,
+            kind: capture.name === 'prop_ref' ? 'property' : 'symbol',
             file: filePath,
             line: capture.node.startPosition.row + 1,
           });