Merge branch 'microsoft:main' into main

eslint.config.mjs

@@ -118,6 +118,7 @@ export default tseslint.config(
             "@typescript-eslint/ban-ts-comment": "off",
             "@typescript-eslint/class-literal-property-style": "off",
             "@typescript-eslint/consistent-indexed-object-style": "off",
+            "@typescript-eslint/consistent-generic-constructors": "off",
             "@typescript-eslint/no-duplicate-enum-values": "off",
             "@typescript-eslint/no-empty-function": "off",
             "@typescript-eslint/no-namespace": "off",

scripts/processDiagnosticMessages.mjs

@@ -92,6 +92,7 @@ function buildInfoFileOutput(messageTable, inputFilePathRel) {
         "    return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated };",
         "}",
         "",
+        "/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion*/", // type assertions are needed for isolatedDeclarations
         "/** @internal */",
         "export const Diagnostics = {",
     ];
@@ -101,7 +102,7 @@ function buildInfoFileOutput(messageTable, inputFilePathRel) {
         const argElidedInCompatabilityPyramid = elidedInCompatabilityPyramid ? `${!reportsUnnecessary ? ", /*reportsUnnecessary*/ undefined" : ""}, /*elidedInCompatabilityPyramid*/ ${elidedInCompatabilityPyramid}` : "";
         const argReportsDeprecated = reportsDeprecated ? `${!argElidedInCompatabilityPyramid ? ", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined" : ""}, /*reportsDeprecated*/ ${reportsDeprecated}` : "";
 
-        result.push(`    ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}${argReportsDeprecated}),`);
+        result.push(`    ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}${argReportsDeprecated}) as DiagnosticMessage,`);
     });
 
     result.push("};");

src/compiler/binder.ts

@@ -509,7 +509,7 @@ export function createFlowNode(flags: FlowFlags, node: unknown, antecedent: Flow
 const binder = /* @__PURE__ */ createBinder();
 
 /** @internal */
-export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
+export function bindSourceFile(file: SourceFile, options: CompilerOptions): void {
     performance.mark("beforeBind");
     binder(file, options);
     performance.mark("afterBind");

src/compiler/builder.ts

@@ -8,6 +8,7 @@ import {
     BuilderProgramHost,
     BuilderState,
     BuildInfo,
+    BuildInfoFileVersionMap,
     CancellationToken,
     CommandLineOption,
     compareStringsCaseSensitive,
@@ -277,7 +278,7 @@ function toBuilderProgramStateWithDefinedProgram(state: ReusableBuilderProgramSt
  *
  * @internal
  */
-export function getBuilderFileEmit(options: CompilerOptions) {
+export function getBuilderFileEmit(options: CompilerOptions): BuilderFileEmit {
     let result = BuilderFileEmit.Js;
     if (options.sourceMap) result = result | BuilderFileEmit.JsMap;
     if (options.inlineSourceMap) result = result | BuilderFileEmit.JsInlineMap;
@@ -733,7 +734,7 @@ export function getPendingEmitKindWithSeen(
     seenOldOptionsOrEmitKind: CompilerOptions | BuilderFileEmit | undefined,
     emitOnlyDtsFiles: boolean | undefined,
     isForDtsErrors: boolean,
-) {
+): BuilderFileEmit {
     let pendingKind = getPendingEmitKind(optionsOrEmitKind, seenOldOptionsOrEmitKind);
     if (emitOnlyDtsFiles) pendingKind = pendingKind & BuilderFileEmit.AllDts;
     if (isForDtsErrors) pendingKind = pendingKind & BuilderFileEmit.DtsErrors;
@@ -1623,7 +1624,7 @@ export function computeSignatureWithDiagnostics(
     text: string,
     host: HostForComputeHash,
     data: WriteFileCallbackData | undefined,
-) {
+): string {
     text = getTextHandlingSourceMapForSignature(text, data);
     let sourceFileDirectory: string | undefined;
     if (data?.diagnostics?.length) {
@@ -2395,7 +2396,7 @@ export function getBuildInfoFileVersionMap(
     program: IncrementalBuildInfo,
     buildInfoPath: string,
     host: Pick<ReadBuildProgramHost, "useCaseSensitiveFileNames" | "getCurrentDirectory">,
-) {
+): BuildInfoFileVersionMap {
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
     const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
     const fileInfos = new Map<Path, string>();
@@ -2440,7 +2441,7 @@ export function getNonIncrementalBuildInfoRoots(
     buildInfo: BuildInfo,
     buildInfoPath: string,
     host: Pick<ReadBuildProgramHost, "useCaseSensitiveFileNames" | "getCurrentDirectory">,
-) {
+): Path[] | undefined {
     if (!isNonIncrementalBuildInfo(buildInfo)) return undefined;
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
     const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());

src/compiler/builderState.ts

@@ -292,11 +292,11 @@ export namespace BuilderState {
     /**
      * Returns true if oldState is reusable, that is the emitKind = module/non module has not changed
      */
-    export function canReuseOldState(newReferencedMap: ReadonlyManyToManyPathMap | undefined, oldState: BuilderState | undefined) {
+    export function canReuseOldState(newReferencedMap: ReadonlyManyToManyPathMap | undefined, oldState: BuilderState | undefined): boolean | undefined {
         return oldState && !oldState.referencedMap === !newReferencedMap;
     }
 
-    export function createReferencedMap(options: CompilerOptions) {
+    export function createReferencedMap(options: CompilerOptions): ManyToManyPathMap | undefined {
         return options.module !== ModuleKind.None && !options.outFile ?
             createManyToManyPathMap() :
             undefined;
@@ -346,7 +346,7 @@ export namespace BuilderState {
     /**
      * Releases needed properties
      */
-    export function releaseCache(state: BuilderState) {
+    export function releaseCache(state: BuilderState): void {
         state.allFilesExcludingDefaultLibraryFile = undefined;
         state.allFileNames = undefined;
     }
@@ -391,7 +391,7 @@ export namespace BuilderState {
         return (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, cancellationToken, host);
     }
 
-    export function updateSignatureOfFile(state: BuilderState, signature: string | undefined, path: Path) {
+    export function updateSignatureOfFile(state: BuilderState, signature: string | undefined, path: Path): void {
         state.fileInfos.get(path)!.signature = signature;
         (state.hasCalledUpdateShapeSignature ||= new Set()).add(path);
     }
@@ -402,7 +402,7 @@ export namespace BuilderState {
         cancellationToken: CancellationToken | undefined,
         host: HostForComputeHash,
         onNewSignature: (signature: string, sourceFiles: readonly SourceFile[]) => void,
-    ) {
+    ): void {
         programOfThisState.emit(
             sourceFile,
             (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
@@ -434,8 +434,8 @@ export namespace BuilderState {
         sourceFile: SourceFile,
         cancellationToken: CancellationToken | undefined,
         host: HostForComputeHash,
-        useFileVersionAsSignature = state.useFileVersionAsSignature,
-    ) {
+        useFileVersionAsSignature: boolean | undefined = state.useFileVersionAsSignature,
+    ): boolean {
         // If we have cached the result for this file, that means hence forth we should assume file shape is uptodate
         if (state.hasCalledUpdateShapeSignature?.has(sourceFile.resolvedPath)) return false;
 
@@ -507,7 +507,7 @@ export namespace BuilderState {
     /**
      * Gets the files referenced by the the file path
      */
-    export function getReferencedByPaths(state: Readonly<BuilderState>, referencedFilePath: Path) {
+    export function getReferencedByPaths(state: Readonly<BuilderState>, referencedFilePath: Path): Path[] {
         const keys = state.referencedMap!.getKeys(referencedFilePath);
         return keys ? arrayFrom(keys.keys()) : [];
     }