Every TS `public_field_definition` / JS `field_definition` extracted as a
method-kind node, so a plain field (`public fonts: Fonts;`) was reported
as callable: class shape was misrepresented, kind-based filtering was
defeated, and bare-name call resolution landed on data fields — typeorm's
boolean `ColumnMetadata::isArray` field was soaking up Array.isArray(...)
call edges (685 such wrong edges on typeorm alone).
Classification now follows the VALUE (classifyMethodNode hook, mirroring
resolveBody's callable detection): arrow-function / function-expression
fields and HOF-wrapped ones (`onScroll = throttle(() => {…})`) stay
methods with their bodies walked; everything else becomes a property that
keeps its type-annotation references edge, visibility, static-ness, and
decorators. Field initializers are now walked too (`history =
createHistory()` attributes the call to the property — previously
invisible), and JS class fields — whose name lives in the grammar's
`property` field, so they never extracted a symbol at all — now appear in
the graph (resolveName on the JS extractor).
With fields correctly kinded, `this.X` callback registration is re-enabled
for TS/JS (removed in #807 because field pseudo-methods made it mostly
wrong): `this.<member>` candidates resolve CLASS-SCOPED
(resolveThisMemberFnRef) — the target must be a function/method sharing
the from-symbol's qualified-name class prefix, same file, no fallback —
so `addEventListener("online", this.onOfflineStatusToggle)` and API-object
wiring (`{ mutateElement: this.mutateElement }`) produce registration
edges to the enclosing class's own method, while `this.fonts` (a
property) and inherited/unknown members yield no edge.
A/B (baseline = #807 main): excalidraw / typeorm / express — node counts
identical on all three; kinds shift method→property only (typeorm: exactly
7,406 swapped; excalidraw also corrects 5 anonymous-class mock fields that
were function-kind); every one of the 736 dropped call edges targeted a
node that is now a property (calls into data fields — verified 100%);
gains are retargets to real callables, initializer-call attributions, and
+74/+7 class-scoped this.X registration edges (sampled: addEventListener/
removeEventListener wiring, imperative-API method maps). Full suite green
(1386).
EXTRACTION_VERSION 19 → 20 (re-index to benefit).
Closes #808
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
8a114ba53c
commit
38eb4e688c
@@ -1,10 +1,14 @@
|
||||
import { getNodeText, getChildByField } from '../tree-sitter-helpers';
|
||||
import type { LanguageExtractor } from '../tree-sitter-types';
|
||||
import { classifyTsClassMember } from './typescript';
|
||||
|
||||
export const javascriptExtractor: LanguageExtractor = {
|
||||
functionTypes: ['function_declaration', 'arrow_function', 'function_expression'],
|
||||
classTypes: ['class_declaration'],
|
||||
methodTypes: ['method_definition', 'field_definition'],
|
||||
// JS `field_definition` ≙ TS `public_field_definition`: plain fields are
|
||||
// properties, function-valued fields are methods (#808).
|
||||
classifyMethodNode: classifyTsClassMember,
|
||||
interfaceTypes: [],
|
||||
structTypes: [],
|
||||
enumTypes: [],
|
||||
@@ -13,6 +17,17 @@ export const javascriptExtractor: LanguageExtractor = {
|
||||
callTypes: ['call_expression'],
|
||||
variableTypes: ['lexical_declaration', 'variable_declaration'],
|
||||
nameField: 'name',
|
||||
// JS `field_definition` names its key the `property` field (TS's
|
||||
// public_field_definition uses `name`). Without this, JS class fields —
|
||||
// including arrow-function handler fields — extracted no name and produced
|
||||
// no node at all (#808).
|
||||
resolveName: (node, source) => {
|
||||
if (node.type === 'field_definition') {
|
||||
const prop = getChildByField(node, 'property');
|
||||
if (prop) return getNodeText(prop, source);
|
||||
}
|
||||
return undefined;
|
||||
},
|
||||
bodyField: 'body',
|
||||
resolveBody: (node, bodyField) => {
|
||||
// field_definition (arrow function class fields) nest the body inside
|
||||
|
||||
@@ -1,10 +1,48 @@
|
||||
import { getNodeText, getChildByField } from '../tree-sitter-helpers';
|
||||
import type { LanguageExtractor } from '../tree-sitter-types';
|
||||
import type { Node as SyntaxNode } from 'web-tree-sitter';
|
||||
|
||||
/**
|
||||
* A TS/JS class field (`public_field_definition` / `field_definition`) is a
|
||||
* METHOD only when its value is callable — an arrow function, a function
|
||||
* expression, or a HOF call wrapping one (`onScroll = throttle(() => {…})`),
|
||||
* exactly mirroring what `resolveBody` below knows how to walk. Everything
|
||||
* else (`public fonts: Fonts;`, `count = 0`, `static defaults = {…}`) is a
|
||||
* PROPERTY. Previously every field extracted as method-kind (#808), which
|
||||
* misrepresented class shape and defeated kind-based filtering — the reason
|
||||
* #756's function-ref resolution had to restrict TS/JS bare identifiers to
|
||||
* function targets.
|
||||
*/
|
||||
export function classifyTsClassMember(node: SyntaxNode): 'method' | 'property' {
|
||||
if (node.type !== 'public_field_definition' && node.type !== 'field_definition') {
|
||||
return 'method'; // method_definition, getters/setters — untouched
|
||||
}
|
||||
for (let i = 0; i < node.namedChildCount; i++) {
|
||||
const child = node.namedChild(i);
|
||||
if (!child) continue;
|
||||
if (child.type === 'arrow_function' || child.type === 'function_expression') {
|
||||
return 'method';
|
||||
}
|
||||
if (child.type === 'call_expression') {
|
||||
const args = getChildByField(child, 'arguments');
|
||||
if (args) {
|
||||
for (let j = 0; j < args.namedChildCount; j++) {
|
||||
const arg = args.namedChild(j);
|
||||
if (arg && (arg.type === 'arrow_function' || arg.type === 'function_expression')) {
|
||||
return 'method';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 'property';
|
||||
}
|
||||
|
||||
export const typescriptExtractor: LanguageExtractor = {
|
||||
functionTypes: ['function_declaration', 'arrow_function', 'function_expression'],
|
||||
classTypes: ['class_declaration', 'abstract_class_declaration'],
|
||||
methodTypes: ['method_definition', 'public_field_definition'],
|
||||
classifyMethodNode: classifyTsClassMember,
|
||||
interfaceTypes: ['interface_declaration'],
|
||||
structTypes: [],
|
||||
enumTypes: ['enum_declaration'],
|
||||
|
||||
Reference in New Issue
Block a user