gitnexus 1.6.2-rc.13 → 1.6.2-rc.15

package/dist/core/ingestion/class-extractors/configs/typescript-javascript.d.ts

@@ -0,0 +1,4 @@
+import type { ClassExtractionConfig } from '../../class-types.js';
+export declare const typescriptClassConfig: ClassExtractionConfig;
+export declare const javascriptClassConfig: ClassExtractionConfig;
+export declare const vueClassConfig: ClassExtractionConfig;

package/dist/core/ingestion/class-extractors/configs/typescript-javascript.js

@@ -0,0 +1,28 @@
+// gitnexus/src/core/ingestion/class-extractors/configs/typescript-javascript.ts
+import { SupportedLanguages } from '../../../../_shared/index.js';
+const shared = {
+    typeDeclarationNodes: [
+        'class_declaration',
+        'abstract_class_declaration',
+        'interface_declaration',
+        'enum_declaration',
+    ],
+    ancestorScopeNodeTypes: [
+        'class_declaration',
+        'abstract_class_declaration',
+        'interface_declaration',
+        'enum_declaration',
+    ],
+};
+export const typescriptClassConfig = {
+    ...shared,
+    language: SupportedLanguages.TypeScript,
+};
+export const javascriptClassConfig = {
+    ...shared,
+    language: SupportedLanguages.JavaScript,
+};
+export const vueClassConfig = {
+    ...shared,
+    language: SupportedLanguages.Vue,
+};

package/dist/core/ingestion/language-provider.d.ts

@@ -11,6 +11,7 @@
 import type { SupportedLanguages, MroStrategy } from '../../_shared/index.js';
 import type { LanguageTypeConfig } from './type-extractors/types.js';
 import type { CallRouter } from './call-routing.js';
+import type { CallExtractor } from './call-types.js';
 import type { ClassExtractor } from './class-types.js';
 import type { ExportChecker } from './export-detection.js';
 import type { FieldExtractor } from './field-extractor.js';
@@ -119,6 +120,12 @@ interface LanguageProviderConfig {
     /** MRO strategy for multiple inheritance resolution.
      *  Default: 'first-wins'. */
     readonly mroStrategy?: MroStrategy;
+    /** Call extractor for extracting call site information (calledName, callForm,
+     *  receiverName, argCount, mixed chains) from @call / @call.name captures.
+     *  Produced by createCallExtractor() with a per-language CallExtractionConfig.
+     *  Default: undefined — if unset, no calls are extracted for this language.
+     *  All tree-sitter providers MUST supply this. */
+    readonly callExtractor?: CallExtractor;
     /** Field extractor for extracting field/property definitions from class/struct
      *  declarations. Produces FieldInfo[] with name, type, visibility, static,
      *  readonly metadata. Default: undefined (no field extraction). */

package/dist/core/ingestion/languages/c-cpp.js

@@ -9,6 +9,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { cClassConfig, cppClassConfig } from '../class-extractors/configs/c-cpp.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as cCppConfig } from '../type-extractors/c-cpp.js';
 import { cCppExportChecker } from '../export-detection.js';
@@ -29,6 +30,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { cConfig as cFieldConfig, cppConfig as cppFieldConfig, } from '../field-extractors/configs/c-cpp.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { cMethodConfig, cppMethodConfig } from '../method-extractors/configs/c-cpp.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { cCallConfig, cppCallConfig } from '../call-extractors/configs/c-cpp.js';
 const C_BUILT_INS = new Set([
     'printf',
     'fprintf',
@@ -135,15 +138,8 @@ const C_BUILT_INS = new Set([
     'get',
     'put',
 ]);
-const cClassExtractor = createClassExtractor({
-    language: SupportedLanguages.C,
-    typeDeclarationNodes: ['struct_specifier', 'enum_specifier'],
-});
-const cppClassExtractor = createClassExtractor({
-    language: SupportedLanguages.CPlusPlus,
-    typeDeclarationNodes: ['class_specifier', 'struct_specifier', 'enum_specifier'],
-    ancestorScopeNodeTypes: ['namespace_definition', 'class_specifier', 'struct_specifier'],
-});
+const cClassExtractor = createClassExtractor(cClassConfig);
+const cppClassExtractor = createClassExtractor(cppClassConfig);
 /**
  * C/C++ function name extraction — unwraps pointer_declarator / reference_declarator /
  * function_declarator / qualified_identifier chains to find the actual function name.
@@ -294,6 +290,7 @@ export const cProvider = defineLanguage({
     exportChecker: cCppExportChecker,
     importResolver: resolveCImport,
     importSemantics: 'wildcard-transitive',
+    callExtractor: createCallExtractor(cCallConfig),
     fieldExtractor: createFieldExtractor(cFieldConfig),
     methodExtractor: createMethodExtractor({
         ...cMethodConfig,
@@ -312,6 +309,7 @@ export const cppProvider = defineLanguage({
     importResolver: resolveCppImport,
     importSemantics: 'wildcard-transitive',
     mroStrategy: 'leftmost-base',
+    callExtractor: createCallExtractor(cppCallConfig),
     fieldExtractor: createFieldExtractor(cppFieldConfig),
     methodExtractor: createMethodExtractor({
         ...cppMethodConfig,

package/dist/core/ingestion/languages/csharp.js

@@ -7,12 +7,15 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { csharpClassConfig } from '../class-extractors/configs/csharp.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as csharpConfig } from '../type-extractors/csharp.js';
 import { csharpExportChecker } from '../export-detection.js';
 import { resolveCSharpImport } from '../import-resolvers/csharp.js';
 import { extractCSharpNamedBindings } from '../named-bindings/csharp.js';
 import { CSHARP_QUERIES } from '../tree-sitter-queries.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { csharpCallConfig } from '../call-extractors/configs/csharp.js';
 import { createFieldExtractor } from '../field-extractors/generic.js';
 import { csharpConfig as csharpFieldConfig } from '../field-extractors/configs/csharp.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
@@ -121,26 +124,9 @@ export const csharpProvider = defineLanguage({
     namedBindingExtractor: extractCSharpNamedBindings,
     interfaceNamePattern: /^I[A-Z]/,
     mroStrategy: 'implements-split',
+    callExtractor: createCallExtractor(csharpCallConfig),
     fieldExtractor: createFieldExtractor(csharpFieldConfig),
     methodExtractor: createMethodExtractor(csharpMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.CSharp,
-        typeDeclarationNodes: [
-            'class_declaration',
-            'interface_declaration',
-            'struct_declaration',
-            'enum_declaration',
-            'record_declaration',
-        ],
-        fileScopeNodeTypes: ['file_scoped_namespace_declaration'],
-        ancestorScopeNodeTypes: [
-            'namespace_declaration',
-            'class_declaration',
-            'interface_declaration',
-            'struct_declaration',
-            'enum_declaration',
-            'record_declaration',
-        ],
-    }),
+    classExtractor: createClassExtractor(csharpClassConfig),
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/dart.js

@@ -12,6 +12,7 @@
 import { FUNCTION_NODE_TYPES } from '../utils/ast-helpers.js';
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { dartClassConfig } from '../class-extractors/configs/dart.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as dartConfig } from '../type-extractors/dart.js';
 import { dartExportChecker } from '../export-detection.js';
@@ -21,6 +22,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { dartConfig as dartFieldConfig } from '../field-extractors/configs/dart.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { dartMethodConfig } from '../method-extractors/configs/dart.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { dartCallConfig } from '../call-extractors/configs/dart.js';
 /**
  * Resolve the enclosing function from a `function_body` node by looking at its
  * previous sibling.  In Dart's tree-sitter grammar, function_signature and
@@ -84,13 +87,10 @@ export const dartProvider = defineLanguage({
     exportChecker: dartExportChecker,
     importResolver: resolveDartImport,
     importSemantics: 'wildcard-leaf',
+    callExtractor: createCallExtractor(dartCallConfig),
     fieldExtractor: createFieldExtractor(dartFieldConfig),
     methodExtractor: createMethodExtractor(dartMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Dart,
-        typeDeclarationNodes: ['class_definition', 'extension_declaration', 'enum_declaration'],
-        ancestorScopeNodeTypes: ['class_definition', 'extension_declaration', 'enum_declaration'],
-    }),
+    classExtractor: createClassExtractor(dartClassConfig),
     enclosingFunctionFinder: dartEnclosingFunctionFinder,
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/go.js

@@ -10,6 +10,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { goClassConfig } from '../class-extractors/configs/go.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as goConfig } from '../type-extractors/go.js';
 import { goExportChecker } from '../export-detection.js';
@@ -19,6 +20,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { goConfig as goFieldConfig } from '../field-extractors/configs/go.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { goMethodConfig } from '../method-extractors/configs/go.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { goCallConfig } from '../call-extractors/configs/go.js';
 export const goProvider = defineLanguage({
     id: SupportedLanguages.Go,
     extensions: ['.go'],
@@ -27,24 +30,8 @@ export const goProvider = defineLanguage({
     exportChecker: goExportChecker,
     importResolver: resolveGoImport,
     importSemantics: 'wildcard-leaf',
+    callExtractor: createCallExtractor(goCallConfig),
     fieldExtractor: createFieldExtractor(goFieldConfig),
     methodExtractor: createMethodExtractor(goMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Go,
-        typeDeclarationNodes: ['type_declaration'],
-        fileScopeNodeTypes: ['package_clause'],
-        extractName(node) {
-            const typeSpec = node.namedChildren.find((child) => child.type === 'type_spec');
-            return typeSpec?.childForFieldName('name')?.text;
-        },
-        extractType(node) {
-            const typeSpec = node.namedChildren.find((child) => child.type === 'type_spec');
-            const typeNode = typeSpec?.childForFieldName('type');
-            if (typeNode?.type === 'struct_type')
-                return 'Struct';
-            if (typeNode?.type === 'interface_type')
-                return 'Interface';
-            return undefined;
-        },
-    }),
+    classExtractor: createClassExtractor(goClassConfig),
 });

package/dist/core/ingestion/languages/java.js

@@ -8,12 +8,15 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { javaClassConfig } from '../class-extractors/configs/jvm.js';
 import { defineLanguage } from '../language-provider.js';
 import { javaTypeConfig } from '../type-extractors/jvm.js';
 import { javaExportChecker } from '../export-detection.js';
 import { resolveJavaImport } from '../import-resolvers/jvm.js';
 import { extractJavaNamedBindings } from '../named-bindings/java.js';
 import { JAVA_QUERIES } from '../tree-sitter-queries.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { javaCallConfig } from '../call-extractors/configs/jvm.js';
 import { createFieldExtractor } from '../field-extractors/generic.js';
 import { javaConfig } from '../field-extractors/configs/jvm.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
@@ -28,22 +31,8 @@ export const javaProvider = defineLanguage({
     namedBindingExtractor: extractJavaNamedBindings,
     interfaceNamePattern: /^I[A-Z]/,
     mroStrategy: 'implements-split',
+    callExtractor: createCallExtractor(javaCallConfig),
     fieldExtractor: createFieldExtractor(javaConfig),
     methodExtractor: createMethodExtractor(javaMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Java,
-        typeDeclarationNodes: [
-            'class_declaration',
-            'interface_declaration',
-            'enum_declaration',
-            'record_declaration',
-        ],
-        fileScopeNodeTypes: ['package_declaration'],
-        ancestorScopeNodeTypes: [
-            'class_declaration',
-            'interface_declaration',
-            'enum_declaration',
-            'record_declaration',
-        ],
-    }),
+    classExtractor: createClassExtractor(javaClassConfig),
 });

package/dist/core/ingestion/languages/kotlin.js

@@ -8,6 +8,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { kotlinClassConfig } from '../class-extractors/configs/jvm.js';
 import { defineLanguage } from '../language-provider.js';
 import { kotlinTypeConfig } from '../type-extractors/jvm.js';
 import { kotlinExportChecker } from '../export-detection.js';
@@ -15,6 +16,8 @@ import { resolveKotlinImport } from '../import-resolvers/jvm.js';
 import { extractKotlinNamedBindings } from '../named-bindings/kotlin.js';
 import { appendKotlinWildcard } from '../import-resolvers/jvm.js';
 import { KOTLIN_QUERIES } from '../tree-sitter-queries.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { kotlinCallConfig } from '../call-extractors/configs/jvm.js';
 import { createFieldExtractor } from '../field-extractors/generic.js';
 import { kotlinConfig } from '../field-extractors/configs/jvm.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
@@ -99,19 +102,10 @@ export const kotlinProvider = defineLanguage({
     namedBindingExtractor: extractKotlinNamedBindings,
     importPathPreprocessor: appendKotlinWildcard,
     mroStrategy: 'implements-split',
+    callExtractor: createCallExtractor(kotlinCallConfig),
     fieldExtractor: createFieldExtractor(kotlinConfig),
     methodExtractor: createMethodExtractor(kotlinMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Kotlin,
-        typeDeclarationNodes: ['class_declaration', 'object_declaration', 'companion_object'],
-        fileScopeNodeTypes: ['package_header'],
-        ancestorScopeNodeTypes: ['class_declaration', 'object_declaration', 'companion_object'],
-        extractType(node) {
-            if (node.type !== 'class_declaration')
-                return undefined;
-            return node.children.some((child) => child?.text === 'interface') ? 'Interface' : 'Class';
-        },
-    }),
+    classExtractor: createClassExtractor(kotlinClassConfig),
     builtInNames: BUILT_INS,
     labelOverride: (functionNode, defaultLabel) => {
         if (defaultLabel !== 'Function')

package/dist/core/ingestion/languages/php.js

@@ -7,6 +7,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { phpClassConfig } from '../class-extractors/configs/php.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as phpConfig } from '../type-extractors/php.js';
 import { phpExportChecker } from '../export-detection.js';
@@ -18,6 +19,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { phpConfig as phpFieldConfig } from '../field-extractors/configs/php.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { phpMethodConfig } from '../method-extractors/configs/php.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { phpCallConfig } from '../call-extractors/configs/php.js';
 const BUILT_INS = new Set([
     'echo',
     'isset',
@@ -221,13 +224,10 @@ export const phpProvider = defineLanguage({
     exportChecker: phpExportChecker,
     importResolver: resolvePhpImport,
     namedBindingExtractor: extractPhpNamedBindings,
+    callExtractor: createCallExtractor(phpCallConfig),
     fieldExtractor: createFieldExtractor(phpFieldConfig),
     methodExtractor: createMethodExtractor(phpMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.PHP,
-        typeDeclarationNodes: ['class_declaration', 'interface_declaration', 'enum_declaration'],
-        ancestorScopeNodeTypes: ['namespace_definition'],
-    }),
+    classExtractor: createClassExtractor(phpClassConfig),
     descriptionExtractor: phpDescriptionExtractor,
     isRouteFile: isPhpRouteFile,
     builtInNames: BUILT_INS,

package/dist/core/ingestion/languages/python.js

@@ -11,6 +11,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { pythonClassConfig } from '../class-extractors/configs/python.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as pythonConfig } from '../type-extractors/python.js';
 import { pythonExportChecker } from '../export-detection.js';
@@ -21,6 +22,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { pythonConfig as pythonFieldConfig } from '../field-extractors/configs/python.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { pythonMethodConfig } from '../method-extractors/configs/python.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { pythonCallConfig } from '../call-extractors/configs/python.js';
 const BUILT_INS = new Set([
     'print',
     'len',
@@ -60,12 +63,9 @@ export const pythonProvider = defineLanguage({
     namedBindingExtractor: extractPythonNamedBindings,
     importSemantics: 'namespace',
     mroStrategy: 'c3',
+    callExtractor: createCallExtractor(pythonCallConfig),
     fieldExtractor: createFieldExtractor(pythonFieldConfig),
     methodExtractor: createMethodExtractor(pythonMethodConfig),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Python,
-        typeDeclarationNodes: ['class_definition'],
-        ancestorScopeNodeTypes: ['class_definition'],
-    }),
+    classExtractor: createClassExtractor(pythonClassConfig),
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/ruby.js

@@ -8,6 +8,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { rubyClassConfig } from '../class-extractors/configs/ruby.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as rubyConfig } from '../type-extractors/ruby.js';
 import { routeRubyCall } from '../call-routing.js';
@@ -18,6 +19,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { rubyConfig as rubyFieldConfig } from '../field-extractors/configs/ruby.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { rubyMethodConfig } from '../method-extractors/configs/ruby.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { rubyCallConfig } from '../call-extractors/configs/ruby.js';
 /** Ruby method/singleton_method: extract name from 'name' field, label as Method. */
 const rubyExtractFunctionName = (node) => {
     if (node.type !== 'method' && node.type !== 'singleton_method')
@@ -100,6 +103,7 @@ export const rubyProvider = defineLanguage({
     importResolver: resolveRubyImport,
     callRouter: routeRubyCall,
     importSemantics: 'wildcard-leaf',
+    callExtractor: createCallExtractor(rubyCallConfig),
     resolveEnclosingOwner(node) {
         // Ruby singleton_class (class << self) should resolve to the enclosing
         // class or module for owner/container resolution (HAS_METHOD edges, class IDs).
@@ -120,10 +124,6 @@ export const rubyProvider = defineLanguage({
         ...rubyMethodConfig,
         extractFunctionName: rubyExtractFunctionName,
     }),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Ruby,
-        typeDeclarationNodes: ['class'],
-        ancestorScopeNodeTypes: ['module', 'class'],
-    }),
+    classExtractor: createClassExtractor(rubyClassConfig),
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/rust.js

@@ -11,6 +11,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { rustClassConfig } from '../class-extractors/configs/rust.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as rustConfig } from '../type-extractors/rust.js';
 import { rustExportChecker } from '../export-detection.js';
@@ -21,6 +22,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { rustConfig as rustFieldConfig } from '../field-extractors/configs/rust.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { rustMethodConfig } from '../method-extractors/configs/rust.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { rustCallConfig } from '../call-extractors/configs/rust.js';
 /** Rust impl_item: find the function_item child and extract its name as a Method. */
 const rustExtractFunctionName = (node) => {
     if (node.type !== 'impl_item')
@@ -112,15 +115,12 @@ export const rustProvider = defineLanguage({
     importResolver: resolveRustImport,
     namedBindingExtractor: extractRustNamedBindings,
     mroStrategy: 'qualified-syntax',
+    callExtractor: createCallExtractor(rustCallConfig),
     fieldExtractor: createFieldExtractor(rustFieldConfig),
     methodExtractor: createMethodExtractor({
         ...rustMethodConfig,
         extractFunctionName: rustExtractFunctionName,
     }),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Rust,
-        typeDeclarationNodes: ['struct_item', 'enum_item'],
-        ancestorScopeNodeTypes: ['mod_item', 'struct_item', 'enum_item'],
-    }),
+    classExtractor: createClassExtractor(rustClassConfig),
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/swift.js

@@ -11,6 +11,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { swiftClassConfig } from '../class-extractors/configs/swift.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as swiftConfig } from '../type-extractors/swift.js';
 import { swiftExportChecker } from '../export-detection.js';
@@ -20,6 +21,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { swiftConfig as swiftFieldConfig } from '../field-extractors/configs/swift.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { swiftMethodConfig } from '../method-extractors/configs/swift.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { swiftCallConfig } from '../call-extractors/configs/swift.js';
 /**
  * Group Swift files by SPM target for implicit module visibility.
  * If SwiftPackageConfig is available, use target -> directory mappings.
@@ -223,27 +226,13 @@ export const swiftProvider = defineLanguage({
     importResolver: resolveSwiftImport,
     importSemantics: 'wildcard-leaf',
     heritageDefaultEdge: 'IMPLEMENTS',
+    callExtractor: createCallExtractor(swiftCallConfig),
     fieldExtractor: createFieldExtractor(swiftFieldConfig),
     methodExtractor: createMethodExtractor({
         ...swiftMethodConfig,
         extractFunctionName: swiftExtractFunctionName,
     }),
-    classExtractor: createClassExtractor({
-        language: SupportedLanguages.Swift,
-        typeDeclarationNodes: ['class_declaration', 'protocol_declaration'],
-        ancestorScopeNodeTypes: ['class_declaration', 'protocol_declaration'],
-        extractType(node) {
-            if (node.type === 'protocol_declaration')
-                return 'Interface';
-            if (node.type !== 'class_declaration')
-                return undefined;
-            if (node.children.some((child) => child?.text === 'struct'))
-                return 'Struct';
-            if (node.children.some((child) => child?.text === 'enum'))
-                return 'Enum';
-            return 'Class';
-        },
-    }),
+    classExtractor: createClassExtractor(swiftClassConfig),
     implicitImportWirer: wireSwiftImplicitImports,
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/typescript.js

@@ -9,6 +9,7 @@
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { defineLanguage } from '../language-provider.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { typescriptClassConfig, javascriptClassConfig, } from '../class-extractors/configs/typescript-javascript.js';
 import { typeConfig as typescriptConfig } from '../type-extractors/typescript.js';
 import { tsExportChecker } from '../export-detection.js';
 import { resolveTypescriptImport, resolveJavascriptImport } from '../import-resolvers/standard.js';
@@ -19,6 +20,8 @@ import { createFieldExtractor } from '../field-extractors/generic.js';
 import { javascriptConfig } from '../field-extractors/configs/typescript-javascript.js';
 import { createMethodExtractor } from '../method-extractors/generic.js';
 import { typescriptMethodConfig, javascriptMethodConfig, } from '../method-extractors/configs/typescript-javascript.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { typescriptCallConfig, javascriptCallConfig, } from '../call-extractors/configs/typescript-javascript.js';
 /**
  * TypeScript/JavaScript: arrow_function and function_expression get their name
  * from the parent variable_declarator (e.g. `const foo = () => {}`).
@@ -137,21 +140,6 @@ export const BUILT_INS = new Set([
     'toString',
     'valueOf',
 ]);
-const tsJsClassConfig = {
-    language: SupportedLanguages.TypeScript,
-    typeDeclarationNodes: [
-        'class_declaration',
-        'abstract_class_declaration',
-        'interface_declaration',
-        'enum_declaration',
-    ],
-    ancestorScopeNodeTypes: [
-        'class_declaration',
-        'abstract_class_declaration',
-        'interface_declaration',
-        'enum_declaration',
-    ],
-};
 export const typescriptProvider = defineLanguage({
     id: SupportedLanguages.TypeScript,
     extensions: ['.ts', '.tsx'],
@@ -160,12 +148,13 @@ export const typescriptProvider = defineLanguage({
     exportChecker: tsExportChecker,
     importResolver: resolveTypescriptImport,
     namedBindingExtractor: extractTsNamedBindings,
+    callExtractor: createCallExtractor(typescriptCallConfig),
     fieldExtractor: typescriptFieldExtractor,
     methodExtractor: createMethodExtractor({
         ...typescriptMethodConfig,
         extractFunctionName: tsExtractFunctionName,
     }),
-    classExtractor: createClassExtractor(tsJsClassConfig),
+    classExtractor: createClassExtractor(typescriptClassConfig),
     builtInNames: BUILT_INS,
 });
 export const javascriptProvider = defineLanguage({
@@ -176,14 +165,12 @@ export const javascriptProvider = defineLanguage({
     exportChecker: tsExportChecker,
     importResolver: resolveJavascriptImport,
     namedBindingExtractor: extractTsNamedBindings,
+    callExtractor: createCallExtractor(javascriptCallConfig),
     fieldExtractor: createFieldExtractor(javascriptConfig),
     methodExtractor: createMethodExtractor({
         ...javascriptMethodConfig,
         extractFunctionName: tsExtractFunctionName,
     }),
-    classExtractor: createClassExtractor({
-        ...tsJsClassConfig,
-        language: SupportedLanguages.JavaScript,
-    }),
+    classExtractor: createClassExtractor(javascriptClassConfig),
     builtInNames: BUILT_INS,
 });

package/dist/core/ingestion/languages/vue.js

@@ -12,6 +12,7 @@
  */
 import { SupportedLanguages } from '../../../_shared/index.js';
 import { createClassExtractor } from '../class-extractors/generic.js';
+import { vueClassConfig } from '../class-extractors/configs/typescript-javascript.js';
 import { defineLanguage } from '../language-provider.js';
 import { typeConfig as typescriptConfig } from '../type-extractors/typescript.js';
 import { tsExportChecker } from '../export-detection.js';
@@ -20,6 +21,8 @@ import { extractTsNamedBindings } from '../named-bindings/typescript.js';
 import { TYPESCRIPT_QUERIES } from '../tree-sitter-queries.js';
 import { typescriptFieldExtractor } from '../field-extractors/typescript.js';
 import { BUILT_INS as TS_BUILT_INS } from './typescript.js';
+import { createCallExtractor } from '../call-extractors/generic.js';
+import { typescriptCallConfig } from '../call-extractors/configs/typescript-javascript.js';
 const VUE_SPECIFIC_BUILT_INS = [
     'ref',
     'reactive',
@@ -52,21 +55,7 @@ const VUE_SPECIFIC_BUILT_INS = [
     'useAttrs',
 ];
 const VUE_BUILT_INS = new Set([...TS_BUILT_INS, ...VUE_SPECIFIC_BUILT_INS]);
-const vueClassExtractor = createClassExtractor({
-    language: SupportedLanguages.Vue,
-    typeDeclarationNodes: [
-        'class_declaration',
-        'abstract_class_declaration',
-        'interface_declaration',
-        'enum_declaration',
-    ],
-    ancestorScopeNodeTypes: [
-        'class_declaration',
-        'abstract_class_declaration',
-        'interface_declaration',
-        'enum_declaration',
-    ],
-});
+const vueClassExtractor = createClassExtractor(vueClassConfig);
 export const vueProvider = defineLanguage({
     id: SupportedLanguages.Vue,
     extensions: ['.vue'],
@@ -75,6 +64,7 @@ export const vueProvider = defineLanguage({
     exportChecker: tsExportChecker,
     importResolver: resolveVueImport,
     namedBindingExtractor: extractTsNamedBindings,
+    callExtractor: createCallExtractor(typescriptCallConfig),
     fieldExtractor: typescriptFieldExtractor,
     classExtractor: vueClassExtractor,
     builtInNames: VUE_BUILT_INS,