@optave/codegraph 2.5.1 → 3.0.0

package/src/extractors/java.js

@@ -1,4 +1,4 @@
-import { nodeEndLine } from './helpers.js';
+import { findChild, nodeEndLine } from './helpers.js';
 
 /**
  * Extract symbols from Java files.
@@ -31,11 +31,13 @@ export function extractJavaSymbols(tree, _filePath) {
       case 'class_declaration': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const classChildren = extractClassFields(node);
           definitions.push({
             name: nameNode.text,
             kind: 'class',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: classChildren.length > 0 ? classChildren : undefined,
           });
 
           const superclass = node.childForFieldName('superclass');
@@ -139,11 +141,13 @@ export function extractJavaSymbols(tree, _filePath) {
       case 'enum_declaration': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const enumChildren = extractEnumConstants(node);
           definitions.push({
             name: nameNode.text,
             kind: 'enum',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: enumChildren.length > 0 ? enumChildren : undefined,
           });
         }
         break;
@@ -154,11 +158,13 @@ export function extractJavaSymbols(tree, _filePath) {
         if (nameNode) {
           const parentClass = findJavaParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
+          const params = extractJavaParameters(node.childForFieldName('parameters'));
           definitions.push({
             name: fullName,
             kind: 'method',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: params.length > 0 ? params : undefined,
           });
         }
         break;
@@ -169,11 +175,13 @@ export function extractJavaSymbols(tree, _filePath) {
         if (nameNode) {
           const parentClass = findJavaParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
+          const params = extractJavaParameters(node.childForFieldName('parameters'));
           definitions.push({
             name: fullName,
             kind: 'method',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: params.length > 0 ? params : undefined,
           });
         }
         break;
@@ -228,3 +236,55 @@ export function extractJavaSymbols(tree, _filePath) {
   walkJavaNode(tree.rootNode);
   return { definitions, calls, imports, classes, exports };
 }
+
+// ── Child extraction helpers ────────────────────────────────────────────────
+
+function extractJavaParameters(paramListNode) {
+  const params = [];
+  if (!paramListNode) return params;
+  for (let i = 0; i < paramListNode.childCount; i++) {
+    const param = paramListNode.child(i);
+    if (!param) continue;
+    if (param.type === 'formal_parameter' || param.type === 'spread_parameter') {
+      const nameNode = param.childForFieldName('name');
+      if (nameNode) {
+        params.push({ name: nameNode.text, kind: 'parameter', line: param.startPosition.row + 1 });
+      }
+    }
+  }
+  return params;
+}
+
+function extractClassFields(classNode) {
+  const fields = [];
+  const body = classNode.childForFieldName('body') || findChild(classNode, 'class_body');
+  if (!body) return fields;
+  for (let i = 0; i < body.childCount; i++) {
+    const member = body.child(i);
+    if (!member || member.type !== 'field_declaration') continue;
+    for (let j = 0; j < member.childCount; j++) {
+      const child = member.child(j);
+      if (!child || child.type !== 'variable_declarator') continue;
+      const nameNode = child.childForFieldName('name');
+      if (nameNode) {
+        fields.push({ name: nameNode.text, kind: 'property', line: member.startPosition.row + 1 });
+      }
+    }
+  }
+  return fields;
+}
+
+function extractEnumConstants(enumNode) {
+  const constants = [];
+  const body = enumNode.childForFieldName('body') || findChild(enumNode, 'enum_body');
+  if (!body) return constants;
+  for (let i = 0; i < body.childCount; i++) {
+    const member = body.child(i);
+    if (!member || member.type !== 'enum_constant') continue;
+    const nameNode = member.childForFieldName('name');
+    if (nameNode) {
+      constants.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });
+    }
+  }
+  return constants;
+}

package/src/extractors/javascript.js

@@ -28,31 +28,37 @@ function extractSymbolsQuery(tree, query) {
 
     if (c.fn_node) {
       // function_declaration
+      const fnChildren = extractParameters(c.fn_node);
       definitions.push({
         name: c.fn_name.text,
         kind: 'function',
         line: c.fn_node.startPosition.row + 1,
         endLine: nodeEndLine(c.fn_node),
+        children: fnChildren.length > 0 ? fnChildren : undefined,
       });
     } else if (c.varfn_name) {
       // variable_declarator with arrow_function / function_expression
       const declNode = c.varfn_name.parent?.parent;
       const line = declNode ? declNode.startPosition.row + 1 : c.varfn_name.startPosition.row + 1;
+      const varFnChildren = extractParameters(c.varfn_value);
       definitions.push({
         name: c.varfn_name.text,
         kind: 'function',
         line,
         endLine: nodeEndLine(c.varfn_value),
+        children: varFnChildren.length > 0 ? varFnChildren : undefined,
       });
     } else if (c.cls_node) {
       // class_declaration
       const className = c.cls_name.text;
       const startLine = c.cls_node.startPosition.row + 1;
+      const clsChildren = extractClassProperties(c.cls_node);
       definitions.push({
         name: className,
         kind: 'class',
         line: startLine,
         endLine: nodeEndLine(c.cls_node),
+        children: clsChildren.length > 0 ? clsChildren : undefined,
       });
       const heritage =
         c.cls_node.childForFieldName('heritage') || findChild(c.cls_node, 'class_heritage');
@@ -69,11 +75,13 @@ function extractSymbolsQuery(tree, query) {
       const methName = c.meth_name.text;
       const parentClass = findParentClass(c.meth_node);
       const fullName = parentClass ? `${parentClass}.${methName}` : methName;
+      const methChildren = extractParameters(c.meth_node);
       definitions.push({
         name: fullName,
         kind: 'method',
         line: c.meth_node.startPosition.row + 1,
         endLine: nodeEndLine(c.meth_node),
+        children: methChildren.length > 0 ? methChildren : undefined,
       });
     } else if (c.iface_node) {
       // interface_declaration (TS/TSX only)
@@ -231,11 +239,13 @@ function extractSymbolsWalk(tree) {
       case 'function_declaration': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const fnChildren = extractParameters(node);
           definitions.push({
             name: nameNode.text,
             kind: 'function',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: fnChildren.length > 0 ? fnChildren : undefined,
           });
         }
         break;
@@ -246,11 +256,13 @@ function extractSymbolsWalk(tree) {
         if (nameNode) {
           const className = nameNode.text;
           const startLine = node.startPosition.row + 1;
+          const clsChildren = extractClassProperties(node);
           definitions.push({
             name: className,
             kind: 'class',
             line: startLine,
             endLine: nodeEndLine(node),
+            children: clsChildren.length > 0 ? clsChildren : undefined,
           });
           const heritage = node.childForFieldName('heritage') || findChild(node, 'class_heritage');
           if (heritage) {
@@ -272,11 +284,13 @@ function extractSymbolsWalk(tree) {
         if (nameNode) {
           const parentClass = findParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
+          const methChildren = extractParameters(node);
           definitions.push({
             name: fullName,
             kind: 'method',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: methChildren.length > 0 ? methChildren : undefined,
           });
         }
         break;
@@ -317,6 +331,7 @@ function extractSymbolsWalk(tree) {
 
       case 'lexical_declaration':
       case 'variable_declaration': {
+        const isConst = node.text.startsWith('const ');
         for (let i = 0; i < node.childCount; i++) {
           const declarator = node.child(i);
           if (declarator && declarator.type === 'variable_declarator') {
@@ -329,15 +344,59 @@ function extractSymbolsWalk(tree) {
                 valType === 'function_expression' ||
                 valType === 'function'
               ) {
+                const varFnChildren = extractParameters(valueN);
                 definitions.push({
                   name: nameN.text,
                   kind: 'function',
                   line: node.startPosition.row + 1,
                   endLine: nodeEndLine(valueN),
+                  children: varFnChildren.length > 0 ? varFnChildren : undefined,
                 });
+              } else if (isConst && nameN.type === 'identifier' && isConstantValue(valueN)) {
+                definitions.push({
+                  name: nameN.text,
+                  kind: 'constant',
+                  line: node.startPosition.row + 1,
+                  endLine: nodeEndLine(node),
+                });
+              }
+            } else if (isConst && nameN && nameN.type === 'identifier' && !valueN) {
+              // const with no value (shouldn't happen but be safe)
+            }
+          }
+        }
+        break;
+      }
+
+      case 'enum_declaration': {
+        // TypeScript enum
+        const nameNode = node.childForFieldName('name');
+        if (nameNode) {
+          const enumChildren = [];
+          const body = node.childForFieldName('body') || findChild(node, 'enum_body');
+          if (body) {
+            for (let i = 0; i < body.childCount; i++) {
+              const member = body.child(i);
+              if (!member) continue;
+              if (member.type === 'enum_assignment' || member.type === 'property_identifier') {
+                const mName = member.childForFieldName('name') || member.child(0);
+                if (mName) {
+                  enumChildren.push({
+                    name: mName.text,
+                    kind: 'constant',
+                    line: member.startPosition.row + 1,
+                  });
+                }
               }
             }
           }
+          definitions.push({
+            name: nameNode.text,
+            kind: 'enum',
+            line: node.startPosition.row + 1,
+            endLine: nodeEndLine(node),
+            children: enumChildren.length > 0 ? enumChildren : undefined,
+          });
         }
         break;
       }
@@ -471,6 +530,89 @@ function extractSymbolsWalk(tree) {
   return { definitions, calls, imports, classes, exports };
 }
 
+// ── Child extraction helpers ────────────────────────────────────────────────
+
+function extractParameters(node) {
+  const params = [];
+  const paramsNode = node.childForFieldName('parameters') || findChild(node, 'formal_parameters');
+  if (!paramsNode) return params;
+  for (let i = 0; i < paramsNode.childCount; i++) {
+    const child = paramsNode.child(i);
+    if (!child) continue;
+    const t = child.type;
+    if (t === 'identifier') {
+      params.push({ name: child.text, kind: 'parameter', line: child.startPosition.row + 1 });
+    } else if (
+      t === 'required_parameter' ||
+      t === 'optional_parameter' ||
+      t === 'assignment_pattern'
+    ) {
+      const nameNode =
+        child.childForFieldName('pattern') || child.childForFieldName('left') || child.child(0);
+      if (
+        nameNode &&
+        (nameNode.type === 'identifier' ||
+          nameNode.type === 'shorthand_property_identifier_pattern')
+      ) {
+        params.push({ name: nameNode.text, kind: 'parameter', line: child.startPosition.row + 1 });
+      }
+    } else if (t === 'rest_pattern' || t === 'rest_element') {
+      const nameNode = child.child(1) || child.childForFieldName('name');
+      if (nameNode && nameNode.type === 'identifier') {
+        params.push({ name: nameNode.text, kind: 'parameter', line: child.startPosition.row + 1 });
+      }
+    }
+  }
+  return params;
+}
+
+function extractClassProperties(classNode) {
+  const props = [];
+  const body = classNode.childForFieldName('body') || findChild(classNode, 'class_body');
+  if (!body) return props;
+  for (let i = 0; i < body.childCount; i++) {
+    const child = body.child(i);
+    if (!child) continue;
+    if (
+      child.type === 'field_definition' ||
+      child.type === 'public_field_definition' ||
+      child.type === 'property_definition'
+    ) {
+      const nameNode =
+        child.childForFieldName('name') || child.childForFieldName('property') || child.child(0);
+      if (
+        nameNode &&
+        (nameNode.type === 'property_identifier' ||
+          nameNode.type === 'identifier' ||
+          nameNode.type === 'private_property_identifier')
+      ) {
+        props.push({ name: nameNode.text, kind: 'property', line: child.startPosition.row + 1 });
+      }
+    }
+  }
+  return props;
+}
+
+function isConstantValue(valueNode) {
+  if (!valueNode) return false;
+  const t = valueNode.type;
+  return (
+    t === 'number' ||
+    t === 'string' ||
+    t === 'template_string' ||
+    t === 'true' ||
+    t === 'false' ||
+    t === 'null' ||
+    t === 'undefined' ||
+    t === 'array' ||
+    t === 'object' ||
+    t === 'regex' ||
+    t === 'unary_expression' ||
+    t === 'binary_expression' ||
+    t === 'new_expression'
+  );
+}
+
 // ── Shared helpers ──────────────────────────────────────────────────────────
 
 function extractInterfaceMethods(bodyNode, interfaceName, definitions) {

package/src/extractors/php.js

@@ -1,5 +1,76 @@
 import { findChild, nodeEndLine } from './helpers.js';
 
+function extractPhpParameters(fnNode) {
+  const params = [];
+  const paramsNode =
+    fnNode.childForFieldName('parameters') || findChild(fnNode, 'formal_parameters');
+  if (!paramsNode) return params;
+  for (let i = 0; i < paramsNode.childCount; i++) {
+    const param = paramsNode.child(i);
+    if (!param) continue;
+    if (param.type === 'simple_parameter' || param.type === 'variadic_parameter') {
+      const nameNode = param.childForFieldName('name') || findChild(param, 'variable_name');
+      if (nameNode) {
+        params.push({ name: nameNode.text, kind: 'parameter', line: param.startPosition.row + 1 });
+      }
+    }
+  }
+  return params;
+}
+
+function extractPhpClassChildren(classNode) {
+  const children = [];
+  const body = classNode.childForFieldName('body') || findChild(classNode, 'declaration_list');
+  if (!body) return children;
+  for (let i = 0; i < body.childCount; i++) {
+    const member = body.child(i);
+    if (!member) continue;
+    if (member.type === 'property_declaration') {
+      for (let j = 0; j < member.childCount; j++) {
+        const el = member.child(j);
+        if (!el || el.type !== 'property_element') continue;
+        const varNode = findChild(el, 'variable_name');
+        if (varNode) {
+          children.push({
+            name: varNode.text,
+            kind: 'property',
+            line: member.startPosition.row + 1,
+          });
+        }
+      }
+    } else if (member.type === 'const_declaration') {
+      for (let j = 0; j < member.childCount; j++) {
+        const el = member.child(j);
+        if (!el || el.type !== 'const_element') continue;
+        const nameNode = el.childForFieldName('name') || findChild(el, 'name');
+        if (nameNode) {
+          children.push({
+            name: nameNode.text,
+            kind: 'constant',
+            line: member.startPosition.row + 1,
+          });
+        }
+      }
+    }
+  }
+  return children;
+}
+
+function extractPhpEnumCases(enumNode) {
+  const children = [];
+  const body = enumNode.childForFieldName('body') || findChild(enumNode, 'enum_declaration_list');
+  if (!body) return children;
+  for (let i = 0; i < body.childCount; i++) {
+    const member = body.child(i);
+    if (!member || member.type !== 'enum_case') continue;
+    const nameNode = member.childForFieldName('name');
+    if (nameNode) {
+      children.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });
+    }
+  }
+  return children;
+}
+
 /**
  * Extract symbols from PHP files.
  */
@@ -31,11 +102,13 @@ export function extractPHPSymbols(tree, _filePath) {
       case 'function_definition': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const params = extractPhpParameters(node);
           definitions.push({
             name: nameNode.text,
             kind: 'function',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: params.length > 0 ? params : undefined,
           });
         }
         break;
@@ -44,11 +117,13 @@ export function extractPHPSymbols(tree, _filePath) {
       case 'class_declaration': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const classChildren = extractPhpClassChildren(node);
           definitions.push({
             name: nameNode.text,
             kind: 'class',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: classChildren.length > 0 ? classChildren : undefined,
           });
 
           // Check base clause (extends)
@@ -132,11 +207,13 @@ export function extractPHPSymbols(tree, _filePath) {
       case 'enum_declaration': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const enumChildren = extractPhpEnumCases(node);
           definitions.push({
             name: nameNode.text,
             kind: 'enum',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: enumChildren.length > 0 ? enumChildren : undefined,
           });
         }
         break;
@@ -147,11 +224,13 @@ export function extractPHPSymbols(tree, _filePath) {
         if (nameNode) {
           const parentClass = findPHPParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
+          const params = extractPhpParameters(node);
           definitions.push({
             name: fullName,
             kind: 'method',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: params.length > 0 ? params : undefined,
           });
         }
         break;

package/src/extractors/python.js

@@ -22,12 +22,14 @@ export function extractPythonSymbols(tree, _filePath) {
           const parentClass = findPythonParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
           const kind = parentClass ? 'method' : 'function';
+          const fnChildren = extractPythonParameters(node);
           definitions.push({
             name: fullName,
             kind,
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             decorators,
+            children: fnChildren.length > 0 ? fnChildren : undefined,
           });
         }
         break;
@@ -36,11 +38,13 @@ export function extractPythonSymbols(tree, _filePath) {
       case 'class_definition': {
         const nameNode = node.childForFieldName('name');
         if (nameNode) {
+          const clsChildren = extractPythonClassProperties(node);
           definitions.push({
             name: nameNode.text,
             kind: 'class',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            children: clsChildren.length > 0 ? clsChildren : undefined,
           });
           const superclasses =
             node.childForFieldName('superclasses') || findChild(node, 'argument_list');
@@ -108,6 +112,24 @@ export function extractPythonSymbols(tree, _filePath) {
         break;
       }
 
+      case 'expression_statement': {
+        // Module-level UPPER_CASE assignments → constants
+        if (node.parent && node.parent.type === 'module') {
+          const assignment = findChild(node, 'assignment');
+          if (assignment) {
+            const left = assignment.childForFieldName('left');
+            if (left && left.type === 'identifier' && /^[A-Z_][A-Z0-9_]*$/.test(left.text)) {
+              definitions.push({
+                name: left.text,
+                kind: 'constant',
+                line: node.startPosition.row + 1,
+              });
+            }
+          }
+        }
+        break;
+      }
+
       case 'import_from_statement': {
         let source = '';
         const names = [];
@@ -133,6 +155,118 @@ export function extractPythonSymbols(tree, _filePath) {
     for (let i = 0; i < node.childCount; i++) walkPythonNode(node.child(i));
   }
 
+  function extractPythonParameters(fnNode) {
+    const params = [];
+    const paramsNode = fnNode.childForFieldName('parameters') || findChild(fnNode, 'parameters');
+    if (!paramsNode) return params;
+    for (let i = 0; i < paramsNode.childCount; i++) {
+      const child = paramsNode.child(i);
+      if (!child) continue;
+      const t = child.type;
+      if (t === 'identifier') {
+        params.push({ name: child.text, kind: 'parameter', line: child.startPosition.row + 1 });
+      } else if (
+        t === 'typed_parameter' ||
+        t === 'default_parameter' ||
+        t === 'typed_default_parameter'
+      ) {
+        const nameNode = child.childForFieldName('name') || child.child(0);
+        if (nameNode && nameNode.type === 'identifier') {
+          params.push({
+            name: nameNode.text,
+            kind: 'parameter',
+            line: child.startPosition.row + 1,
+          });
+        }
+      } else if (t === 'list_splat_pattern' || t === 'dictionary_splat_pattern') {
+        // *args, **kwargs
+        for (let j = 0; j < child.childCount; j++) {
+          const inner = child.child(j);
+          if (inner && inner.type === 'identifier') {
+            params.push({ name: inner.text, kind: 'parameter', line: child.startPosition.row + 1 });
+            break;
+          }
+        }
+      }
+    }
+    return params;
+  }
+
+  function extractPythonClassProperties(classNode) {
+    const props = [];
+    const seen = new Set();
+    const body = classNode.childForFieldName('body') || findChild(classNode, 'block');
+    if (!body) return props;
+
+    for (let i = 0; i < body.childCount; i++) {
+      const child = body.child(i);
+      if (!child) continue;
+
+      // Direct class attribute assignments: x = 5
+      if (child.type === 'expression_statement') {
+        const assignment = findChild(child, 'assignment');
+        if (assignment) {
+          const left = assignment.childForFieldName('left');
+          if (left && left.type === 'identifier' && !seen.has(left.text)) {
+            seen.add(left.text);
+            props.push({ name: left.text, kind: 'property', line: child.startPosition.row + 1 });
+          }
+        }
+      }
+
+      // __init__ method: self.x = ... assignments
+      if (child.type === 'function_definition') {
+        const fnName = child.childForFieldName('name');
+        if (fnName && fnName.text === '__init__') {
+          const initBody = child.childForFieldName('body') || findChild(child, 'block');
+          if (initBody) {
+            walkInitBody(initBody, seen, props);
+          }
+        }
+      }
+
+      // decorated __init__
+      if (child.type === 'decorated_definition') {
+        for (let j = 0; j < child.childCount; j++) {
+          const inner = child.child(j);
+          if (inner && inner.type === 'function_definition') {
+            const fnName = inner.childForFieldName('name');
+            if (fnName && fnName.text === '__init__') {
+              const initBody = inner.childForFieldName('body') || findChild(inner, 'block');
+              if (initBody) {
+                walkInitBody(initBody, seen, props);
+              }
+            }
+          }
+        }
+      }
+    }
+    return props;
+  }
+
+  function walkInitBody(bodyNode, seen, props) {
+    for (let i = 0; i < bodyNode.childCount; i++) {
+      const stmt = bodyNode.child(i);
+      if (!stmt || stmt.type !== 'expression_statement') continue;
+      const assignment = findChild(stmt, 'assignment');
+      if (!assignment) continue;
+      const left = assignment.childForFieldName('left');
+      if (!left || left.type !== 'attribute') continue;
+      const obj = left.childForFieldName('object');
+      const attr = left.childForFieldName('attribute');
+      if (
+        obj &&
+        obj.text === 'self' &&
+        attr &&
+        attr.type === 'identifier' &&
+        !seen.has(attr.text)
+      ) {
+        seen.add(attr.text);
+        props.push({ name: attr.text, kind: 'property', line: stmt.startPosition.row + 1 });
+      }
+    }
+  }
+
   function findPythonParentClass(node) {
     let current = node.parent;
     while (current) {