typescript 7.1.0-dev.20261002.1 → 7.1.0-dev.20261004.1

package/dist/api/sync/api.js

@@ -22,9 +22,10 @@ import { TypePredicateKind } from "#enums/typePredicateKind";
 import { ModifierFlags, unescapeLeadingUnderscores, } from "../../ast/index.js";
 import { assertNever } from "../../internal/utils.js";
 import { encodeNode, uint8ArrayToBase64, } from "../node/encoder.js";
-import { decodeNode, getNodeId, parseNodeHandle, readSourceFileLease, RemoteNode, RemoteSourceFile, } from "../node/node.js";
+import { decodeNode, getNodeId, parseNodeHandleFromCompiler, readParseOptionsKey, readSourceFileHash, readSourceFileLease, RemoteNode, RemoteSourceFile, } from "../node/node.js";
 import { Wtf8Decoder } from "../node/wtf8.js";
-import { createGetCanonicalFileName, toPath, } from "../path.js";
+import { canonicalize, CaseSensitivity, pathKey, toRootedDirectoryPath, toRootedPath, } from "../path.js";
+import { prepareCompilerOptions } from "../prepareCompilerOptions.generated.js";
 import { resolveFileName, toCreateSnapshotRequest, validateSymbolResponse, } from "../proto.js";
 import { SourceFileCache, } from "../sourceFileCache.js";
 import { Client, } from "./client.js";
@@ -56,9 +57,9 @@ export class API {
     /** @internal */
     sourceFileCache;
     toPath;
-    currentDirectory;
     decoder = new Wtf8Decoder();
-    getCanonicalFileNameWorker;
+    currentDirectory;
+    caseSensitivity;
     initialized = false;
     initializing;
     activeSnapshots = new Map();
@@ -84,7 +85,7 @@ export class API {
             const record = file.symbolCache;
             if (!record)
                 throw new Error(`Cached source file not found for declaration`);
-            const index = parseNodeHandle(getNodeId(declaration)).index;
+            const index = parseNodeHandleFromCompiler(getNodeId(declaration)).index;
             const cached = record.symbolsByDeclarationNodeIndex.get(index);
             if (cached)
                 return cached;
@@ -96,7 +97,7 @@ export class API {
             const record = file.symbolCache;
             if (!record)
                 throw new Error(`Cached source file not found for declaration`);
-            const index = parseNodeHandle(getNodeId(declaration)).index;
+            const index = parseNodeHandleFromCompiler(getNodeId(declaration)).index;
             const cached = record.symbolsByDeclarationNodeIndex.get(index);
             if (cached)
                 return cached;
@@ -171,11 +172,9 @@ export class API {
         return cacheGeneratorMethod(owner, "initializeWorker", function () {
             try {
                 const response = owner.client.apiRequest("initialize", null);
-                const getCanonicalFileName = createGetCanonicalFileName(response.useCaseSensitiveFileNames);
-                const currentDirectory = response.currentDirectory;
-                owner.getCanonicalFileNameWorker = getCanonicalFileName;
-                owner.currentDirectory = currentDirectory;
-                owner.toPath = (fileName, basePath = currentDirectory) => toPath(fileName, basePath, getCanonicalFileName);
+                owner.currentDirectory = response.currentDirectory;
+                owner.caseSensitivity = response.caseSensitivity;
+                owner.toPath = (fileName, basePath = response.currentDirectory) => pathKey(toRootedPath(fileName, toRootedDirectoryPath(basePath, response.currentDirectory)), response.caseSensitivity);
                 owner.initialized = true;
             }
             catch (error) {
@@ -185,11 +184,9 @@ export class API {
         }, function* () {
             try {
                 const response = yield* apiRequest("initialize", null);
-                const getCanonicalFileName = createGetCanonicalFileName(response.useCaseSensitiveFileNames);
-                const currentDirectory = response.currentDirectory;
-                owner.getCanonicalFileNameWorker = getCanonicalFileName;
-                owner.currentDirectory = currentDirectory;
-                owner.toPath = (fileName, basePath = currentDirectory) => toPath(fileName, basePath, getCanonicalFileName);
+                owner.currentDirectory = response.currentDirectory;
+                owner.caseSensitivity = response.caseSensitivity;
+                owner.toPath = (fileName, basePath = response.currentDirectory) => pathKey(toRootedPath(fileName, toRootedDirectoryPath(basePath, response.currentDirectory)), response.caseSensitivity);
                 owner.initialized = true;
             }
             catch (error) {
@@ -205,10 +202,13 @@ export class API {
         return this.currentDirectory;
     }
     getCanonicalFileName(fileName) {
-        if (this.getCanonicalFileNameWorker === undefined) {
+        return canonicalize(fileName, this.getCaseSensitivity());
+    }
+    getCaseSensitivity() {
+        if (this.caseSensitivity === undefined) {
             throw new Error("API has not been initialized");
         }
-        return this.getCanonicalFileNameWorker(fileName);
+        return this.caseSensitivity;
     }
     getNewLine() {
         return "\n";
@@ -220,6 +220,9 @@ export class API {
             const orchestratorResponse = owner.client.apiRequest("createBuildOrchestrator", {
                 ...buildOrchestratorOptions,
                 ...buildOrchestratorOptions.overrideCompilerOptions,
+                cwd: buildOrchestratorOptions.cwd === undefined
+                    ? undefined
+                    : toRootedDirectoryPath(buildOrchestratorOptions.cwd, owner.getCurrentDirectory()),
                 rootNames,
             });
             const orchestrator = new BuildOrchestrator(owner.client, orchestratorResponse, () => {
@@ -232,6 +235,9 @@ export class API {
             const orchestratorResponse = yield* apiRequest("createBuildOrchestrator", {
                 ...buildOrchestratorOptions,
                 ...buildOrchestratorOptions.overrideCompilerOptions,
+                cwd: buildOrchestratorOptions.cwd === undefined
+                    ? undefined
+                    : toRootedDirectoryPath(buildOrchestratorOptions.cwd, owner.getCurrentDirectory()),
                 rootNames,
             });
             const orchestrator = new BuildOrchestrator(owner.client, orchestratorResponse, () => {
@@ -494,11 +500,15 @@ export class API {
         const prepareOptions = (options) => {
             if (!options)
                 return undefined;
-            const { moduleResolver, ...rest } = options;
+            const { moduleResolver, projectReferences, ...rest } = options;
             moduleResolver?.ensureNotDisposed();
             return {
                 ...rest,
                 moduleResolver: moduleResolver?.id,
+                projectReferences: projectReferences?.map(reference => ({
+                    ...reference,
+                    path: toRootedPath(reference.path, this.getCurrentDirectory()),
+                })),
             };
         };
         return {
@@ -627,7 +637,7 @@ export class API {
                 : undefined;
             try {
                 const id = owner.client.apiRequest("createModuleResolver", {
-                    compilerOptions,
+                    compilerOptions: prepareCompilerOptions(compilerOptions, owner.getCurrentDirectory()),
                     moduleResolutions: options?.moduleResolutions,
                     resolveModuleNameCallback: callback?.name,
                 });
@@ -644,7 +654,7 @@ export class API {
                 : undefined;
             try {
                 const id = yield* apiRequest("createModuleResolver", {
-                    compilerOptions,
+                    compilerOptions: prepareCompilerOptions(compilerOptions, owner.getCurrentDirectory()),
                     moduleResolutions: options?.moduleResolutions,
                     resolveModuleNameCallback: callback?.name,
                 });
@@ -939,7 +949,8 @@ export class Snapshot {
     }
     getConfiguredProject(configFileName) {
         this.ensureNotDisposed();
-        return this.projectMap.get(this.toPath(configFileName));
+        const id = this.toPath(configFileName);
+        return this.projectMap.get(id);
     }
     getProject(projectId) {
         this.ensureNotDisposed();
@@ -1912,7 +1923,34 @@ export class Program {
         const owner = this;
         return cacheGeneratorMethod(owner, "getSourceFile", function (file) {
             const fileName = resolveFileName(file);
-            const path = owner.toPath(fileName, owner.project.currentDirectory);
+            const path = owner.pathKeyForFileName(fileName);
+            return owner.getSourceFileWorker(file, path);
+        }, function* (file) {
+            const fileName = resolveFileName(file);
+            const path = owner.pathKeyForFileName(fileName);
+            return yield* owner.getSourceFileWorker.gen(file, path);
+        });
+    }
+    /**
+     * Returns the source file for an already-canonical path.
+     *
+     * @internal
+     */
+    get getSourceFileByPath() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getSourceFileByPath", function (path) {
+            // The wire format is a string, but the cache key remains the supplied
+            // PathKey and is never treated as a RootedPath.
+            return owner.getSourceFileWorker(path, path);
+        }, function* (path) {
+            // The wire format is a string, but the cache key remains the supplied
+            // PathKey and is never treated as a RootedPath.
+            return yield* owner.getSourceFileWorker.gen(path, path);
+        });
+    }
+    get getSourceFileWorker() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getSourceFileWorker", function (file, path) {
             // Check if we already have a retained cache entry for this (snapshot, project) pair
             const retained = owner.sourceFileCache.getRetained(path, owner.snapshotId, owner.project.id);
             if (retained) {
@@ -1930,9 +1968,7 @@ export class Program {
             // Create a new RemoteSourceFile and cache it (set returns existing if hash matches)
             const decoded = new RemoteSourceFile(binaryData, owner.decoder, owner.client.getTimingCollector(), owner.project.api);
             return owner.sourceFileCache.set(decoded, owner.snapshotId, owner.project.id);
-        }, function* (file) {
-            const fileName = resolveFileName(file);
-            const path = owner.toPath(fileName, owner.project.currentDirectory);
+        }, function* (file, path) {
             // Check if we already have a retained cache entry for this (snapshot, project) pair
             const retained = owner.sourceFileCache.getRetained(path, owner.snapshotId, owner.project.id);
             if (retained) {
@@ -2098,9 +2134,9 @@ export class Program {
     get getSourceFileMetadata() {
         const owner = this;
         return cacheGeneratorMethod(owner, "getSourceFileMetadata", function (file) {
-            return owner.getSourceFileMetadataByPath(owner.toPath(resolveFileName(file), owner.project.currentDirectory));
+            return owner.getSourceFileMetadataByPath(owner.pathKeyForFileName(resolveFileName(file)));
         }, function* (file) {
-            return yield* owner.getSourceFileMetadataByPath.gen(owner.toPath(resolveFileName(file), owner.project.currentDirectory));
+            return yield* owner.getSourceFileMetadataByPath.gen(owner.pathKeyForFileName(resolveFileName(file)));
         });
     }
     /**
@@ -2130,6 +2166,8 @@ export class Program {
     get fetchSourceFileMetadata() {
         const owner = this;
         return cacheGeneratorMethod(owner, "fetchSourceFileMetadata", function (path) {
+            // PathKey is serialized as a string; the server deliberately treats all
+            // client-provided path text as untrusted input.
             const data = owner.client.apiRequest("getSourceFileMetadata", {
                 snapshot: owner.snapshotId,
                 project: owner.project.id,
@@ -2137,6 +2175,8 @@ export class Program {
             });
             return data ?? undefined;
         }, function* (path) {
+            // PathKey is serialized as a string; the server deliberately treats all
+            // client-provided path text as untrusted input.
             const data = yield* apiRequest("getSourceFileMetadata", {
                 snapshot: owner.snapshotId,
                 project: owner.project.id,
@@ -2145,6 +2185,9 @@ export class Program {
             return data ?? undefined;
         });
     }
+    pathKeyForFileName(fileName) {
+        return this.toPath(fileName, this.project.currentDirectory);
+    }
     /**
      * Returns whether the given source file was loaded as part of an external library
      * (e.g. a dependency resolved from `node_modules`). The underlying program metadata is
@@ -2691,6 +2734,87 @@ export class Checker {
     dispose() {
         this.objectRegistry.clear();
     }
+    /** Get the merged symbol, or the original symbol if it has not been merged. */
+    get getMergedSymbol() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getMergedSymbol", function (symbol) {
+            const data = owner.client.apiRequest("getMergedSymbol", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                symbol: symbol.reference,
+            });
+            return owner.objectRegistry.getOrCreateSymbol(data);
+        }, function* (symbol) {
+            const data = yield* apiRequest("getMergedSymbol", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                symbol: symbol.reference,
+            });
+            return owner.objectRegistry.getOrCreateSymbol(data);
+        });
+    }
+    /**
+     * Get a node's merged symbol. For a declaration, prefer
+     * {@link Checker.getSymbolOfDeclaration} for a non-nullable result.
+     */
+    get getSymbolOfNode() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getSymbolOfNode", function (node) {
+            const data = owner.client.apiRequest("getSymbolOfNode", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                location: getNodeId(node),
+            });
+            return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
+        }, function* (node) {
+            const data = yield* apiRequest("getSymbolOfNode", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                location: getNodeId(node),
+            });
+            return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
+        });
+    }
+    /** Get a declaration's merged symbol. */
+    get getSymbolOfDeclaration() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getSymbolOfDeclaration", function (node) {
+            const data = owner.client.apiRequest("getSymbolOfDeclarationForChecker", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                location: getNodeId(node),
+            });
+            // Declarations normally have symbols, but preserve unexpected null results at runtime.
+            return (data && owner.objectRegistry.getOrCreateSymbol(data));
+        }, function* (node) {
+            const data = yield* apiRequest("getSymbolOfDeclarationForChecker", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                location: getNodeId(node),
+            });
+            // Declarations normally have symbols, but preserve unexpected null results at runtime.
+            return (data && owner.objectRegistry.getOrCreateSymbol(data));
+        });
+    }
+    /** Get a symbol's merged parent, if any. */
+    get getParentOfSymbol() {
+        const owner = this;
+        return cacheGeneratorMethod(owner, "getParentOfSymbol", function (symbol) {
+            const data = owner.client.apiRequest("getParentOfSymbolForChecker", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                symbol: symbol.reference,
+            });
+            return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
+        }, function* (symbol) {
+            const data = yield* apiRequest("getParentOfSymbolForChecker", {
+                snapshot: owner.snapshotId,
+                project: owner.project.id,
+                symbol: symbol.reference,
+            });
+            return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
+        });
+    }
     get getSymbolAtLocation() {
         const owner = this;
         function getSymbolAtLocation(nodeOrNodes) {
@@ -4327,7 +4451,7 @@ export class NodeHandle {
     kind;
     path;
     constructor(handle, canonicalProject, fileOwner) {
-        const parsed = parseNodeHandle(handle);
+        const parsed = parseNodeHandleFromCompiler(handle);
         this.index = parsed.index;
         this.kind = parsed.kind;
         this.path = parsed.path;
@@ -4349,7 +4473,7 @@ export class NodeHandle {
             }
             if (!project)
                 throw new Error(`Node handle for '${owner.path}' has no project context`);
-            const sourceFile = project.program.getSourceFile(owner.path);
+            const sourceFile = project.program.getSourceFileByPath(owner.path);
             if (!sourceFile) {
                 return undefined;
             }
@@ -4361,7 +4485,7 @@ export class NodeHandle {
             }
             if (!project)
                 throw new Error(`Node handle for '${owner.path}' has no project context`);
-            const sourceFile = yield* project.program.getSourceFile.gen(owner.path);
+            const sourceFile = yield* project.program.getSourceFileByPath.gen(owner.path);
             if (!sourceFile) {
                 return undefined;
             }