Skip to content

Commit b7c362a

Browse files
gwklineclaude
gwkline
and
claude
committed
Index module exports for getAlternativeContainingModules
When the file being emitted imports no module that exports a symbol, getAlternativeContainingModules falls back to calling getAliasForSymbolInContainer on every external module in the program, which scans each module's whole export table. The result is cached per symbol, but every distinct symbol still pays a full scan, so declaration emit costs O(symbols printed x module exports in the program). Build a map from each export's getSymbolIfSameReference key to the modules exporting it, once per checker, and answer the fallback from that. The result is the same modules in the same program-file order, including the two matches getAliasForSymbolInContainer makes without a named export: an `export =` of the symbol, and the symbol's own parent module. On a generated project with 1,000 modules exporting 200 interfaces each and a file whose declarations name 2,000 of them, emit drops from 25.8s to 0.8s. On a monorepo package with ~9,100 program files and ~260k module exports, emit drops from 9.0s to 2.1s (11.3s to 4.3s total). Emitted declarations and diagnostics are identical, and peak memory rises by about 1%. Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent f9f8d01 commit b7c362a

6 files changed

Lines changed: 285 additions & 10 deletions

File tree

‎tsc/internal/checker/checker.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ type Checker struct {
697697
ReverseMappedSymbolLinks core.LinkStore[*ast.Symbol, ReverseMappedSymbolLinks]
698698
markedAssignmentSymbolLinks core.LinkStore[*ast.Symbol, MarkedAssignmentSymbolLinks]
699699
symbolContainerLinks core.LinkStore[*ast.Symbol, ContainingSymbolLinks]
700+
moduleExportsIndex *moduleExportsIndex
700701
sourceFileLinks core.LinkStore[*ast.SourceFile, SourceFileLinks]
701702
regExpScanner *scanner.Scanner
702703
patternForType map[*Type]*ast.Node
@@ -14612,7 +14613,7 @@ func (c *Checker) recordMergedSymbol(target *ast.Symbol, source *ast.Symbol) {
1461214613
}
1461314614

1461414615
func (c *Checker) getSymbolIfSameReference(s1 *ast.Symbol, s2 *ast.Symbol) *ast.Symbol {
14615-
if c.getMergedSymbol(c.resolveSymbol(c.getMergedSymbol(s1))) == c.getMergedSymbol(c.resolveSymbol(c.getMergedSymbol(s2))) {
14616+
if c.getSameReferenceKey(s1) == c.getSameReferenceKey(s2) {
1461614617
return s1
1461714618
}
1461814619
return nil

‎tsc/internal/checker/symbolaccessibility.go‎

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,21 +207,67 @@ func (c *Checker) getAlternativeContainingModules(symbol *ast.Symbol, enclosingD
207207
if links.extendedContainers != nil {
208208
return *links.extendedContainers
209209
}
210-
// No results from files already being imported by this file - expand search (expensive, but not location-specific, so cached)
211-
otherFiles := c.program.SourceFiles()
212-
for _, file := range otherFiles {
210+
// No results from files already being imported by this file - expand search (not location-specific, so cached).
211+
// Equivalent to calling getAliasForSymbolInContainer on every module in the program, answered from an index
212+
// of module exports built once per checker rather than by scanning every module's exports per symbol.
213+
index := c.getModuleExportsIndex()
214+
positions := index.byTarget[c.getSameReferenceKey(symbol)]
215+
// getAliasForSymbolInContainer also matches the symbol's own parent, whether or not it exports the symbol.
216+
if p, ok := index.position[c.getParentOfSymbol(symbol)]; ok {
217+
if at, found := slices.BinarySearch(positions, p); !found {
218+
positions = slices.Insert(slices.Clone(positions), at, p)
219+
}
220+
}
221+
results = core.Map(positions, func(p int) *ast.Symbol { return index.modules[p] })
222+
links.extendedContainers = &results
223+
return results
224+
}
225+
226+
// moduleExportsIndex maps the target of every module export in the program to the modules that export it.
227+
type moduleExportsIndex struct {
228+
modules []*ast.Symbol // External module symbols in program file order
229+
position map[*ast.Symbol]int // Module symbol -> its index in modules
230+
byTarget map[*ast.Symbol][]int // getSameReferenceKey of an export -> ascending indices of the modules exporting it
231+
}
232+
233+
func (c *Checker) getSameReferenceKey(symbol *ast.Symbol) *ast.Symbol {
234+
return c.getMergedSymbol(c.resolveSymbol(c.getMergedSymbol(symbol)))
235+
}
236+
237+
func (c *Checker) getModuleExportsIndex() *moduleExportsIndex {
238+
if c.moduleExportsIndex != nil {
239+
return c.moduleExportsIndex
240+
}
241+
index := &moduleExportsIndex{
242+
position: make(map[*ast.Symbol]int),
243+
byTarget: make(map[*ast.Symbol][]int),
244+
}
245+
add := func(target *ast.Symbol, i int) {
246+
positions := index.byTarget[target]
247+
if len(positions) == 0 || positions[len(positions)-1] != i {
248+
index.byTarget[target] = append(positions, i)
249+
}
250+
}
251+
for _, file := range c.program.SourceFiles() {
213252
if !ast.IsExternalModule(file) {
214253
continue
215254
}
216255
sym := c.getSymbolOfDeclaration(file.AsNode())
217-
ref := c.getAliasForSymbolInContainer(sym, symbol)
218-
if ref == nil {
219-
continue
256+
i := len(index.modules)
257+
index.modules = append(index.modules, sym)
258+
index.position[sym] = i
259+
// Same checks as getAliasForSymbolInContainer: an `export =` of the symbol, or an export that is the same reference.
260+
if sym.Exports != nil {
261+
if exportEquals, ok := sym.Exports[ast.InternalSymbolNameExportEquals]; ok && exportEquals != nil {
262+
add(c.getSameReferenceKey(exportEquals), i)
263+
}
264+
}
265+
for _, exported := range c.getExportsOfSymbol(sym) {
266+
add(c.getSameReferenceKey(exported), i)
220267
}
221-
results = append(results, sym)
222268
}
223-
links.extendedContainers = &results
224-
return results
269+
c.moduleExportsIndex = index
270+
return index
225271
}
226272

227273
func (c *Checker) getVariableDeclarationOfObjectLiteral(symbol *ast.Symbol, meaning ast.SymbolFlags) *ast.Symbol {

‎tsc/testdata/baselines/reference/compiler/declarationEmitAlternativeContainingModules.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//// [tests/cases/compiler/declarationEmitAlternativeContainingModules.ts] ////
2+
3+
//// [internal.d.ts]
4+
export interface Shape {
5+
kind: string;
6+
}
7+
export declare function makeShape(): Shape;
8+
9+
//// [index.d.ts]
10+
export { makeShape } from "./internal";
11+
export type { Shape } from "./internal";
12+
13+
//// [aliased.d.ts]
14+
export { Shape as RenamedShape } from "./internal";
15+
16+
//// [index.d.ts]
17+
declare namespace legacy {
18+
interface Options {
19+
verbose: boolean;
20+
}
21+
}
22+
declare function legacy(): legacy.Options;
23+
export = legacy;
24+
25+
//// [index.d.ts]
26+
import legacy = require("legacy");
27+
export { makeShape as create } from "shapes/internal";
28+
export declare function makeLegacy(): legacy.Options;
29+
30+
//// [index.ts]
31+
import { create, makeLegacy } from "factory";
32+
export const shape = create();
33+
export const shapes = [create(), create()];
34+
export const options = makeLegacy();
35+
36+
37+
38+
39+
//// [index.d.ts]
40+
export declare const shape: import("shapes").Shape;
41+
export declare const shapes: import("shapes").Shape[];
42+
export declare const options: import("legacy").Options;

‎tsc/testdata/baselines/reference/compiler/declarationEmitAlternativeContainingModules.symbols‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
//// [tests/cases/compiler/declarationEmitAlternativeContainingModules.ts] ////
2+
3+
=== /node_modules/shapes/internal.d.ts ===
4+
export interface Shape {
5+
>Shape : Symbol(Shape, Decl(internal.d.ts, 0, 0))
6+
7+
kind: string;
8+
>kind : Symbol(Shape.kind, Decl(internal.d.ts, 0, 24))
9+
}
10+
export declare function makeShape(): Shape;
11+
>makeShape : Symbol(makeShape, Decl(internal.d.ts, 2, 1))
12+
>Shape : Symbol(Shape, Decl(internal.d.ts, 0, 0))
13+
14+
=== /node_modules/shapes/index.d.ts ===
15+
export { makeShape } from "./internal";
16+
>makeShape : Symbol(makeShape, Decl(index.d.ts, 0, 8))
17+
18+
export type { Shape } from "./internal";
19+
>Shape : Symbol(Shape, Decl(index.d.ts, 1, 13))
20+
21+
=== /node_modules/shapes/aliased.d.ts ===
22+
export { Shape as RenamedShape } from "./internal";
23+
>Shape : Symbol(Shape, Decl(internal.d.ts, 0, 0))
24+
>RenamedShape : Symbol(RenamedShape, Decl(aliased.d.ts, 0, 8))
25+
26+
=== /node_modules/legacy/index.d.ts ===
27+
declare namespace legacy {
28+
>legacy : Symbol(legacy, Decl(index.d.ts, 4, 1), Decl(index.d.ts, 0, 0))
29+
30+
interface Options {
31+
>Options : Symbol(Options, Decl(index.d.ts, 0, 26))
32+
33+
verbose: boolean;
34+
>verbose : Symbol(Options.verbose, Decl(index.d.ts, 1, 23))
35+
}
36+
}
37+
declare function legacy(): legacy.Options;
38+
>legacy : Symbol(legacy, Decl(index.d.ts, 4, 1), Decl(index.d.ts, 0, 0))
39+
>legacy : Symbol(legacy, Decl(index.d.ts, 4, 1), Decl(index.d.ts, 0, 0))
40+
>Options : Symbol(legacy.Options, Decl(index.d.ts, 0, 26))
41+
42+
export = legacy;
43+
>legacy : Symbol(legacy, Decl(index.d.ts, 4, 1), Decl(index.d.ts, 0, 0))
44+
45+
=== /node_modules/factory/index.d.ts ===
46+
import legacy = require("legacy");
47+
>legacy : Symbol(legacy, Decl(index.d.ts, 0, 0))
48+
49+
export { makeShape as create } from "shapes/internal";
50+
>makeShape : Symbol(makeShape, Decl(internal.d.ts, 2, 1))
51+
>create : Symbol(create, Decl(index.d.ts, 1, 8))
52+
53+
export declare function makeLegacy(): legacy.Options;
54+
>makeLegacy : Symbol(makeLegacy, Decl(index.d.ts, 1, 54))
55+
>legacy : Symbol(legacy, Decl(index.d.ts, 0, 0))
56+
>Options : Symbol(legacy.Options, Decl(index.d.ts, 0, 26))
57+
58+
=== /index.ts ===
59+
import { create, makeLegacy } from "factory";
60+
>create : Symbol(create, Decl(index.ts, 0, 8))
61+
>makeLegacy : Symbol(makeLegacy, Decl(index.ts, 0, 16))
62+
63+
export const shape = create();
64+
>shape : Symbol(shape, Decl(index.ts, 1, 12))
65+
>create : Symbol(create, Decl(index.ts, 0, 8))
66+
67+
export const shapes = [create(), create()];
68+
>shapes : Symbol(shapes, Decl(index.ts, 2, 12))
69+
>create : Symbol(create, Decl(index.ts, 0, 8))
70+
>create : Symbol(create, Decl(index.ts, 0, 8))
71+
72+
export const options = makeLegacy();
73+
>options : Symbol(options, Decl(index.ts, 3, 12))
74+
>makeLegacy : Symbol(makeLegacy, Decl(index.ts, 0, 16))
75+

‎tsc/testdata/baselines/reference/compiler/declarationEmitAlternativeContainingModules.types‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
//// [tests/cases/compiler/declarationEmitAlternativeContainingModules.ts] ////
2+
3+
=== /node_modules/shapes/internal.d.ts ===
4+
export interface Shape {
5+
kind: string;
6+
>kind : string
7+
}
8+
export declare function makeShape(): Shape;
9+
>makeShape : () => Shape
10+
11+
=== /node_modules/shapes/index.d.ts ===
12+
export { makeShape } from "./internal";
13+
>makeShape : () => import("./internal").Shape
14+
15+
export type { Shape } from "./internal";
16+
>Shape : import("./internal").Shape
17+
18+
=== /node_modules/shapes/aliased.d.ts ===
19+
export { Shape as RenamedShape } from "./internal";
20+
>Shape : any
21+
>RenamedShape : any
22+
23+
=== /node_modules/legacy/index.d.ts ===
24+
declare namespace legacy {
25+
interface Options {
26+
verbose: boolean;
27+
>verbose : boolean
28+
}
29+
}
30+
declare function legacy(): legacy.Options;
31+
>legacy : () => legacy.Options
32+
>legacy : any
33+
34+
export = legacy;
35+
>legacy : () => legacy.Options
36+
37+
=== /node_modules/factory/index.d.ts ===
38+
import legacy = require("legacy");
39+
>legacy : () => legacy.Options
40+
41+
export { makeShape as create } from "shapes/internal";
42+
>makeShape : () => import("shapes/internal").Shape
43+
>create : () => import("shapes/internal").Shape
44+
45+
export declare function makeLegacy(): legacy.Options;
46+
>makeLegacy : () => legacy.Options
47+
>legacy : any
48+
49+
=== /index.ts ===
50+
import { create, makeLegacy } from "factory";
51+
>create : () => import("shapes").Shape
52+
>makeLegacy : () => import("legacy").Options
53+
54+
export const shape = create();
55+
>shape : import("shapes").Shape
56+
>create() : import("shapes").Shape
57+
>create : () => import("shapes").Shape
58+
59+
export const shapes = [create(), create()];
60+
>shapes : import("shapes").Shape[]
61+
>[create(), create()] : import("shapes").Shape[]
62+
>create() : import("shapes").Shape
63+
>create : () => import("shapes").Shape
64+
>create() : import("shapes").Shape
65+
>create : () => import("shapes").Shape
66+
67+
export const options = makeLegacy();
68+
>options : import("legacy").Options
69+
>makeLegacy() : import("legacy").Options
70+
>makeLegacy : () => import("legacy").Options
71+

‎tsc/testdata/tests/cases/compiler/declarationEmitAlternativeContainingModules.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// @module: commonjs
2+
// @target: es2015
3+
// @declaration: true
4+
// @emitDeclarationOnly: true
5+
6+
// index.ts imports none of the modules that export the types in its inferred declarations,
7+
// so declaration emit searches every module in the program for one to reference them through.
8+
9+
// @filename: /node_modules/shapes/internal.d.ts
10+
export interface Shape {
11+
kind: string;
12+
}
13+
export declare function makeShape(): Shape;
14+
15+
// @filename: /node_modules/shapes/index.d.ts
16+
export { makeShape } from "./internal";
17+
export type { Shape } from "./internal";
18+
19+
// @filename: /node_modules/shapes/aliased.d.ts
20+
export { Shape as RenamedShape } from "./internal";
21+
22+
// @filename: /node_modules/legacy/index.d.ts
23+
declare namespace legacy {
24+
interface Options {
25+
verbose: boolean;
26+
}
27+
}
28+
declare function legacy(): legacy.Options;
29+
export = legacy;
30+
31+
// @filename: /node_modules/factory/index.d.ts
32+
import legacy = require("legacy");
33+
export { makeShape as create } from "shapes/internal";
34+
export declare function makeLegacy(): legacy.Options;
35+
36+
// @filename: /index.ts
37+
import { create, makeLegacy } from "factory";
38+
export const shape = create();
39+
export const shapes = [create(), create()];
40+
export const options = makeLegacy();

0 commit comments

Comments
 (0)