circle-ir 4.16.1 → 4.18.1

package/dist/core/extractors/ts-declaration-detail.d.ts

@@ -0,0 +1,39 @@
+/**
+ * TypeScript/JavaScript declaration detail, added to `ir.types` and
+ * `ir.exports` only under `AnalyzerOptions.declarationDetail`.
+ *
+ * The default extraction leaves TypeScript declarations without their
+ * `export`, access modifiers, return types, class decorators and decorator
+ * arguments, and lists every declaration in `ir.exports`. This pass fills
+ * those in after the default extraction, matching declarations by name and
+ * line, so the default output is byte-identical when the option is off.
+ *
+ * Added, all optional or appended:
+ * - `TypeInfo.modifiers` — `export`, `default`, `abstract`, `declare`
+ * - `TypeInfo.decorators`, `MethodInfo.decorators`, `FieldInfo.decorators`,
+ *   `ParameterInfo.decorators` — name plus arguments (source text, and the
+ *   value of a string literal)
+ * - `MethodInfo.modifiers` gains `export`/`default` (module functions) and
+ *   `public`/`private`/`protected`/`readonly`/`abstract`/`override`
+ *   (members; a `#name` is `private`)
+ * - `MethodInfo.return_type` from the annotation, without the leading `:`
+ * - `FieldInfo.modifiers` gains access modifiers and `readonly`;
+ *   `FieldInfo.type` from the annotation
+ */
+import type { Node, Tree } from 'web-tree-sitter';
+import type { DecoratorInfo, ExportInfo, TypeInfo } from '../../types/index.js';
+/** A decorator's name and arguments. */
+export declare function decoratorInfo(node: Node): DecoratorInfo | null;
+/**
+ * Fill in TypeScript/JavaScript declaration detail on the types the default
+ * extraction produced. Mutates `types` in place.
+ */
+export declare function enrichTsDeclarations(tree: Tree, types: TypeInfo[]): void;
+/**
+ * `ir.exports` for a TypeScript/JavaScript file under declaration detail: a
+ * file with ES exports exports only what it marks `export`; a member is
+ * exported with its class unless `private`, as `protected` when protected.
+ * A file without any ES export keeps every declaration (CommonJS).
+ */
+export declare function extractTsExports(types: readonly TypeInfo[]): ExportInfo[] | null;
+//# sourceMappingURL=ts-declaration-detail.d.ts.map

package/dist/core/extractors/ts-declaration-detail.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ts-declaration-detail.d.ts","sourceRoot":"","sources":["../../../src/core/extractors/ts-declaration-detail.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAyB,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAyBvG,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,GAAG,IAAI,CAoB9D;AAoGD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAqCxE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAuBhF"}

package/dist/core/extractors/ts-declaration-detail.js

@@ -0,0 +1,266 @@
+/**
+ * TypeScript/JavaScript declaration detail, added to `ir.types` and
+ * `ir.exports` only under `AnalyzerOptions.declarationDetail`.
+ *
+ * The default extraction leaves TypeScript declarations without their
+ * `export`, access modifiers, return types, class decorators and decorator
+ * arguments, and lists every declaration in `ir.exports`. This pass fills
+ * those in after the default extraction, matching declarations by name and
+ * line, so the default output is byte-identical when the option is off.
+ *
+ * Added, all optional or appended:
+ * - `TypeInfo.modifiers` — `export`, `default`, `abstract`, `declare`
+ * - `TypeInfo.decorators`, `MethodInfo.decorators`, `FieldInfo.decorators`,
+ *   `ParameterInfo.decorators` — name plus arguments (source text, and the
+ *   value of a string literal)
+ * - `MethodInfo.modifiers` gains `export`/`default` (module functions) and
+ *   `public`/`private`/`protected`/`readonly`/`abstract`/`override`
+ *   (members; a `#name` is `private`)
+ * - `MethodInfo.return_type` from the annotation, without the leading `:`
+ * - `FieldInfo.modifiers` gains access modifiers and `readonly`;
+ *   `FieldInfo.type` from the annotation
+ */
+function named(node) {
+    const out = [];
+    for (let i = 0; i < node.namedChildCount; i++) {
+        const c = node.namedChild(i);
+        if (c && c.type !== 'comment')
+            out.push(c);
+    }
+    return out;
+}
+function tokens(node) {
+    const out = [];
+    for (let i = 0; i < node.childCount; i++) {
+        const c = node.child(i);
+        if (c && !c.isNamed)
+            out.push(c.text);
+    }
+    return out;
+}
+function stringLiteral(node) {
+    if (node.type !== 'string')
+        return undefined;
+    return named(node).map(c => c.text).join('');
+}
+/** A decorator's name and arguments. */
+export function decoratorInfo(node) {
+    const expr = named(node)[0];
+    if (!expr)
+        return null;
+    let callee = expr;
+    let args = [];
+    if (expr.type === 'call_expression') {
+        callee = expr.childForFieldName('function');
+        const a = expr.childForFieldName('arguments');
+        args = a ? named(a) : [];
+    }
+    if (!callee)
+        return null;
+    const name = callee.type === 'member_expression' ? callee.childForFieldName('property')?.text : callee.text;
+    if (!name)
+        return null;
+    return {
+        name,
+        arguments: args.map(a => {
+            const value = stringLiteral(a);
+            return value === undefined ? { text: a.text } : { text: a.text, value };
+        }),
+    };
+}
+function decoratorsOf(nodes) {
+    return nodes.filter(n => n.type === 'decorator').map(decoratorInfo).filter((d) => d !== null);
+}
+/** `export` / `default` for a declaration whose statement is exported. */
+function exportModifiers(holder) {
+    const stmt = holder.parent?.type === 'export_statement' ? holder.parent : null;
+    if (!stmt)
+        return [];
+    return tokens(stmt).includes('default') ? ['export', 'default'] : ['export'];
+}
+const MEMBER_WORDS = ['readonly', 'abstract', 'override', 'static', 'declare'];
+/** Access and other member modifiers, in source order. */
+function memberModifiers(member) {
+    const out = [];
+    for (let i = 0; i < member.childCount; i++) {
+        const c = member.child(i);
+        if (!c)
+            continue;
+        if (c.type === 'accessibility_modifier')
+            out.push(c.text);
+        else if (c.type === 'override_modifier')
+            out.push('override');
+        else if (!c.isNamed && MEMBER_WORDS.includes(c.text))
+            out.push(c.text);
+    }
+    const name = member.childForFieldName('name') ?? member.childForFieldName('property');
+    if (name?.type === 'private_property_identifier' && !out.includes('private'))
+        out.push('private');
+    return out;
+}
+function annotationText(node) {
+    return node ? node.text.replace(/^:\s*/, '') : null;
+}
+function addModifiers(target, extra) {
+    for (const m of extra)
+        if (!target.includes(m))
+            target.push(m);
+}
+/** Exported local names from `export { a, b as c }` and `export default a`. */
+function clauseExports(root) {
+    const names = new Set();
+    let defaultName = null;
+    for (const stmt of named(root)) {
+        if (stmt.type !== 'export_statement' || stmt.childForFieldName('source'))
+            continue;
+        const clause = named(stmt).find(c => c.type === 'export_clause');
+        for (const s of clause ? named(clause) : []) {
+            const name = s.childForFieldName('name')?.text;
+            const alias = s.childForFieldName('alias')?.text;
+            if (!name)
+                continue;
+            if (alias === 'default')
+                defaultName = name;
+            else
+                names.add(name);
+        }
+        const value = stmt.childForFieldName('value');
+        if (value?.type === 'identifier')
+            defaultName = value.text;
+    }
+    return { names, defaultName };
+}
+function enrichMethod(m, fn, decorators, extra) {
+    addModifiers(m.modifiers, extra);
+    const ret = fn.childForFieldName('return_type');
+    if (ret && m.return_type === null)
+        m.return_type = annotationText(ret);
+    const decs = decoratorsOf(decorators);
+    if (decs.length > 0)
+        m.decorators = decs;
+    const params = fn.childForFieldName('parameters');
+    for (const p of params ? named(params) : []) {
+        const pd = decoratorsOf(named(p));
+        if (pd.length === 0)
+            continue;
+        const line = p.startPosition.row + 1;
+        const info = m.parameters.find(x => x.line === line && !x.decorators && p.text.includes(x.name.replace(/^\.\.\./, '')));
+        if (info)
+            info.decorators = pd;
+    }
+}
+function enrichClassBody(type, body) {
+    let pending = [];
+    for (const member of named(body)) {
+        if (member.type === 'decorator') {
+            pending.push(member);
+            continue;
+        }
+        const line = member.startPosition.row + 1;
+        const nameNode = member.childForFieldName('name') ?? member.childForFieldName('property');
+        const name = nameNode?.text;
+        if (member.type === 'method_definition' && name) {
+            const m = type.methods.find(x => x.name === name && x.start_line === line);
+            if (m)
+                enrichMethod(m, member, pending, memberModifiers(member));
+        }
+        else if ((member.type === 'public_field_definition' || member.type === 'field_definition') && name) {
+            const f = type.fields.find(x => x.name === name);
+            if (f) {
+                addModifiers(f.modifiers, memberModifiers(member));
+                if (f.type === null)
+                    f.type = annotationText(member.childForFieldName('type'));
+                const decs = decoratorsOf(pending);
+                if (decs.length > 0)
+                    f.decorators = decs;
+            }
+        }
+        pending = [];
+    }
+}
+/**
+ * Fill in TypeScript/JavaScript declaration detail on the types the default
+ * extraction produced. Mutates `types` in place.
+ */
+export function enrichTsDeclarations(tree, types) {
+    const root = tree.rootNode;
+    const { names, defaultName } = clauseExports(root);
+    const clauseMods = (name) => name === defaultName ? ['export', 'default'] : names.has(name) ? ['export'] : [];
+    const visit = (node) => {
+        const t = node.type;
+        if (t === 'class_declaration' || t === 'abstract_class_declaration' || t === 'interface_declaration') {
+            const line = node.startPosition.row + 1;
+            const name = node.childForFieldName('name')?.text;
+            const type = types.find(x => x.name === name && x.start_line === line);
+            if (type && name) {
+                const mods = [...exportModifiers(node), ...clauseMods(name)];
+                if (t === 'abstract_class_declaration')
+                    mods.push('abstract');
+                if (node.parent?.type === 'ambient_declaration')
+                    mods.push('declare');
+                type.modifiers = [...new Set(mods)];
+                const decs = decoratorsOf([...(node.parent?.type === 'export_statement' ? named(node.parent) : []), ...named(node)]);
+                if (decs.length > 0)
+                    type.decorators = decs;
+                const body = node.childForFieldName('body');
+                if (body && t !== 'interface_declaration')
+                    enrichClassBody(type, body);
+            }
+        }
+        else if (t === 'function_declaration' || t === 'generator_function_declaration') {
+            const module = types.find(x => x.name === '<module>');
+            const name = node.childForFieldName('name')?.text;
+            const m = module?.methods.find(x => x.name === name && x.start_line === node.startPosition.row + 1);
+            if (m && name)
+                enrichMethod(m, node, [], [...exportModifiers(node), ...clauseMods(name)]);
+        }
+        else if (t === 'variable_declarator') {
+            const value = node.childForFieldName('value');
+            const name = node.childForFieldName('name')?.text;
+            const decl = node.parent;
+            const module = types.find(x => x.name === '<module>');
+            const m = module?.methods.find(x => x.name === name && x.start_line === node.startPosition.row + 1);
+            if (m && name && value?.type === 'arrow_function' && decl)
+                enrichMethod(m, value, [], [...exportModifiers(decl), ...clauseMods(name)]);
+        }
+        for (const c of named(node))
+            visit(c);
+    };
+    visit(root);
+}
+/**
+ * `ir.exports` for a TypeScript/JavaScript file under declaration detail: a
+ * file with ES exports exports only what it marks `export`; a member is
+ * exported with its class unless `private`, as `protected` when protected.
+ * A file without any ES export keeps every declaration (CommonJS).
+ */
+export function extractTsExports(types) {
+    const esm = types.some(t => t.modifiers?.includes('export') || t.methods.some(m => m.modifiers.includes('export')));
+    if (!esm)
+        return null;
+    const out = [];
+    const visibility = (mods) => mods.includes('private') ? null : mods.includes('protected') ? 'protected' : 'public';
+    for (const t of types) {
+        if (t.name === '<module>') {
+            for (const m of t.methods)
+                if (m.modifiers.includes('export'))
+                    out.push({ symbol: m.name, kind: 'method', visibility: 'public' });
+            continue;
+        }
+        if (!t.modifiers?.includes('export'))
+            continue;
+        out.push({ symbol: t.name, kind: t.kind === 'enum' ? 'class' : t.kind, visibility: 'public' });
+        for (const m of t.methods) {
+            const v = visibility(m.modifiers);
+            if (v)
+                out.push({ symbol: `${t.name}.${m.name}`, kind: 'method', visibility: v });
+        }
+        for (const f of t.fields) {
+            const v = visibility(f.modifiers);
+            if (v)
+                out.push({ symbol: `${t.name}.${f.name}`, kind: 'field', visibility: v });
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=ts-declaration-detail.js.map

package/dist/core/extractors/ts-declaration-detail.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ts-declaration-detail.js","sourceRoot":"","sources":["../../../src/core/extractors/ts-declaration-detail.ts"],"names":[],"mappings":"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"}

package/dist/core/extractors/types.js

@@ -394,19 +394,63 @@ function extractJavaTypes(tree, cache, options) {
         const path = node ? enclosingTypePath(node) : [];
         if (path.length > 0)
             t.enclosing_type = path.join('.');
-        const params = node?.childForFieldName('type_parameters');
-        if (params) {
-            const names = params.namedChildren
-                .filter(c => c?.type === 'type_parameter')
-                .map(c => c.namedChildren.find(x => x?.type === 'type_identifier' || x?.type === 'identifier'))
-                .map(x => (x ? getNodeText(x) : ''))
-                .filter(Boolean);
-            if (names.length > 0)
-                t.type_parameters = names;
+        const tp = typeParameters(node);
+        if (tp.names.length > 0)
+            t.type_parameters = tp.names;
+        if (Object.keys(tp.bounds).length > 0)
+            t.type_parameter_bounds = tp.bounds;
+    }
+    // A generic method's own type parameters. A parameter declared `K` or
+    // `M extends Map<K, V>` is matched against a query by its erasure — `Object`,
+    // `Map` — the way the compiler and every bytecode-level tool name it.
+    const allMethods = new Map();
+    for (const t of types) {
+        for (const m of t.methods)
+            allMethods.set(`${m.start_line}:${m.name}`, m);
+    }
+    for (const kind of ['method_declaration', 'constructor_declaration']) {
+        for (const node of getNodesFromCache(tree.rootNode, kind, cache)) {
+            const name = getIdentifier(node, 'name');
+            const info = name ? allMethods.get(`${node.startPosition.row + 1}:${name}`) : undefined;
+            if (!info)
+                continue;
+            const tp = typeParameters(node);
+            if (tp.names.length > 0)
+                info.type_parameters = tp.names;
+            if (Object.keys(tp.bounds).length > 0)
+                info.type_parameter_bounds = tp.bounds;
         }
     }
     return types;
 }
+/**
+ * A declaration's `<…>` type parameters: names in order, and each bounded
+ * one's leftmost bound as written (`T extends A<T> & B` → `A<T>`), which is
+ * what it erases to.
+ */
+function typeParameters(node) {
+    const names = [];
+    const bounds = {};
+    const list = node
+        ? node.childForFieldName('type_parameters') ?? node.namedChildren.find(c => c?.type === 'type_parameters') ?? null
+        : null;
+    if (!list)
+        return { names, bounds };
+    for (const c of list.namedChildren) {
+        if (c?.type !== 'type_parameter')
+            continue;
+        const id = c.namedChildren.find(x => x?.type === 'type_identifier' || x?.type === 'identifier');
+        const name = id ? getNodeText(id) : '';
+        if (!name)
+            continue;
+        names.push(name);
+        const bound = c.namedChildren.find(x => x?.type === 'type_bound');
+        const first = bound?.namedChildren.find(x => x !== null && x.type !== 'annotation' && x.type !== 'marker_annotation');
+        if (first)
+            bounds[name] = getNodeText(first);
+    }
+    return { names, bounds };
+}
 /** The `(String host, int port)` header of a `record_declaration`. */
 function recordComponents(node) {
     const out = [];