@optave/codegraph 3.7.0 → 3.8.1

package/src/extractors/solidity.ts

@@ -0,0 +1,394 @@
+import type {
+  Call,
+  ExtractorOutput,
+  SubDeclaration,
+  TreeSitterNode,
+  TreeSitterTree,
+} from '../types.js';
+import {
+  extractModifierVisibility,
+  findChild,
+  findParentNode,
+  nodeEndLine,
+  stripQuotes,
+} from './helpers.js';
+
+/**
+ * Extract symbols from Solidity files.
+ *
+ * Solidity's tree-sitter grammar covers contracts, interfaces, libraries,
+ * structs, enums, events, errors, functions, modifiers, and import paths.
+ */
+export function extractSoliditySymbols(tree: TreeSitterTree, _filePath: string): ExtractorOutput {
+  const ctx: ExtractorOutput = {
+    definitions: [],
+    calls: [],
+    imports: [],
+    classes: [],
+    exports: [],
+    typeMap: new Map(),
+  };
+
+  walkSolidityNode(tree.rootNode, ctx);
+  return ctx;
+}
+
+function walkSolidityNode(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  switch (node.type) {
+    case 'contract_declaration':
+      handleContractDecl(node, ctx, 'class');
+      break;
+    case 'interface_declaration':
+      handleContractDecl(node, ctx, 'interface');
+      break;
+    case 'library_declaration':
+      handleContractDecl(node, ctx, 'module');
+      break;
+    case 'struct_declaration':
+      handleStructDecl(node, ctx);
+      break;
+    case 'enum_declaration':
+      handleEnumDecl(node, ctx);
+      break;
+    case 'function_definition':
+      handleFunctionDef(node, ctx);
+      break;
+    case 'modifier_definition':
+      handleModifierDef(node, ctx);
+      break;
+    case 'event_definition':
+      handleEventDef(node, ctx);
+      break;
+    case 'error_declaration':
+      handleErrorDecl(node, ctx);
+      break;
+    case 'state_variable_declaration':
+      handleStateVarDecl(node, ctx);
+      break;
+    case 'import_directive':
+      handleImportDirective(node, ctx);
+      break;
+    case 'call_expression':
+    case 'function_call':
+      handleCallExpression(node, ctx);
+      break;
+  }
+
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child) walkSolidityNode(child, ctx);
+  }
+}
+
+// ── Handlers ───────────────────────────────────────────────────────────────
+
+const SOL_PARENT_TYPES = [
+  'contract_declaration',
+  'interface_declaration',
+  'library_declaration',
+] as const;
+
+function handleContractDecl(
+  node: TreeSitterNode,
+  ctx: ExtractorOutput,
+  kind: 'class' | 'interface' | 'module',
+): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const name = nameNode.text;
+
+  const body = node.childForFieldName('body') || findChild(node, 'contract_body');
+  const members = body ? extractContractMembers(body) : [];
+
+  ctx.definitions.push({
+    name,
+    kind,
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    children: members.length > 0 ? members : undefined,
+  });
+
+  extractInheritance(node, name, ctx);
+}
+
+/** Extract member declarations from a contract body node. */
+function extractContractMembers(body: TreeSitterNode): SubDeclaration[] {
+  const members: SubDeclaration[] = [];
+  for (let i = 0; i < body.childCount; i++) {
+    const child = body.child(i);
+    if (!child) continue;
+    const member = extractContractMember(child);
+    if (member) members.push(member);
+  }
+  return members;
+}
+
+/** Map a single contract body child to a SubDeclaration, or null if not a recognized member. */
+function extractContractMember(child: TreeSitterNode): SubDeclaration | null {
+  const line = child.startPosition.row + 1;
+  switch (child.type) {
+    case 'function_definition': {
+      const fnName = child.childForFieldName('name');
+      return fnName ? { name: fnName.text, kind: 'method', line } : null;
+    }
+    case 'state_variable_declaration': {
+      const varName = child.childForFieldName('name');
+      return varName
+        ? { name: varName.text, kind: 'property', line, visibility: extractSolVisibility(child) }
+        : null;
+    }
+    case 'event_definition': {
+      const evName = child.childForFieldName('name');
+      return evName ? { name: evName.text, kind: 'property', decorators: ['event'], line } : null;
+    }
+    case 'error_declaration': {
+      const errName = child.childForFieldName('name');
+      return errName ? { name: errName.text, kind: 'property', decorators: ['error'], line } : null;
+    }
+    case 'modifier_definition': {
+      const modName = child.childForFieldName('name');
+      return modName
+        ? { name: modName.text, kind: 'method', decorators: ['modifier'], line }
+        : null;
+    }
+    default:
+      return null;
+  }
+}
+
+/** Extract inheritance (extends) relationships from a contract node. */
+function extractInheritance(node: TreeSitterNode, name: string, ctx: ExtractorOutput): void {
+  const inheritance = findChild(node, 'inheritance_specifier');
+  if (!inheritance) return;
+  for (let i = 0; i < inheritance.childCount; i++) {
+    const child = inheritance.child(i);
+    if (!child) continue;
+    if (child.type === 'user_defined_type' || child.type === 'identifier') {
+      ctx.classes.push({ name, extends: child.text, line: node.startPosition.row + 1 });
+    }
+  }
+}
+
+function handleStructDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+
+  const members: SubDeclaration[] = [];
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child && child.type === 'struct_member') {
+      const memberName = child.childForFieldName('name');
+      if (memberName) {
+        members.push({
+          name: memberName.text,
+          kind: 'property',
+          line: child.startPosition.row + 1,
+        });
+      }
+    }
+  }
+
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'struct',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    children: members.length > 0 ? members : undefined,
+  });
+}
+
+function handleEnumDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+
+  const members: SubDeclaration[] = [];
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child && child.type === 'enum_value') {
+      members.push({ name: child.text, kind: 'constant', line: child.startPosition.row + 1 });
+    }
+  }
+
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'enum',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    children: members.length > 0 ? members : undefined,
+  });
+}
+
+function handleFunctionDef(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+  const kind = parent ? 'method' : 'function';
+
+  const params = extractSolParams(node);
+  ctx.definitions.push({
+    name: fullName,
+    kind,
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    children: params.length > 0 ? params : undefined,
+    visibility: extractSolVisibility(node),
+  });
+}
+
+function handleModifierDef(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'function',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    decorators: ['modifier'],
+  });
+}
+
+function handleEventDef(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'type',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    decorators: ['event'],
+  });
+}
+
+function handleErrorDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'type',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    decorators: ['error'],
+  });
+}
+
+function handleStateVarDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const nameNode = node.childForFieldName('name');
+  if (!nameNode) return;
+  const parent = findParentNode(node, SOL_PARENT_TYPES);
+  const fullName = parent ? `${parent}.${nameNode.text}` : nameNode.text;
+
+  ctx.definitions.push({
+    name: fullName,
+    kind: 'variable',
+    line: node.startPosition.row + 1,
+    endLine: nodeEndLine(node),
+    visibility: extractSolVisibility(node),
+  });
+}
+
+function handleImportDirective(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  // import "path"; or import { X } from "path"; or import "path" as Alias;
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!child) continue;
+    if (child.type === 'string' || child.type === 'string_literal') {
+      const source = stripQuotes(child.text);
+      const names: string[] = [];
+      // Look for imported symbols
+      for (let j = 0; j < node.childCount; j++) {
+        const sibling = node.child(j);
+        if (sibling && sibling.type === 'identifier') names.push(sibling.text);
+        if (sibling && sibling.type === 'import_declaration') {
+          const id = findChild(sibling, 'identifier');
+          if (id) names.push(id.text);
+        }
+      }
+      ctx.imports.push({
+        source,
+        names: names.length > 0 ? names : ['*'],
+        line: node.startPosition.row + 1,
+      });
+      return;
+    }
+    // source_import: handles `import * as X from "path"`
+    if (child.type === 'source_import' || child.type === 'import_clause') {
+      const strNode = findChild(child, 'string') || findChild(child, 'string_literal');
+      if (strNode) {
+        ctx.imports.push({
+          source: stripQuotes(strNode.text),
+          names: ['*'],
+          line: node.startPosition.row + 1,
+        });
+        return;
+      }
+    }
+  }
+}
+
+function handleCallExpression(node: TreeSitterNode, ctx: ExtractorOutput): void {
+  const funcNode = node.childForFieldName('function') || node.childForFieldName('callee');
+  if (!funcNode) return;
+
+  const call: Call = { name: '', line: node.startPosition.row + 1 };
+  if (funcNode.type === 'member_expression' || funcNode.type === 'member_access') {
+    const prop = funcNode.childForFieldName('property') || funcNode.childForFieldName('member');
+    const obj = funcNode.childForFieldName('object') || funcNode.childForFieldName('expression');
+    if (prop) call.name = prop.text;
+    if (obj) call.receiver = obj.text;
+  } else {
+    call.name = funcNode.text;
+  }
+  if (call.name) ctx.calls.push(call);
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────
+
+function extractSolParams(funcNode: TreeSitterNode): SubDeclaration[] {
+  const params: SubDeclaration[] = [];
+  const paramList =
+    funcNode.childForFieldName('parameters') || findChild(funcNode, 'parameter_list');
+  if (!paramList) return params;
+
+  for (let i = 0; i < paramList.childCount; i++) {
+    const param = paramList.child(i);
+    if (!param || param.type !== 'parameter') continue;
+    const nameNode = param.childForFieldName('name');
+    if (nameNode) {
+      params.push({ name: nameNode.text, kind: 'parameter', line: param.startPosition.row + 1 });
+    }
+  }
+  return params;
+}
+
+function extractSolVisibility(
+  node: TreeSitterNode,
+): 'public' | 'private' | 'protected' | undefined {
+  // Solidity visibility is embedded as child keywords or visibility nodes
+  const vis = extractModifierVisibility(node);
+  if (vis) return vis;
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!child) continue;
+    const t = child.text;
+    if (t === 'public' || t === 'external') return 'public';
+    if (t === 'private') return 'private';
+    if (t === 'internal') return 'protected';
+  }
+  return undefined;
+}

package/src/extractors/swift.ts

@@ -73,49 +73,7 @@ function handleSwiftClassDecl(node: TreeSitterNode, ctx: ExtractorOutput): void
 
   const kind = isEnum ? 'enum' : isStruct ? 'struct' : 'class';
 
-  const children: SubDeclaration[] = [];
-
-  if (isEnum) {
-    // Enum cases: enum_entry > simple_identifier, inside enum_class_body
-    const body = findChild(node, 'enum_class_body');
-    if (body) {
-      for (let i = 0; i < body.childCount; i++) {
-        const child = body.child(i);
-        if (child && child.type === 'enum_entry') {
-          const entryName = findChild(child, 'simple_identifier');
-          if (entryName) {
-            children.push({
-              name: entryName.text,
-              kind: 'constant',
-              line: child.startPosition.row + 1,
-            });
-          }
-        }
-      }
-    }
-  } else {
-    // Extract properties from class_body
-    const body = findChild(node, 'class_body');
-    if (body) {
-      for (let i = 0; i < body.childCount; i++) {
-        const child = body.child(i);
-        if (child && child.type === 'property_declaration') {
-          const pattern = findChild(child, 'pattern');
-          if (pattern) {
-            const propName = findChild(pattern, 'simple_identifier');
-            if (propName) {
-              children.push({
-                name: propName.text,
-                kind: 'property',
-                line: child.startPosition.row + 1,
-                visibility: extractModifierVisibility(child),
-              });
-            }
-          }
-        }
-      }
-    }
-  }
+  const children = isEnum ? collectSwiftEnumEntries(node) : collectSwiftProperties(node);
 
   ctx.definitions.push({
     name,
@@ -125,52 +83,95 @@ function handleSwiftClassDecl(node: TreeSitterNode, ctx: ExtractorOutput): void
     children: children.length > 0 ? children : undefined,
   });
 
-  // Methods inside class_body or enum_class_body
+  collectSwiftMethods(node, name, ctx);
+  collectSwiftInheritance(node, name, ctx);
+}
+
+/** Collect enum constant entries from an enum_class_body. */
+function collectSwiftEnumEntries(node: TreeSitterNode): SubDeclaration[] {
+  const entries: SubDeclaration[] = [];
+  const body = findChild(node, 'enum_class_body');
+  if (!body) return entries;
+  for (let i = 0; i < body.childCount; i++) {
+    const child = body.child(i);
+    if (!child || child.type !== 'enum_entry') continue;
+    const entryName = findChild(child, 'simple_identifier');
+    if (entryName) {
+      entries.push({
+        name: entryName.text,
+        kind: 'constant',
+        line: child.startPosition.row + 1,
+      });
+    }
+  }
+  return entries;
+}
+
+/** Collect property declarations from a class_body. */
+function collectSwiftProperties(node: TreeSitterNode): SubDeclaration[] {
+  const props: SubDeclaration[] = [];
+  const body = findChild(node, 'class_body');
+  if (!body) return props;
+  for (let i = 0; i < body.childCount; i++) {
+    const child = body.child(i);
+    if (!child || child.type !== 'property_declaration') continue;
+    const pattern = findChild(child, 'pattern');
+    if (!pattern) continue;
+    const propName = findChild(pattern, 'simple_identifier');
+    if (propName) {
+      props.push({
+        name: propName.text,
+        kind: 'property',
+        line: child.startPosition.row + 1,
+        visibility: extractModifierVisibility(child),
+      });
+    }
+  }
+  return props;
+}
+
+/** Collect method declarations from class_body or enum_class_body. */
+function collectSwiftMethods(node: TreeSitterNode, className: string, ctx: ExtractorOutput): void {
   const body = findChild(node, 'class_body') || findChild(node, 'enum_class_body');
-  if (body) {
-    for (let i = 0; i < body.childCount; i++) {
-      const child = body.child(i);
-      if (child && child.type === 'function_declaration') {
-        const methName = findChild(child, 'simple_identifier');
-        if (methName) {
-          ctx.definitions.push({
-            name: `${name}.${methName.text}`,
-            kind: 'method',
-            line: child.startPosition.row + 1,
-            endLine: child.endPosition.row + 1,
-            visibility: extractModifierVisibility(child),
-          });
-        }
-      }
+  if (!body) return;
+  for (let i = 0; i < body.childCount; i++) {
+    const child = body.child(i);
+    if (!child || child.type !== 'function_declaration') continue;
+    const methName = findChild(child, 'simple_identifier');
+    if (methName) {
+      ctx.definitions.push({
+        name: `${className}.${methName.text}`,
+        kind: 'method',
+        line: child.startPosition.row + 1,
+        endLine: child.endPosition.row + 1,
+        visibility: extractModifierVisibility(child),
+      });
     }
   }
+}
 
-  // Inheritance: inheritance_specifier nodes are DIRECT children of class_declaration
-  // First specifier is the superclass (extends), rest are protocol conformances (implements)
+/** Collect inheritance from inheritance_specifier children. First = extends, rest = implements. */
+function collectSwiftInheritance(
+  node: TreeSitterNode,
+  className: string,
+  ctx: ExtractorOutput,
+): void {
   let first = true;
   for (let i = 0; i < node.childCount; i++) {
     const child = node.child(i);
     if (!child || child.type !== 'inheritance_specifier') continue;
-    // inheritance_specifier > user_type > type_identifier
     const userType = findChild(child, 'user_type');
-    if (userType) {
-      const typeId = findChild(userType, 'type_identifier');
-      if (typeId) {
-        if (first) {
-          ctx.classes.push({
-            name,
-            extends: typeId.text,
-            line: node.startPosition.row + 1,
-          });
-          first = false;
-        } else {
-          ctx.classes.push({
-            name,
-            implements: typeId.text,
-            line: node.startPosition.row + 1,
-          });
-        }
-      }
+    const typeId = userType ? findChild(userType, 'type_identifier') : null;
+    if (!typeId) continue;
+    if (first) {
+      ctx.classes.push({ name: className, extends: typeId.text, line: node.startPosition.row + 1 });
+      first = false;
+    } else {
+      ctx.classes.push({
+        name: className,
+        implements: typeId.text,
+        line: node.startPosition.row + 1,
+      });
     }
   }
 }