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>
100 lines
3.7 KiB
TypeScript
100 lines
3.7 KiB
TypeScript
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: [],
|
|
typeAliasTypes: [],
|
|
importTypes: ['import_statement'],
|
|
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
|
|
// an arrow_function or function_expression child:
|
|
// field_definition → arrow_function → body (statement_block)
|
|
// Also handles wrapper patterns like: field = throttle((e) => { ... })
|
|
// field_definition → call_expression → arguments → arrow_function → body
|
|
if (node.type === 'field_definition') {
|
|
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 getChildByField(child, bodyField);
|
|
}
|
|
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 getChildByField(arg, bodyField);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
paramsField: 'parameters',
|
|
getSignature: (node, source) => {
|
|
const params = getChildByField(node, 'parameters');
|
|
return params ? getNodeText(params, source) : undefined;
|
|
},
|
|
isExported: (node, _source) => {
|
|
let current = node.parent;
|
|
while (current) {
|
|
if (current.type === 'export_statement') return true;
|
|
current = current.parent;
|
|
}
|
|
return false;
|
|
},
|
|
isAsync: (node) => {
|
|
for (let i = 0; i < node.childCount; i++) {
|
|
const child = node.child(i);
|
|
if (child?.type === 'async') return true;
|
|
}
|
|
return false;
|
|
},
|
|
isConst: (node) => {
|
|
if (node.type === 'lexical_declaration') {
|
|
for (let i = 0; i < node.childCount; i++) {
|
|
const child = node.child(i);
|
|
if (child?.type === 'const') return true;
|
|
}
|
|
}
|
|
return false;
|
|
},
|
|
extractImport: (node, source) => {
|
|
const sourceField = node.childForFieldName('source');
|
|
if (sourceField) {
|
|
const moduleName = source.substring(sourceField.startIndex, sourceField.endIndex).replace(/['"]/g, '');
|
|
if (moduleName) {
|
|
return { moduleName, signature: source.substring(node.startIndex, node.endIndex).trim() };
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
};
|