@typescript/native-preview 7.0.0-dev.20260701.1 → 7.0.0-dev.20260702.3

package/dist/api/async/api.js

@@ -129,8 +129,8 @@ export class Snapshot {
         this.client = client;
         this.toPath = toPath;
         this.onDispose = onDispose;
-        this.snapshotRegistry = new SnapshotObjectRegistry(client, this.id);
         this.projectMap = new Map();
+        this.snapshotRegistry = new SnapshotObjectRegistry(client, this.id, projectId => this.projectMap.get(projectId));
         for (const projData of data.projects) {
             const project = new Project(projData, this.id, client, sourceFileCache, toPath, this.snapshotRegistry);
             this.projectMap.set(toPath(projData.configFileName), project);
@@ -182,9 +182,15 @@ class SnapshotObjectRegistry {
     symbols = new Map();
     client;
     snapshotId;
-    constructor(client, snapshotId) {
+    resolveProject;
+    constructor(client, snapshotId, resolveProject) {
         this.client = client;
         this.snapshotId = snapshotId;
+        this.resolveProject = resolveProject;
+    }
+    /** Resolve a project id (a config file path) to its Project within this snapshot. */
+    getProject(projectId) {
+        return this.resolveProject(projectId);
     }
     getOrCreateSymbol(data) {
         let symbol = this.symbols.get(data.id);
@@ -244,14 +250,14 @@ class SnapshotObjectRegistry {
 class ProjectObjectRegistry {
     client;
     snapshotId;
-    projectId;
+    project;
     snapshotRegistry;
     types = new Map();
     signatures = new Map();
-    constructor(client, snapshotId, projectId, snapshotRegistry) {
+    constructor(client, snapshotId, project, snapshotRegistry) {
         this.client = client;
         this.snapshotId = snapshotId;
-        this.projectId = projectId;
+        this.project = project;
         this.snapshotRegistry = snapshotRegistry;
     }
     getOrCreateSymbol(data) {
@@ -274,7 +280,7 @@ class ProjectObjectRegistry {
     getOrCreateSignature(data) {
         let sig = this.signatures.get(data.id);
         if (!sig) {
-            sig = new Signature(data, this);
+            sig = new Signature(data, this.project, this);
             this.signatures.set(data.id, sig);
         }
         return sig;
@@ -296,7 +302,7 @@ class ProjectObjectRegistry {
         }
         const data = await this.client.apiRequest(method, {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             objectId: source.id,
         });
         if (!data)
@@ -304,7 +310,7 @@ class ProjectObjectRegistry {
         return this.getOrCreateType(data);
     }
     async fetchSymbol(source, method, handle) {
-        return this.snapshotRegistry.fetchSymbol(source, method, handle, this.projectId);
+        return this.snapshotRegistry.fetchSymbol(source, method, handle, this.project.id);
     }
     async fetchSignature(source, method, handle) {
         if (!handle)
@@ -314,7 +320,7 @@ class ProjectObjectRegistry {
             return cached;
         const data = await this.client.apiRequest(method, {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             objectId: source.id,
         });
         if (!data)
@@ -338,7 +344,7 @@ class ProjectObjectRegistry {
         }
         const typesData = await this.client.apiRequest(method, {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             objectId: source.id,
         });
         if (typesData == null)
@@ -347,14 +353,14 @@ class ProjectObjectRegistry {
             return typesData.map(data => this.getOrCreateType(data));
     }
     async fetchSymbols(source, method, handles) {
-        return this.snapshotRegistry.fetchSymbols(source, method, handles, this.projectId);
+        return this.snapshotRegistry.fetchSymbols(source, method, handles, this.project.id);
     }
     // getBaseTypes is a checker-level endpoint keyed by `type` (not `objectId`),
     // so it cannot go through fetchTypes. This helper reuses that server method.
     async fetchBaseTypes(source) {
         const typesData = await this.client.apiRequest("getBaseTypes", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: source.id,
         });
         if (typesData == null)
@@ -377,9 +383,9 @@ export class Project {
         this.compilerOptions = data.compilerOptions;
         this.rootFiles = data.rootFiles;
         this.client = client;
-        this.program = new Program(snapshotId, this.id, client, sourceFileCache, toPath);
-        const objectRegistry = new ProjectObjectRegistry(client, snapshotId, this.id, snapshotRegistry);
-        this.checker = new Checker(snapshotId, this.id, client, objectRegistry);
+        this.program = new Program(snapshotId, this, client, sourceFileCache, toPath);
+        const objectRegistry = new ProjectObjectRegistry(client, snapshotId, this, snapshotRegistry);
+        this.checker = new Checker(snapshotId, this, client, objectRegistry);
         this.emitter = new Emitter(client);
     }
     dispose() {
@@ -388,31 +394,34 @@ export class Project {
 }
 export class Program {
     snapshotId;
-    projectId;
+    project;
     client;
     sourceFileCache;
     toPath;
     decoder = new Wtf8Decoder();
     sourceFileMetadataCache = new Map();
-    constructor(snapshotId, projectId, client, sourceFileCache, toPath) {
+    constructor(snapshotId, project, client, sourceFileCache, toPath) {
         this.snapshotId = snapshotId;
-        this.projectId = projectId;
+        this.project = project;
         this.client = client;
         this.sourceFileCache = sourceFileCache;
         this.toPath = toPath;
     }
+    getCompilerOptions() {
+        return this.project.compilerOptions;
+    }
     async getSourceFile(file) {
         const fileName = resolveFileName(file);
         const path = this.toPath(fileName);
         // Check if we already have a retained cache entry for this (snapshot, project) pair
-        const retained = this.sourceFileCache.getRetained(path, this.snapshotId, this.projectId);
+        const retained = this.sourceFileCache.getRetained(path, this.snapshotId, this.project.id);
         if (retained) {
             return retained;
         }
         // Fetch from server
         const binaryData = await this.client.apiRequestBinary("getSourceFile", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file,
         });
         if (!binaryData) {
@@ -423,12 +432,12 @@ export class Program {
         const parseOptionsKey = readParseOptionsKey(view);
         // Create a new RemoteSourceFile and cache it (set returns existing if hash matches)
         const sourceFile = new RemoteSourceFile(binaryData, this.decoder);
-        return this.sourceFileCache.set(path, sourceFile, parseOptionsKey, contentHash, this.snapshotId, this.projectId);
+        return this.sourceFileCache.set(path, sourceFile, parseOptionsKey, contentHash, this.snapshotId, this.project.id);
     }
     async getSourceFileNames() {
         const data = await this.client.apiRequest("getSourceFileNames", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
         return data ?? [];
     }
@@ -457,7 +466,7 @@ export class Program {
     async fetchSourceFileMetadata(path) {
         const data = await this.client.apiRequest("getSourceFileMetadata", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file: path,
         });
         return data ?? undefined;
@@ -487,7 +496,7 @@ export class Program {
     async getSyntacticDiagnostics(file) {
         const data = await this.client.apiRequest("getSyntacticDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             ...(file !== undefined ? { file } : {}),
         });
         return data ?? [];
@@ -499,7 +508,7 @@ export class Program {
     async getBindDiagnostics(file) {
         const data = await this.client.apiRequest("getBindDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             ...(file !== undefined ? { file } : {}),
         });
         return data ?? [];
@@ -511,7 +520,7 @@ export class Program {
     async getSemanticDiagnostics(file) {
         const data = await this.client.apiRequest("getSemanticDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             ...(file !== undefined ? { file } : {}),
         });
         return data ?? [];
@@ -523,7 +532,7 @@ export class Program {
     async getSuggestionDiagnostics(file) {
         const data = await this.client.apiRequest("getSuggestionDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             ...(file !== undefined ? { file } : {}),
         });
         return data ?? [];
@@ -535,7 +544,7 @@ export class Program {
     async getDeclarationDiagnostics(file) {
         const data = await this.client.apiRequest("getDeclarationDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             ...(file !== undefined ? { file } : {}),
         });
         return data ?? [];
@@ -546,7 +555,7 @@ export class Program {
     async getProgramDiagnostics() {
         const data = await this.client.apiRequest("getProgramDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
         return data ?? [];
     }
@@ -556,7 +565,7 @@ export class Program {
     async getGlobalDiagnostics() {
         const data = await this.client.apiRequest("getGlobalDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
         return data ?? [];
     }
@@ -566,20 +575,20 @@ export class Program {
     async getConfigFileParsingDiagnostics() {
         const data = await this.client.apiRequest("getConfigFileParsingDiagnostics", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
         return data ?? [];
     }
 }
 export class Checker {
     snapshotId;
-    projectId;
+    project;
     client;
     objectRegistry;
     wellKnownSymbols;
-    constructor(snapshotId, projectId, client, objectRegistry) {
+    constructor(snapshotId, project, client, objectRegistry) {
         this.snapshotId = snapshotId;
-        this.projectId = projectId;
+        this.project = project;
         this.client = client;
         this.objectRegistry = objectRegistry;
     }
@@ -590,14 +599,14 @@ export class Checker {
         if (Array.isArray(nodeOrNodes)) {
             const data = await this.client.apiRequest("getSymbolsAtLocations", {
                 snapshot: this.snapshotId,
-                project: this.projectId,
+                project: this.project.id,
                 locations: nodeOrNodes.map(node => getNodeId(node)),
             });
             return data.map(d => d ? this.objectRegistry.getOrCreateSymbol(d) : undefined);
         }
         const data = await this.client.apiRequest("getSymbolAtLocation", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(nodeOrNodes),
         });
         return data ? this.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -606,7 +615,7 @@ export class Checker {
         if (typeof positionOrPositions === "number") {
             const data = await this.client.apiRequest("getSymbolAtPosition", {
                 snapshot: this.snapshotId,
-                project: this.projectId,
+                project: this.project.id,
                 file,
                 position: positionOrPositions,
             });
@@ -614,7 +623,7 @@ export class Checker {
         }
         const data = await this.client.apiRequest("getSymbolsAtPositions", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file,
             positions: positionOrPositions,
         });
@@ -624,14 +633,14 @@ export class Checker {
         if (Array.isArray(symbolOrSymbols)) {
             const data = await this.client.apiRequest("getTypesOfSymbols", {
                 snapshot: this.snapshotId,
-                project: this.projectId,
+                project: this.project.id,
                 symbols: symbolOrSymbols.map(s => s.id),
             });
             return data.map(d => d ? this.objectRegistry.getOrCreateType(d) : undefined);
         }
         const data = await this.client.apiRequest("getTypeOfSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbolOrSymbols.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -644,7 +653,7 @@ export class Checker {
     async getDeclaredTypeOfSymbol(symbol) {
         const data = await this.client.apiRequest("getDeclaredTypeOfSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
         if (!data)
@@ -654,40 +663,40 @@ export class Checker {
     async getReferencesToSymbolInFile(file, symbol) {
         const data = await this.client.apiRequest("getReferencesToSymbolInFile", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file,
             symbol: symbol.id,
         });
-        return (data ?? []).map(h => new NodeHandle(h));
+        return (data ?? []).map(h => new NodeHandle(h, this.project));
     }
     async getReferencedSymbolsForNode(node, position) {
         const data = await this.client.apiRequest("getReferencedSymbolsForNode", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             node: getNodeId(node),
             position,
         });
         return (data ?? []).map(entry => ({
-            definition: new NodeHandle(entry.definition),
+            definition: new NodeHandle(entry.definition, this.project),
             symbol: entry.symbol ? this.objectRegistry.getOrCreateSymbol(entry.symbol) : undefined,
-            references: (entry.references ?? []).map(h => new NodeHandle(h)),
+            references: (entry.references ?? []).map(h => new NodeHandle(h, this.project)),
         }));
     }
     async getSignatureUsage(signatureDecl) {
         const data = await this.client.apiRequest("getSignatureUsages", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signatureDecl: getNodeId(signatureDecl),
         });
         return (data ?? []).map(entry => ({
-            name: new NodeHandle(entry.name),
-            call: entry.call ? new NodeHandle(entry.call) : undefined,
+            name: new NodeHandle(entry.name, this.project),
+            call: entry.call ? new NodeHandle(entry.call, this.project) : undefined,
         }));
     }
     async getCompletionsAtPosition(document, position, options) {
         const data = await this.client.apiRequest("getCompletionsAtPosition", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file: document,
             position,
             triggerCharacter: options?.triggerCharacter,
@@ -707,14 +716,14 @@ export class Checker {
         if (Array.isArray(nodeOrNodes)) {
             const data = await this.client.apiRequest("getTypeAtLocations", {
                 snapshot: this.snapshotId,
-                project: this.projectId,
+                project: this.project.id,
                 locations: nodeOrNodes.map(node => getNodeId(node)),
             });
             return data.map(d => d ? this.objectRegistry.getOrCreateType(d) : undefined);
         }
         const data = await this.client.apiRequest("getTypeAtLocation", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(nodeOrNodes),
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -722,7 +731,7 @@ export class Checker {
     async getSignaturesOfType(type, kind) {
         const data = await this.client.apiRequest("getSignaturesOfType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
             kind,
         });
@@ -731,7 +740,7 @@ export class Checker {
     async getResolvedSignature(node) {
         const data = await this.client.apiRequest("getResolvedSignature", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateSignature(data) : undefined;
@@ -740,7 +749,7 @@ export class Checker {
         if (typeof positionOrPositions === "number") {
             const data = await this.client.apiRequest("getTypeAtPosition", {
                 snapshot: this.snapshotId,
-                project: this.projectId,
+                project: this.project.id,
                 file,
                 position: positionOrPositions,
             });
@@ -748,7 +757,7 @@ export class Checker {
         }
         const data = await this.client.apiRequest("getTypesAtPositions", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             file,
             positions: positionOrPositions,
         });
@@ -759,7 +768,7 @@ export class Checker {
         const isNode = location && "kind" in location;
         const data = await this.client.apiRequest("resolveName", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             name,
             meaning,
             location: isNode ? getNodeId(location) : undefined,
@@ -778,7 +787,7 @@ export class Checker {
     async getContextualType(node) {
         const data = await this.client.apiRequest("getContextualType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -786,7 +795,7 @@ export class Checker {
     async getBaseTypeOfLiteralType(type) {
         const data = await this.client.apiRequest("getBaseTypeOfLiteralType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -794,7 +803,7 @@ export class Checker {
     async getNonNullableType(type) {
         const data = await this.client.apiRequest("getNonNullableType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -802,7 +811,7 @@ export class Checker {
     async getTypeFromTypeNode(node) {
         const data = await this.client.apiRequest("getTypeFromTypeNode", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -810,7 +819,7 @@ export class Checker {
     async getWidenedType(type) {
         const data = await this.client.apiRequest("getWidenedType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -818,7 +827,7 @@ export class Checker {
     async getParameterType(signature, index) {
         const data = await this.client.apiRequest("getParameterType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signature: signature.id,
             index,
         });
@@ -827,14 +836,14 @@ export class Checker {
     async isArrayLikeType(type) {
         return this.client.apiRequest("isArrayLikeType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
     }
     async isTypeAssignableTo(source, target) {
         return this.client.apiRequest("isTypeAssignableTo", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             source: source.id,
             target: target.id,
         });
@@ -842,7 +851,7 @@ export class Checker {
     async getShorthandAssignmentValueSymbol(node) {
         const data = await this.client.apiRequest("getShorthandAssignmentValueSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -855,7 +864,7 @@ export class Checker {
     async getTypeOfSymbolAtLocation(symbol, location) {
         const data = await this.client.apiRequest("getTypeOfSymbolAtLocation", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
             location: getNodeId(location),
         });
@@ -866,7 +875,7 @@ export class Checker {
     async getIntrinsicType(method) {
         const data = await this.client.apiRequest(method, {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
         return this.objectRegistry.getOrCreateType(data);
     }
@@ -906,7 +915,7 @@ export class Checker {
     async typeToTypeNode(type, enclosingDeclaration, flags) {
         const binaryData = await this.client.apiRequestBinary("typeToTypeNode", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
             location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
             flags,
@@ -918,7 +927,7 @@ export class Checker {
     async signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags) {
         const binaryData = await this.client.apiRequestBinary("signatureToSignatureDeclaration", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signature: signature.id,
             kind,
             location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
@@ -931,7 +940,7 @@ export class Checker {
     async typeToString(type, enclosingDeclaration, flags) {
         return this.client.apiRequest("typeToString", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
             location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
             flags,
@@ -940,28 +949,28 @@ export class Checker {
     async isContextSensitive(node) {
         return this.client.apiRequest("isContextSensitive", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
     }
     async isArrayType(type) {
         return this.client.apiRequest("isArrayType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
     }
     async isTupleType(type) {
         return this.client.apiRequest("isTupleType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
     }
     async getReturnTypeOfSignature(signature) {
         const data = await this.client.apiRequest("getReturnTypeOfSignature", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signature: signature.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -969,7 +978,7 @@ export class Checker {
     async getRestTypeOfSignature(signature) {
         const data = await this.client.apiRequest("getRestTypeOfSignature", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signature: signature.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -977,7 +986,7 @@ export class Checker {
     async getTypePredicateOfSignature(signature) {
         const data = await this.client.apiRequest("getTypePredicateOfSignature", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             signature: signature.id,
         });
         if (!data)
@@ -996,7 +1005,7 @@ export class Checker {
     async getBaseTypes(type) {
         const data = await this.client.apiRequest("getBaseTypes", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? data.map(d => this.objectRegistry.getOrCreateType(d)) : [];
@@ -1004,7 +1013,7 @@ export class Checker {
     async getApparentType(type) {
         const data = await this.client.apiRequest("getApparentType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -1012,7 +1021,7 @@ export class Checker {
     async getPropertiesOfType(type) {
         const data = await this.client.apiRequest("getPropertiesOfType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? data.map(d => this.objectRegistry.getOrCreateSymbol(d)) : [];
@@ -1020,7 +1029,7 @@ export class Checker {
     async getIndexInfosOfType(type) {
         const data = await this.client.apiRequest("getIndexInfosOfType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         if (!data)
@@ -1029,7 +1038,7 @@ export class Checker {
             keyType: this.objectRegistry.getOrCreateType(d.keyType),
             valueType: this.objectRegistry.getOrCreateType(d.valueType),
             isReadonly: d.isReadonly ?? false,
-            declaration: d.declaration ? new NodeHandle(d.declaration) : undefined,
+            declaration: d.declaration ? new NodeHandle(d.declaration, this.project) : undefined,
         }));
     }
     /**
@@ -1039,7 +1048,7 @@ export class Checker {
     async getConstraintOfTypeParameter(type) {
         const data = await this.client.apiRequest("getConstraintOfTypeParameter", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -1047,7 +1056,7 @@ export class Checker {
     async getBaseConstraintOfType(type) {
         const data = await this.client.apiRequest("getBaseConstraintOfType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? this.objectRegistry.getOrCreateType(data) : undefined;
@@ -1055,7 +1064,7 @@ export class Checker {
     async getPropertyOfType(type, name) {
         const data = await this.client.apiRequest("getPropertyOfType", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
             name,
         });
@@ -1064,7 +1073,7 @@ export class Checker {
     async getConstantValue(node) {
         const data = await this.client.apiRequest("getConstantValue", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ?? undefined;
@@ -1072,7 +1081,7 @@ export class Checker {
     async getSignatureFromDeclaration(node) {
         const data = await this.client.apiRequest("getSignatureFromDeclaration", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateSignature(data) : undefined;
@@ -1080,7 +1089,7 @@ export class Checker {
     async getExportSpecifierLocalTargetSymbol(node) {
         const data = await this.client.apiRequest("getExportSpecifierLocalTargetSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             location: getNodeId(node),
         });
         return data ? this.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -1093,7 +1102,7 @@ export class Checker {
     async getAliasedSymbol(symbol) {
         const data = await this.client.apiRequest("getAliasedSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
         if (!data)
@@ -1103,7 +1112,7 @@ export class Checker {
     async getImmediateAliasedSymbol(symbol) {
         const data = await this.client.apiRequest("getImmediateAliasedSymbol", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
         return data ? this.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -1117,7 +1126,7 @@ export class Checker {
     getWellKnownSymbols() {
         return this.wellKnownSymbols ??= this.client.apiRequest("getWellKnownSymbols", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
         });
     }
     /**
@@ -1142,7 +1151,7 @@ export class Checker {
     async getExportsOfModule(symbol) {
         const data = await this.client.apiRequest("getExportsOfModule", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
         return data ? data.map(d => this.objectRegistry.getOrCreateSymbol(d)) : [];
@@ -1150,7 +1159,7 @@ export class Checker {
     async getMemberInModuleExports(symbol, name) {
         const data = await this.client.apiRequest("getMemberInModuleExports", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
             name,
         });
@@ -1159,7 +1168,7 @@ export class Checker {
     async getJsDocTagsOfSymbol(symbol) {
         const data = await this.client.apiRequest("getJsDocTags", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
         return data ?? [];
@@ -1167,7 +1176,7 @@ export class Checker {
     async getDocumentationCommentOfSymbol(symbol) {
         return this.client.apiRequest("getDocumentationComment", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             symbol: symbol.id,
         });
     }
@@ -1177,7 +1186,7 @@ export class Checker {
     async getTypeArguments(type) {
         const data = await this.client.apiRequest("getTypeArguments", {
             snapshot: this.snapshotId,
-            project: this.projectId,
+            project: this.project.id,
             type: type.id,
         });
         return data ? data.map(d => this.objectRegistry.getOrCreateType(d)) : [];
@@ -1198,20 +1207,28 @@ export class Emitter {
     }
 }
 export class NodeHandle {
+    /**
+     * The project this handle was produced in, used as the default for {@link resolve}.
+     * Node handles are only meaningful within a project's program, so the producing project
+     * is remembered so callers don't have to pass it explicitly.
+     */
+    canonicalProject;
     index;
     kind;
     path;
-    constructor(handle) {
+    constructor(handle, canonicalProject) {
         const parsed = parseNodeHandle(handle);
         this.index = parsed.index;
         this.kind = parsed.kind;
         this.path = parsed.path;
+        this.canonicalProject = canonicalProject;
     }
     /**
-     * Resolve this handle to the actual AST node by fetching the source file
-     * from the given project and looking up the node by index.
+     * Resolve this handle to the actual AST node by fetching the source file from a project
+     * and looking up the node by index. If no project is passed, the project that produced
+     * the handle is used.
      */
-    async resolve(project) {
+    async resolve(project = this.canonicalProject) {
         const sourceFile = await project.program.getSourceFile(this.path);
         if (!sourceFile) {
             return undefined;
@@ -1221,6 +1238,12 @@ export class NodeHandle {
 }
 export class Symbol {
     objectRegistry;
+    /**
+     * The project this symbol was first observed in, used as the default project for
+     * lookups that need a project context (members/exports/parent). Symbols are shared
+     * snapshot-wide, so these lookups can otherwise be ambiguous about which project to use.
+     */
+    canonicalProject;
     id;
     /** The escaped (`__String`) name, used as the key in member/export tables. */
     escapedName;
@@ -1241,15 +1264,20 @@ export class Symbol {
         this.name = unescapeLeadingUnderscores(data.name);
         this.flags = data.flags;
         this.checkFlags = data.checkFlags;
-        this.declarations = (data.declarations ?? []).map(d => new NodeHandle(d));
-        this.valueDeclaration = data.valueDeclaration ? new NodeHandle(data.valueDeclaration) : undefined;
+        const canonicalProject = objectRegistry.getProject(data.project);
+        if (!canonicalProject) {
+            throw new Error(`Symbol ${data.id} references unknown canonical project '${data.project}'`);
+        }
+        this.canonicalProject = canonicalProject;
+        this.declarations = (data.declarations ?? []).map(d => new NodeHandle(d, canonicalProject));
+        this.valueDeclaration = data.valueDeclaration ? new NodeHandle(data.valueDeclaration, canonicalProject) : undefined;
         if (data.parent !== undefined)
             this.parent = data.parent;
         if (data.exportSymbol !== undefined)
             this.exportSymbol = data.exportSymbol;
     }
     async getParent() {
-        return this.objectRegistry.fetchSymbol(this, "getParentOfSymbol", this.parent);
+        return this.objectRegistry.fetchSymbol(this, "getParentOfSymbol", this.parent, this.canonicalProject.id);
     }
     /**
      * Get this symbol's members keyed by escaped name. The result is cached on
@@ -1266,7 +1294,7 @@ export class Symbol {
         return this.exportsCache ??= this.fetchSymbolTable("getExportsOfSymbol");
     }
     async fetchSymbolTable(method) {
-        const symbols = await this.objectRegistry.fetchSymbols(this, method);
+        const symbols = await this.objectRegistry.fetchSymbols(this, method, undefined, this.canonicalProject.id);
         const table = new Map();
         for (const symbol of symbols) {
             table.set(symbol.escapedName, symbol);
@@ -1276,7 +1304,7 @@ export class Symbol {
     async getExportSymbol() {
         if (!this.exportSymbol)
             return this;
-        return this.objectRegistry.fetchSymbol(this, "getExportSymbolOfSymbol", this.exportSymbol);
+        return this.objectRegistry.fetchSymbol(this, "getExportSymbolOfSymbol", this.exportSymbol, this.canonicalProject.id);
     }
     async getJsDocTags(checker) {
         return checker.getJsDocTagsOfSymbol(this);
@@ -1576,11 +1604,11 @@ export class Signature {
     parameters;
     thisParameter;
     target;
-    constructor(data, objectRegistry) {
+    constructor(data, project, objectRegistry) {
         this.id = data.id;
         this.flags = data.flags;
         this.objectRegistry = objectRegistry;
-        this.declaration = data.declaration ? new NodeHandle(data.declaration) : undefined;
+        this.declaration = data.declaration ? new NodeHandle(data.declaration, project) : undefined;
         this.typeParameters = data.typeParameters ?? [];
         this.parameters = data.parameters ?? [];
         this.thisParameter = data.thisParameter;