gitnexus 1.5.3 → 1.6.1

package/dist/core/ingestion/method-extractors/configs/csharp.js

@@ -1,4 +1,5 @@
 // gitnexus/src/core/ingestion/method-extractors/configs/csharp.ts
+// Verified against tree-sitter-c-sharp 0.23.1
 import { SupportedLanguages } from '../../../../_shared/index.js';
 import { findVisibility, hasModifier, hasKeyword, collectModifierTexts, } from '../../field-extractors/configs/helpers.js';
 import { extractSimpleTypeName } from '../../type-extractors/shared.js';
@@ -67,6 +68,7 @@ function extractParametersFromList(paramList) {
                     type: typeNode
                         ? (extractSimpleTypeName(typeNode) ?? typeNode.text?.trim() ?? null)
                         : null,
+                    rawType: typeNode?.text?.trim() ?? null,
                     isOptional: false,
                     isVariadic: true,
                 });
@@ -105,6 +107,7 @@ function extractParametersFromList(paramList) {
                 params.push({
                     name: nameNode.text,
                     type: typeName,
+                    rawType: typeNode?.text?.trim() ?? null,
                     isOptional,
                     isVariadic: false,
                 });
@@ -164,6 +167,7 @@ export const csharpMethodConfig = {
         'destructor_declaration',
         'operator_declaration',
         'conversion_operator_declaration',
+        'local_function_statement',
     ],
     bodyNodeTypes: ['declaration_list'],
     extractName(node) {
@@ -198,7 +202,7 @@ export const csharpMethodConfig = {
         // operator_declaration and conversion_operator_declaration use 'type' field, not 'returns'
         const returnsNode = node.childForFieldName('returns');
         if (returnsNode)
-            return extractSimpleTypeName(returnsNode) ?? returnsNode.text?.trim();
+            return returnsNode.text?.trim();
         // Fallback for operator/conversion declarations that use 'type' as return type field
         if (node.type === 'operator_declaration' || node.type === 'conversion_operator_declaration') {
             const typeNode = node.childForFieldName('type');

package/dist/core/ingestion/method-extractors/configs/dart.d.ts

@@ -0,0 +1,2 @@
+import type { MethodExtractionConfig } from '../../method-types.js';
+export declare const dartMethodConfig: MethodExtractionConfig;

package/dist/core/ingestion/method-extractors/configs/dart.js

@@ -0,0 +1,376 @@
+// gitnexus/src/core/ingestion/method-extractors/configs/dart.ts
+// Verified against tree-sitter-dart 1.0.0 (80e23c07)
+import { SupportedLanguages } from '../../../../_shared/index.js';
+import { extractSimpleTypeName } from '../../type-extractors/shared.js';
+// ---------------------------------------------------------------------------
+// Dart helpers
+// ---------------------------------------------------------------------------
+/** Type node types that represent a return type in function/getter/setter signatures. */
+const TYPE_NODE_TYPES = new Set([
+    'type_identifier',
+    'generic_type',
+    'function_type',
+    'nullable_type',
+    'void_type',
+    'record_type',
+]);
+/**
+ * Dart method_signature is a WRAPPER node containing one inner signature:
+ * function_signature, constructor_signature, getter_signature, setter_signature,
+ * operator_signature, or factory_constructor_signature.
+ *
+ * Name, parameters, and return type live on the INNER signature, not on
+ * method_signature itself.
+ */
+function getInnerSignature(node) {
+    for (let i = 0; i < node.namedChildCount; i++) {
+        const child = node.namedChild(i);
+        if (child &&
+            (child.type === 'function_signature' ||
+                child.type === 'constructor_signature' ||
+                child.type === 'getter_signature' ||
+                child.type === 'setter_signature' ||
+                child.type === 'operator_signature' ||
+                child.type === 'factory_constructor_signature')) {
+            return child;
+        }
+    }
+    // `declaration` nodes (abstract methods) also wrap function_signature as a
+    // named child — handled by the loop above.
+    return null;
+}
+/**
+ * Extract the method name from a method_signature node.
+ *
+ * Descends into the inner signature to find the name field/identifier.
+ */
+function extractDartName(node) {
+    const inner = getInnerSignature(node);
+    if (!inner)
+        return undefined;
+    // constructor_signature name field may include "ClassName.namedCtor" via multiple children.
+    // getter_signature, setter_signature, function_signature all have a 'name' field.
+    if (inner.type === 'operator_signature') {
+        // operator_signature has no 'name' field; name is 'operator' + the operator symbol
+        for (let i = 0; i < inner.namedChildCount; i++) {
+            const child = inner.namedChild(i);
+            if (child?.type === 'binary_operator') {
+                return `operator ${child.text.trim()}`;
+            }
+        }
+        // Check for unnamed operator tokens like []= or ~
+        for (let i = 0; i < inner.childCount; i++) {
+            const child = inner.child(i);
+            if (child && !child.isNamed && child.text.trim() !== 'operator') {
+                const text = child.text.trim();
+                if (text && !TYPE_NODE_TYPES.has(child.type)) {
+                    return `operator ${text}`;
+                }
+            }
+        }
+        return undefined;
+    }
+    if (inner.type === 'getter_signature') {
+        const nameNode = inner.childForFieldName('name');
+        return nameNode?.text;
+    }
+    if (inner.type === 'setter_signature') {
+        const nameNode = inner.childForFieldName('name');
+        return nameNode ? `set ${nameNode.text}` : undefined;
+    }
+    if (inner.type === 'factory_constructor_signature') {
+        // Collect all identifier children to form "ClassName" or "ClassName.named"
+        const parts = [];
+        for (let i = 0; i < inner.childCount; i++) {
+            const child = inner.child(i);
+            if (child?.isNamed && child.type === 'identifier') {
+                parts.push(child.text);
+            }
+        }
+        return parts.length > 0 ? parts.join('.') : undefined;
+    }
+    // function_signature and constructor_signature both have a 'name' field
+    const nameNode = inner.childForFieldName('name');
+    if (nameNode) {
+        // constructor_signature: name field may be multiple identifiers joined by '.'
+        return nameNode.text;
+    }
+    return undefined;
+}
+/**
+ * Extract the return type from the inner signature.
+ *
+ * function_signature children include type nodes before the name.
+ * getter_signature children include type nodes before 'get' keyword.
+ * constructor/setter signatures have no return type.
+ */
+function extractDartReturnType(node) {
+    const inner = getInnerSignature(node);
+    if (!inner)
+        return undefined;
+    // Constructors and setters have no return type
+    if (inner.type === 'constructor_signature' ||
+        inner.type === 'setter_signature' ||
+        inner.type === 'factory_constructor_signature') {
+        return undefined;
+    }
+    // For function_signature, getter_signature, operator_signature:
+    // The type node is a named child before the name/operator
+    for (let i = 0; i < inner.namedChildCount; i++) {
+        const child = inner.namedChild(i);
+        if (child && TYPE_NODE_TYPES.has(child.type)) {
+            return child.text?.trim();
+        }
+    }
+    return undefined;
+}
+/**
+ * Extract parameters from the inner signature's formal_parameter_list.
+ *
+ * Dart parameters can be:
+ * - Positional required: `int x`
+ * - Optional positional: `[int? x]` — wrapped in optional_formal_parameters with '['
+ * - Optional named: `{int? x}` or `{required int x}` — wrapped in optional_formal_parameters with '{'
+ */
+function extractDartParameters(node) {
+    const inner = getInnerSignature(node);
+    if (!inner)
+        return [];
+    // getter_signature has no parameters
+    if (inner.type === 'getter_signature')
+        return [];
+    // Find formal_parameter_list — it's a child, not a field in function_signature
+    let paramList = null;
+    if (inner.type === 'constructor_signature' || inner.type === 'factory_constructor_signature') {
+        paramList = inner.childForFieldName('parameters');
+    }
+    if (!paramList) {
+        for (let i = 0; i < inner.namedChildCount; i++) {
+            const child = inner.namedChild(i);
+            if (child?.type === 'formal_parameter_list') {
+                paramList = child;
+                break;
+            }
+        }
+    }
+    if (!paramList)
+        return [];
+    return extractParamsFromList(paramList, false);
+}
+/**
+ * Extract ParameterInfo entries from a formal_parameter_list or optional_formal_parameters node.
+ */
+function extractParamsFromList(listNode, isOptionalBlock) {
+    const params = [];
+    for (let i = 0; i < listNode.namedChildCount; i++) {
+        const child = listNode.namedChild(i);
+        if (!child)
+            continue;
+        if (child.type === 'formal_parameter') {
+            params.push(extractSingleParam(child, isOptionalBlock));
+        }
+        else if (child.type === 'optional_formal_parameters') {
+            // Determine if these are named ({}) or positional ([]) optional params
+            // by checking the surrounding delimiters
+            params.push(...extractParamsFromList(child, true));
+        }
+    }
+    return params;
+}
+/**
+ * Extract a single ParameterInfo from a formal_parameter node.
+ */
+function extractSingleParam(param, isOptionalBlock) {
+    const nameNode = param.childForFieldName('name');
+    const name = nameNode?.text ?? '<unknown>';
+    // Find the type node
+    let typeName = null;
+    let rawTypeName = null;
+    for (let i = 0; i < param.namedChildCount; i++) {
+        const child = param.namedChild(i);
+        if (child && TYPE_NODE_TYPES.has(child.type)) {
+            rawTypeName = child.text?.trim() ?? null;
+            typeName = extractSimpleTypeName(child) ?? rawTypeName;
+            break;
+        }
+        // Also check type_identifier
+        if (child?.type === 'type_identifier') {
+            rawTypeName = child.text?.trim() ?? null;
+            typeName = rawTypeName;
+            break;
+        }
+    }
+    // Check for 'required' keyword:
+    // 1. Among children of the param node itself
+    let hasRequired = false;
+    for (let i = 0; i < param.childCount; i++) {
+        const child = param.child(i);
+        if (child && child.text.trim() === 'required') {
+            hasRequired = true;
+            break;
+        }
+    }
+    // 2. In tree-sitter-dart, `required` may be an anonymous sibling token
+    //    immediately preceding the formal_parameter inside optional_formal_parameters.
+    if (!hasRequired) {
+        let prev = param.previousSibling;
+        // Skip comma separators
+        while (prev && !prev.isNamed && prev.text.trim() === ',') {
+            prev = prev.previousSibling;
+        }
+        if (prev && !prev.isNamed && prev.text.trim() === 'required') {
+            hasRequired = true;
+        }
+    }
+    // A parameter is optional if it's inside an optional_formal_parameters block
+    // and does NOT have the 'required' keyword
+    const isOptional = isOptionalBlock && !hasRequired;
+    return {
+        name,
+        type: typeName,
+        rawType: rawTypeName,
+        isOptional,
+        isVariadic: false, // Dart has no variadic params
+    };
+}
+/**
+ * Dart visibility: underscore prefix = private, else public.
+ *
+ * We resolve the name by descending into the inner signature.
+ */
+function extractDartVisibility(node) {
+    const name = extractDartName(node);
+    if (!name)
+        return 'public';
+    // Strip 'set ' or 'operator ' prefix to get the raw name
+    const rawName = name.startsWith('set ')
+        ? name.slice(4)
+        : name.startsWith('operator ')
+            ? name.slice(9)
+            : name;
+    return rawName.startsWith('_') ? 'private' : 'public';
+}
+/**
+ * In tree-sitter-dart, `static` is an anonymous child token of
+ * `method_signature` (or `declaration`), not a previous sibling.
+ *
+ * We check children first, then fall back to previous siblings for
+ * grammar variants.
+ */
+function isDartStatic(node) {
+    // In tree-sitter-dart, `static` is an anonymous child token of method_signature
+    // (or declaration), not a previous sibling.
+    for (let i = 0; i < node.childCount; i++) {
+        const child = node.child(i);
+        if (child && !child.isNamed && child.text.trim() === 'static')
+            return true;
+        // Stop once we hit the inner signature — static always precedes it
+        if (child?.isNamed)
+            break;
+    }
+    // Also check previous siblings (fallback for grammar variants)
+    let sibling = node.previousSibling;
+    while (sibling) {
+        if (sibling.isNamed && sibling.type !== 'annotation')
+            break;
+        if (!sibling.isNamed && sibling.text.trim() === 'static')
+            return true;
+        sibling = sibling.previousSibling;
+    }
+    return false;
+}
+/**
+ * A Dart method is abstract if it has no function_body sibling following it.
+ * In the tree-sitter grammar, function_body is a sibling of method_signature
+ * in class_body.
+ */
+function isDartAbstract(node, _ownerNode) {
+    // `declaration` nodes in class_body represent abstract methods (no body, followed by ';').
+    // Note: extension bodies cannot have abstract members in Dart, but `declaration` nodes
+    // do not appear in extension_body in practice since extensions must provide implementations.
+    if (node.type === 'declaration')
+        return true;
+    // For method_signature nodes, check if the next named sibling is a function_body
+    const next = node.nextNamedSibling;
+    return !next || next.type !== 'function_body';
+}
+/**
+ * Check for `async`, `async*`, or `sync*` keyword in the function_body sibling.
+ * The keyword appears as an unnamed child of function_body, or
+ * as a sibling keyword before function_body.
+ *
+ * Dart has three async-like forms: `async` (Future), `async*` (Stream), `sync*` (Iterable).
+ * All three are treated as async for graph purposes.
+ */
+function isDartAsync(node) {
+    let sibling = node.nextSibling;
+    let limit = 3;
+    while (sibling && limit > 0) {
+        if (!sibling.isNamed) {
+            const text = sibling.text.trim();
+            if (text === 'async' || text === 'async*' || text === 'sync*')
+                return true;
+        }
+        if (sibling.isNamed && sibling.type === 'function_body') {
+            // Check first child of function_body for async/async*/sync*
+            for (let i = 0; i < sibling.childCount; i++) {
+                const child = sibling.child(i);
+                if (child) {
+                    const text = child.text.trim();
+                    if (text === 'async' || text === 'async*' || text === 'sync*')
+                        return true;
+                }
+                // Stop at first substantial child
+                if (child?.isNamed)
+                    break;
+            }
+            break;
+        }
+        sibling = sibling.nextSibling;
+        limit--;
+    }
+    return false;
+}
+/**
+ * Extract annotations that appear as sibling nodes before the method_signature
+ * in class_body. Each annotation node is prefixed with '@'.
+ */
+function extractDartAnnotations(node) {
+    const annotations = [];
+    let sibling = node.previousNamedSibling;
+    while (sibling && sibling.type === 'annotation') {
+        // annotation node text already includes '@', e.g. "@override"
+        const text = sibling.text?.trim();
+        if (text) {
+            // Normalize: strip arguments from annotation if present, keep just the name
+            // e.g. "@deprecated" -> "@deprecated", "@JsonKey(name: 'id')" -> "@JsonKey"
+            const match = text.match(/^@(\w+)/);
+            if (match) {
+                annotations.unshift('@' + match[1]);
+            }
+            else {
+                annotations.unshift(text);
+            }
+        }
+        sibling = sibling.previousNamedSibling;
+    }
+    return annotations;
+}
+// ---------------------------------------------------------------------------
+// Dart config
+// ---------------------------------------------------------------------------
+export const dartMethodConfig = {
+    language: SupportedLanguages.Dart,
+    typeDeclarationNodes: ['class_definition', 'mixin_declaration', 'extension_declaration'],
+    methodNodeTypes: ['method_signature', 'declaration'],
+    bodyNodeTypes: ['class_body', 'extension_body'],
+    extractName: extractDartName,
+    extractReturnType: extractDartReturnType,
+    extractParameters: extractDartParameters,
+    extractVisibility: extractDartVisibility,
+    isStatic: isDartStatic,
+    isAbstract: isDartAbstract,
+    isFinal: () => false, // Dart methods cannot be 'final'
+    isAsync: isDartAsync,
+    extractAnnotations: extractDartAnnotations,
+};

package/dist/core/ingestion/method-extractors/configs/go.d.ts

@@ -0,0 +1,2 @@
+import type { MethodExtractionConfig } from '../../method-types.js';
+export declare const goMethodConfig: MethodExtractionConfig;

package/dist/core/ingestion/method-extractors/configs/go.js

@@ -0,0 +1,176 @@
+// gitnexus/src/core/ingestion/method-extractors/configs/go.ts
+// Verified against tree-sitter-go 0.23.4
+import { SupportedLanguages } from '../../../../_shared/index.js';
+import { extractSimpleTypeName } from '../../type-extractors/shared.js';
+// ---------------------------------------------------------------------------
+// Go helpers
+// ---------------------------------------------------------------------------
+/**
+ * Extract the method/function name.
+ * - method_declaration: name is a `field_identifier`
+ * - function_declaration: name is an `identifier`
+ */
+function extractGoName(node) {
+    const nameNode = node.childForFieldName('name');
+    return nameNode?.text;
+}
+/**
+ * Extract return type from the `result` field.
+ *
+ * Go supports single return (`int`) and multi-return (`(User, error)`).
+ * Multi-return appears as a `parameter_list` — extract the first type.
+ */
+function extractGoReturnType(node) {
+    const result = node.childForFieldName('result');
+    if (!result)
+        return undefined;
+    // Single return type (type_identifier, pointer_type, etc.)
+    if (result.type !== 'parameter_list') {
+        return result.text?.trim();
+    }
+    // Multi-return: (Type, error) — extract first parameter's type
+    for (let i = 0; i < result.namedChildCount; i++) {
+        const param = result.namedChild(i);
+        if (param?.type === 'parameter_declaration') {
+            const typeNode = param.childForFieldName('type');
+            if (typeNode)
+                return typeNode.text?.trim();
+        }
+    }
+    return undefined;
+}
+/**
+ * Extract parameters from the `parameters` field.
+ *
+ * Go parameter_list contains parameter_declaration nodes with optional
+ * `name` and required `type` fields. Go allows multiple names for one type:
+ * `func(a, b int)` — each name shares the type.
+ *
+ * Handles variadic_parameter_declaration (`...string`).
+ */
+function extractGoParameters(node) {
+    const paramList = node.childForFieldName('parameters');
+    if (!paramList)
+        return [];
+    const params = [];
+    for (let i = 0; i < paramList.namedChildCount; i++) {
+        const param = paramList.namedChild(i);
+        if (!param)
+            continue;
+        if (param.type === 'parameter_declaration') {
+            const typeNode = param.childForFieldName('type');
+            const typeName = typeNode
+                ? (extractSimpleTypeName(typeNode) ?? typeNode.text?.trim() ?? null)
+                : null;
+            // Go allows multiple names for one type: func(a, b int)
+            const names = [];
+            for (let j = 0; j < param.namedChildCount; j++) {
+                const child = param.namedChild(j);
+                if (child?.type === 'identifier') {
+                    names.push(child.text);
+                }
+            }
+            const rawType = typeNode?.text?.trim() ?? null;
+            if (names.length === 0) {
+                // Unnamed parameter: func(int, string)
+                params.push({
+                    name: `_${i}`,
+                    type: typeName,
+                    rawType,
+                    isOptional: false,
+                    isVariadic: false,
+                });
+            }
+            else {
+                for (const name of names) {
+                    params.push({ name, type: typeName, rawType, isOptional: false, isVariadic: false });
+                }
+            }
+        }
+        else if (param.type === 'variadic_parameter_declaration') {
+            const nameNode = param.childForFieldName('name');
+            const typeNode = param.childForFieldName('type');
+            const typeName = typeNode
+                ? (extractSimpleTypeName(typeNode) ?? typeNode.text?.trim() ?? null)
+                : null;
+            params.push({
+                name: nameNode?.text ?? `_${i}`,
+                type: typeName,
+                rawType: typeNode?.text?.trim() ?? null,
+                isOptional: false,
+                isVariadic: true,
+            });
+        }
+    }
+    return params;
+}
+/**
+ * Go visibility: uppercase first character = exported (public), lowercase = unexported (private).
+ */
+function extractGoVisibility(node) {
+    const name = extractGoName(node);
+    if (!name || name.length === 0)
+        return 'private';
+    const first = name[0];
+    return first === first.toUpperCase() && first !== first.toLowerCase() ? 'public' : 'private';
+}
+/**
+ * Extract receiver type from the `receiver` field.
+ *
+ * The receiver is a parameter_list with one parameter_declaration:
+ *   (r *Repo) → pointer_type → type_identifier "Repo"
+ *   (r Repo)  → type_identifier "Repo"
+ */
+function extractGoReceiverType(node) {
+    const receiver = node.childForFieldName('receiver');
+    if (!receiver)
+        return undefined;
+    for (let i = 0; i < receiver.namedChildCount; i++) {
+        const param = receiver.namedChild(i);
+        if (param?.type === 'parameter_declaration') {
+            const typeNode = param.childForFieldName('type');
+            if (!typeNode)
+                continue;
+            // Unwrap pointer_type: *User → User
+            const inner = typeNode.type === 'pointer_type' ? typeNode.firstNamedChild : typeNode;
+            return inner?.text;
+        }
+    }
+    return undefined;
+}
+/**
+ * Resolve owner name from the receiver type.
+ * For function_declaration (no receiver), returns undefined.
+ */
+function extractGoOwnerName(node) {
+    return extractGoReceiverType(node);
+}
+// ---------------------------------------------------------------------------
+// Config
+// ---------------------------------------------------------------------------
+export const goMethodConfig = {
+    language: SupportedLanguages.Go,
+    // Each method_declaration/function_declaration is treated as its own "container"
+    // for extractFromNode() — not used with extract() in the traditional sense.
+    // method_elem covers interface method signatures (abstract methods).
+    typeDeclarationNodes: ['method_declaration', 'function_declaration', 'method_elem'],
+    methodNodeTypes: ['method_declaration', 'function_declaration', 'method_elem'],
+    bodyNodeTypes: [],
+    extractName: extractGoName,
+    extractReturnType: extractGoReturnType,
+    extractParameters: extractGoParameters,
+    extractVisibility: extractGoVisibility,
+    extractReceiverType: extractGoReceiverType,
+    extractOwnerName: extractGoOwnerName,
+    isStatic(node) {
+        // Go functions (no receiver) are effectively static
+        return node.type === 'function_declaration';
+    },
+    isAbstract(node, _ownerNode) {
+        // Go interface method signatures (method_elem) are abstract — no body
+        return node.type === 'method_elem';
+    },
+    isFinal(_node) {
+        return false; // Go has no final methods
+    },
+};

package/dist/core/ingestion/method-extractors/configs/jvm.js

@@ -10,7 +10,9 @@ function extractReturnTypeFromField(node) {
     const typeNode = node.childForFieldName('type');
     if (!typeNode)
         return undefined;
-    return extractSimpleTypeName(typeNode) ?? typeNode.text?.trim();
+    // Use .text to preserve full generic types (e.g. List<User>, Stream<T>)
+    // needed by the call resolver for return-type inference.
+    return typeNode.text?.trim();
 }
 function extractAnnotations(node, modifierType) {
     const annotations = [];
@@ -56,6 +58,7 @@ function extractJavaParameters(node) {
                 params.push({
                     name: nameNode.text,
                     type: typeNode ? (extractSimpleTypeName(typeNode) ?? typeNode.text?.trim()) : null,
+                    rawType: typeNode?.text?.trim() ?? null,
                     isOptional: false,
                     isVariadic: false,
                 });
@@ -65,6 +68,7 @@ function extractJavaParameters(node) {
             // Varargs: type_identifier + "..." + variable_declarator
             let paramName;
             let paramType = null;
+            let paramRawType = null;
             for (let j = 0; j < param.namedChildCount; j++) {
                 const c = param.namedChild(j);
                 if (!c)
@@ -79,13 +83,15 @@ function extractJavaParameters(node) {
                     c.type === 'integral_type' ||
                     c.type === 'floating_point_type' ||
                     c.type === 'boolean_type') {
-                    paramType = extractSimpleTypeName(c) ?? c.text?.trim();
+                    paramRawType = c.text?.trim() ?? null;
+                    paramType = extractSimpleTypeName(c) ?? paramRawType;
                 }
             }
             if (paramName) {
                 params.push({
                     name: paramName,
                     type: paramType,
+                    rawType: paramRawType,
                     isOptional: false,
                     isVariadic: true,
                 });
@@ -173,6 +179,7 @@ function extractKotlinParameters(node) {
                     continue;
                 let paramName;
                 let paramType = null;
+                let paramRawType = null;
                 let hasDefault = false;
                 const isVariadic = nextIsVariadic;
                 nextIsVariadic = false;
@@ -186,7 +193,8 @@ function extractKotlinParameters(node) {
                     else if (part.type === 'user_type' ||
                         part.type === 'nullable_type' ||
                         part.type === 'function_type') {
-                        paramType = extractSimpleTypeName(part) ?? part.text?.trim();
+                        paramRawType = part.text?.trim() ?? null;
+                        paramType = extractSimpleTypeName(part) ?? paramRawType;
                     }
                 }
                 // Check for default value: `= expr`
@@ -201,6 +209,7 @@ function extractKotlinParameters(node) {
                     params.push({
                         name: paramName,
                         type: paramType,
+                        rawType: paramRawType,
                         isOptional: hasDefault,
                         isVariadic: isVariadic,
                     });
@@ -227,7 +236,7 @@ function extractKotlinReturnType(node) {
             (child.type === 'user_type' ||
                 child.type === 'nullable_type' ||
                 child.type === 'function_type')) {
-            return extractSimpleTypeName(child) ?? child.text?.trim();
+            return child.text?.trim();
         }
         if (child.type === 'function_body')
             break;
@@ -239,6 +248,7 @@ export const kotlinMethodConfig = {
     typeDeclarationNodes: ['class_declaration', 'object_declaration', 'companion_object'],
     methodNodeTypes: ['function_declaration'],
     bodyNodeTypes: ['class_body'],
+    staticOwnerTypes: new Set(['companion_object', 'object_declaration']),
     extractName(node) {
         for (let i = 0; i < node.namedChildCount; i++) {
             const child = node.namedChild(i);

package/dist/core/ingestion/method-extractors/configs/php.d.ts

@@ -0,0 +1,2 @@
+import type { MethodExtractionConfig } from '../../method-types.js';
+export declare const phpMethodConfig: MethodExtractionConfig;