Switch to integer project ids

andrewbranch · andrewbranch · commit 04b018127119 · 2025-03-12T12:44:42.000-07:00
diff --git a/_api/src/base/api.ts b/_api/src/base/api.ts
@@ -21,11 +21,13 @@ export interface API<Async extends boolean> {
 }
 
 export abstract class Project<Async extends boolean> {
+    id: number;
     configFileName!: string;
     compilerOptions!: Record<string, unknown>;
     rootFiles!: readonly string[];
 
     constructor(data: ProjectData) {
+        this.id = data.id;
         this.loadData(data);
     }
 
diff --git a/_api/src/bench.ts b/_api/src/bench.ts
@@ -10,6 +10,14 @@ import { isIdentifier } from "./ast/nodeTests.ts";
 import { SymbolFlags } from "./base/api.ts";
 import { API } from "./sync/api.ts";
 {
+    const api = new API({
+        tsserverPath: new URL("../../built/local/tsgo", import.meta.url).pathname,
+        cwd: dirname(new URL(import.meta.url).pathname),
+        // logFile: "tsgo.log",
+    });
+    const project = api.loadProject("../../../TypeScript/src/compiler/tsconfig.json");
+    const file = project.getSourceFile("checker.ts")!;
+
     // bench("native - batched", () => {
     //     const symbolRequests: { fileName: string; position: number; }[] = [];
     //     file.forEachChild(function visitNode(node) {
@@ -23,14 +31,6 @@ import { API } from "./sync/api.ts";
     // });
 
     bench("native - many calls", () => {
-        const api = new API({
-            tsserverPath: new URL("../../built/local/tsgo", import.meta.url).pathname,
-            cwd: dirname(new URL(import.meta.url).pathname),
-            // logFile: "tsgo.log",
-        });
-        const project = api.loadProject("../../../TypeScript/src/compiler/tsconfig.json");
-        const file = project.getSourceFile("checker.ts")!;
-
         file.forEachChild(function visitNode(node) {
             if (isIdentifier(node)) {
                 const symbol = project.getSymbolAtPosition("checker.ts", node.pos);
diff --git a/_api/src/sync/api.ts b/_api/src/sync/api.ts
@@ -52,19 +52,19 @@ export class Project extends BaseProject<false> {
     }
 
     getSourceFile(fileName: string): SourceFileNode | undefined {
-        const data = this.client.requestBinary("getSourceFile", { project: this.configFileName, fileName });
+        const data = this.client.requestBinary("getSourceFile", { project: this.id, fileName });
         return data ? new SourceFile(this.client, this, data) as unknown as SourceFileNode : undefined;
     }
 
     getSymbolAtPosition(requests: readonly { fileName: string; position: number; }[]): (Symbol | undefined)[];
     getSymbolAtPosition(fileName: string, position: number): Symbol | undefined;
     getSymbolAtPosition(...params: [fileName: string, position: number] | [readonly { fileName: string; position: number; }[]]): Symbol | undefined | (Symbol | undefined)[] {
         if (params.length === 2) {
-            const data = this.client.request("getSymbolAtPosition", { project: this.configFileName, fileName: params[0], position: params[1] });
+            const data = this.client.request("getSymbolAtPosition", { project: this.id, fileName: params[0], position: params[1] });
             return data ? new Symbol(this.client, this, data) : undefined;
         }
         else {
-            const data = this.client.request("getSymbolAtPosition", params[0].map(({ fileName, position }) => ({ project: this.configFileName, fileName, position })));
+            const data = this.client.request("getSymbolAtPosition", params[0].map(({ fileName, position }) => ({ project: this.id, fileName, position })));
             return data.map((d: SymbolData | null) => d ? new Symbol(this.client, this, d) : undefined);
         }
     }
@@ -91,7 +91,7 @@ export class Symbol extends BaseSymbol<false> {
     }
 
     getType(): Type | undefined {
-        const data = this.client.request("getTypeOfSymbol", { project: this.project.configFileName, symbol: this.id });
+        const data = this.client.request("getTypeOfSymbol", { project: this.project.id, symbol: this.id });
         return data ? new Type(this.client, data) : undefined;
     }
 }
diff --git a/_api/src/types.ts b/_api/src/types.ts
@@ -11,6 +11,7 @@ export interface ParsedCommandLine {
 }
 
 export interface ProjectData {
+    id: number;
     configFileName: string;
     compilerOptions: Record<string, unknown>;
     rootFiles: string[];
diff --git a/internal/api/api.go b/internal/api/api.go
@@ -26,7 +26,7 @@ type API struct {
 	scriptInfosMu    sync.RWMutex
 	scriptInfos      map[tspath.Path]*project.ScriptInfo
 
-	projects  map[tspath.Path]*project.Project
+	projects  []*project.Project
 	symbolsMu sync.Mutex
 	symbols   map[Handle[ast.Symbol]]*ast.Symbol
 }
@@ -42,7 +42,6 @@ func NewAPI(host APIHost, options APIOptions) *API {
 			CurrentDirectory:          host.GetCurrentDirectory(),
 		}),
 		scriptInfos: make(map[tspath.Path]*project.ScriptInfo),
-		projects:    make(map[tspath.Path]*project.Project),
 		symbols:     make(map[Handle[ast.Symbol]]*ast.Symbol),
 	}
 }
@@ -105,7 +104,7 @@ func (api *API) HandleRequest(id int, method string, payload json.RawMessage) ([
 	switch Method(method) {
 	case MethodGetSourceFile:
 		params := params.(*GetSourceFileParams)
-		sourceFile, err := api.GetSourceFile(api.toPath(params.Project), params.FileName)
+		sourceFile, err := api.GetSourceFile(params.Project, params.FileName)
 		if err != nil {
 			return nil, err
 		}
@@ -116,11 +115,11 @@ func (api *API) HandleRequest(id int, method string, payload json.RawMessage) ([
 		return encodeJSON(api.LoadProject(params.(*LoadProjectParams).ConfigFileName))
 	case MethodGetSymbolAtPosition:
 		return encodeJSON(handleBatchableRequest(params, func(params *GetSymbolAtPositionParams) (any, error) {
-			return api.GetSymbolAtPosition(api.toPath(params.Project), params.FileName, int(params.Position))
+			return api.GetSymbolAtPosition(params.Project, params.FileName, int(params.Position))
 		}))
 	case MethodGetTypeOfSymbol:
 		return encodeJSON(handleBatchableRequest(params, func(params *GetTypeOfSymbolParams) (any, error) {
-			return api.GetTypeOfSymbol(api.toPath(params.Project), params.Symbol)
+			return api.GetTypeOfSymbol(params.Project, params.Symbol)
 		}))
 	default:
 		return nil, fmt.Errorf("unhandled API method %q", method)
@@ -159,15 +158,16 @@ func (api *API) LoadProject(configFileName string) (*ProjectData, error) {
 		return nil, err
 	}
 	project.GetProgram()
-	api.projects[configFilePath] = project
-	return NewProjectData(project), nil
+	id := len(api.projects)
+	api.projects = append(api.projects, project)
+	return NewProjectData(project, id), nil
 }
 
-func (api *API) GetSymbolAtPosition(projectPath tspath.Path, fileName string, position int) (*SymbolData, error) {
-	project, ok := api.projects[projectPath]
-	if !ok {
-		return nil, fmt.Errorf("project %q not found", projectPath)
+func (api *API) GetSymbolAtPosition(projectId int, fileName string, position int) (*SymbolData, error) {
+	if projectId >= len(api.projects) {
+		return nil, fmt.Errorf("project not found")
 	}
+	project := api.projects[projectId]
 	symbol, err := project.LanguageService().GetSymbolAtPosition(fileName, position)
 	if err != nil || symbol == nil {
 		return nil, err
@@ -179,11 +179,11 @@ func (api *API) GetSymbolAtPosition(projectPath tspath.Path, fileName string, po
 	return data, nil
 }
 
-func (api *API) GetTypeOfSymbol(projectPath tspath.Path, symbolHandle Handle[ast.Symbol]) (*TypeData, error) {
-	project, ok := api.projects[projectPath]
-	if !ok {
-		return nil, fmt.Errorf("project %q not found", projectPath)
+func (api *API) GetTypeOfSymbol(projectId int, symbolHandle Handle[ast.Symbol]) (*TypeData, error) {
+	if projectId >= len(api.projects) {
+		return nil, fmt.Errorf("project not found")
 	}
+	project := api.projects[projectId]
 	symbol, ok := api.symbols[symbolHandle]
 	if !ok {
 		return nil, fmt.Errorf("symbol %q not found", symbolHandle)
@@ -195,14 +195,14 @@ func (api *API) GetTypeOfSymbol(projectPath tspath.Path, symbolHandle Handle[ast
 	return NewTypeData(t), nil
 }
 
-func (api *API) GetSourceFile(projectPath tspath.Path, fileName string) (*ast.SourceFile, error) {
-	project, ok := api.projects[projectPath]
-	if !ok {
-		return nil, fmt.Errorf("project %q not found", projectPath)
+func (api *API) GetSourceFile(projectId int, fileName string) (*ast.SourceFile, error) {
+	if projectId >= len(api.projects) {
+		return nil, fmt.Errorf("project not found")
 	}
+	project := api.projects[projectId]
 	sourceFile := project.GetProgram().GetSourceFile(fileName)
 	if sourceFile == nil {
-		return nil, nil
+		return nil, fmt.Errorf("source file %q not found", fileName)
 	}
 	return sourceFile, nil
 }
diff --git a/internal/api/proto.go b/internal/api/proto.go
@@ -56,21 +56,23 @@ type LoadProjectParams struct {
 }
 
 type ProjectData struct {
+	Id              int                   `json:"id"`
 	ConfigFileName  string                `json:"configFileName"`
 	RootFiles       []string              `json:"rootFiles"`
 	CompilerOptions *core.CompilerOptions `json:"compilerOptions"`
 }
 
-func NewProjectData(project *project.Project) *ProjectData {
+func NewProjectData(project *project.Project, id int) *ProjectData {
 	return &ProjectData{
+		Id:              id,
 		ConfigFileName:  project.Name(),
 		RootFiles:       project.GetRootFileNames(),
 		CompilerOptions: project.GetCompilerOptions(),
 	}
 }
 
 type GetSymbolAtPositionParams struct {
-	Project  string `json:"project"`
+	Project  int    `json:"project"`
 	FileName string `json:"fileName"`
 	Position uint32 `json:"position"`
 }
@@ -92,7 +94,7 @@ func NewSymbolData(symbol *ast.Symbol, projectVersion int) *SymbolData {
 }
 
 type GetTypeOfSymbolParams struct {
-	Project string             `json:"project"`
+	Project int                `json:"project"`
 	Symbol  Handle[ast.Symbol] `json:"symbol"`
 }
 
@@ -109,7 +111,7 @@ func NewTypeData(t *checker.Type) *TypeData {
 }
 
 type GetSourceFileParams struct {
-	Project  string `json:"project"`
+	Project  int    `json:"project"`
 	FileName string `json:"fileName"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,13 @@ export interface API<Async extends boolean> {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`export abstract class Project<Async extends boolean> {`
	`24`	`+ id: number;`
`24`	`25`	`configFileName!: string;`
`25`	`26`	`compilerOptions!: Record<string, unknown>;`
`26`	`27`	`rootFiles!: readonly string[];`
`27`	`28`
`28`	`29`	`constructor(data: ProjectData) {`
	`30`	`+ this.id = data.id;`
`29`	`31`	`this.loadData(data);`
`30`	`32`	`}`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -52,19 +52,19 @@ export class Project extends BaseProject<false> {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`getSourceFile(fileName: string): SourceFileNode \| undefined {`
`55`		`- const data = this.client.requestBinary("getSourceFile", { project: this.configFileName, fileName });`
	`55`	`+ const data = this.client.requestBinary("getSourceFile", { project: this.id, fileName });`
`56`	`56`	`return data ? new SourceFile(this.client, this, data) as unknown as SourceFileNode : undefined;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`getSymbolAtPosition(requests: readonly { fileName: string; position: number; }[]): (Symbol \| undefined)[];`
`60`	`60`	`getSymbolAtPosition(fileName: string, position: number): Symbol \| undefined;`
`61`	`61`	`getSymbolAtPosition(...params: [fileName: string, position: number] \| [readonly { fileName: string; position: number; }[]]): Symbol \| undefined \| (Symbol \| undefined)[] {`
`62`	`62`	`if (params.length === 2) {`
`63`		`- const data = this.client.request("getSymbolAtPosition", { project: this.configFileName, fileName: params[0], position: params[1] });`
	`63`	`+ const data = this.client.request("getSymbolAtPosition", { project: this.id, fileName: params[0], position: params[1] });`
`64`	`64`	`return data ? new Symbol(this.client, this, data) : undefined;`
`65`	`65`	`}`
`66`	`66`	`else {`
`67`		`- const data = this.client.request("getSymbolAtPosition", params[0].map(({ fileName, position }) => ({ project: this.configFileName, fileName, position })));`
	`67`	`+ const data = this.client.request("getSymbolAtPosition", params[0].map(({ fileName, position }) => ({ project: this.id, fileName, position })));`
`68`	`68`	`return data.map((d: SymbolData \| null) => d ? new Symbol(this.client, this, d) : undefined);`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -91,7 +91,7 @@ export class Symbol extends BaseSymbol<false> {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`getType(): Type \| undefined {`
`94`		`- const data = this.client.request("getTypeOfSymbol", { project: this.project.configFileName, symbol: this.id });`
	`94`	`+ const data = this.client.request("getTypeOfSymbol", { project: this.project.id, symbol: this.id });`
`95`	`95`	`return data ? new Type(this.client, data) : undefined;`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export interface ParsedCommandLine {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`export interface ProjectData {`
	`14`	`+ id: number;`
`14`	`15`	`configFileName: string;`
`15`	`16`	`compilerOptions: Record<string, unknown>;`
`16`	`17`	`rootFiles: string[];`
Original file line number	Diff line number	Diff line change
`@@ -56,21 +56,23 @@ type LoadProjectParams struct {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`type ProjectData struct {`
	`59`	+ Id int `json:"id"`
`59`	`60`	ConfigFileName string `json:"configFileName"`
`60`	`61`	RootFiles []string `json:"rootFiles"`
`61`	`62`	CompilerOptions *core.CompilerOptions `json:"compilerOptions"`
`62`	`63`	`}`
`63`	`64`
`64`		`-func NewProjectData(project project.Project) ProjectData {`
	`65`	`+func NewProjectData(project project.Project, id int) ProjectData {`
`65`	`66`	`return &ProjectData{`
	`67`	`+ Id: id,`
`66`	`68`	`ConfigFileName: project.Name(),`
`67`	`69`	`RootFiles: project.GetRootFileNames(),`
`68`	`70`	`CompilerOptions: project.GetCompilerOptions(),`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`type GetSymbolAtPositionParams struct {`
`73`		- Project string `json:"project"`
	`75`	+ Project int `json:"project"`
`74`	`76`	FileName string `json:"fileName"`
`75`	`77`	Position uint32 `json:"position"`
`76`	`78`	`}`
`@@ -92,7 +94,7 @@ func NewSymbolData(symbol ast.Symbol, projectVersion int) SymbolData {`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`type GetTypeOfSymbolParams struct {`
`95`		- Project string `json:"project"`
	`97`	+ Project int `json:"project"`
`96`	`98`	Symbol Handle[ast.Symbol] `json:"symbol"`
`97`	`99`	`}`
`98`	`100`
`@@ -109,7 +111,7 @@ func NewTypeData(t checker.Type) TypeData {`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`type GetSourceFileParams struct {`
`112`		- Project string `json:"project"`
	`114`	+ Project int `json:"project"`
`113`	`115`	FileName string `json:"fileName"`
`114`	`116`	`}`
`115`	`117`