Refactor

src/compiler/builder.ts

@@ -883,39 +883,28 @@ namespace ts {
     }
     /** If key and value are same, just use ProgramBuildInfoFileId otherwise pair of key followed by value */
     export type PersistedProgramFileByNameEntry = ProgramBuildInfoFileId | [fileId: ProgramBuildInfoFileId, file: ProgramBuildInfoFileId | typeof missingSourceOfProjectReferenceRedirect | typeof missingFile];
-    export interface ResolvedModuleWithFailedLookupLocations extends ResolutionWithFailedLookupLocations { }
-    export interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations extends ResolutionWithFailedLookupLocations { }
-    export interface PersistedProgramReferencedFile {
-        kind: ReferencedFileKind;
+    export type PersistedProgramReferencedFile = Omit<ReferencedFile, "file"> & {
         file: ProgramBuildInfoFileId;
-        index: number;
-    }
+    };
     export type PersistedProgramFileIncludeReason =
         RootFile |
         LibFile |
         ProjectReferenceFile |
         PersistedProgramReferencedFile |
         AutomaticTypeDirectiveFile;
-    export interface PersistedProgramFilePreprocessingReferencedDiagnostic {
-        kind: FilePreprocessingDiagnosticsKind.FilePreprocessingReferencedDiagnostic;
+    export type PersistedProgramFilePreprocessingReferencedDiagnostic = Omit<FilePreprocessingReferencedDiagnostic, "reason" | "diagnostic"> & {
         reason: PersistedProgramReferencedFile;
         diagnostic: keyof typeof Diagnostics;
-        args?: (string | number | undefined)[];
-    }
-    export interface PersistedProgramFilePreprocessingFileExplainingDiagnostic {
-        kind: FilePreprocessingDiagnosticsKind.FilePreprocessingFileExplainingDiagnostic;
+    };
+    export type PersistedProgramFilePreprocessingFileExplainingDiagnostic = Omit<FilePreprocessingFileExplainingDiagnostic, "file" | "fileProcessingReason" | "diagnostic"> & {
         file?: ProgramBuildInfoFileId;
         fileProcessingReason: PersistedProgramFileIncludeReason;
         diagnostic: keyof typeof Diagnostics;
-        args?: (string | number | undefined)[];
-    }
+    };
     export type PersistedProgramFilePreprocessingDiagnostic = PersistedProgramFilePreprocessingReferencedDiagnostic | PersistedProgramFilePreprocessingFileExplainingDiagnostic;
-    export interface PersistedProgramProjectReference {
+    export type PersistedProgramProjectReference = Omit<ProjectReference, "path"> & {
         path: ProgramBuildInfoAbsoluteFileId;
-        originalPath?: string;
-        prepend?: boolean;
-        circular?: boolean;
-    }
+    };
     export interface PersistedProgramResolvedProjectReference {
         commandLine: {
             fileNames: readonly ProgramBuildInfoAbsoluteFileId[] | undefined;

src/testRunner/unittests/tsbuild/helpers.ts

@@ -255,28 +255,17 @@ interface Symbol {
     }
     type ReadablePersistedProgramResolution = ReadablePersistedProgramResolvedModuleWithFailedLookupLocations & ReadablePersistedProgramResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     type ReadablePersistedProgramResolutionEntry = [name: string, resolution: ReadablePersistedProgramResolution];
-    interface ReadablePersistedProgramSourceFile {
+    type ReadablePersistedProgramSourceFile = Omit<PersistedProgramSourceFile, "fileName" | "originalFileName" | "path" | "resolvedPath" | "resolvedModules" | "resolvedTypeReferenceDirectiveNames" | "redirectInfo" | "includeReasons" | "redirectTargets"> & {
         fileName: string;
         originalFileName: string;
         path: string;
         resolvedPath: string;
-        flags: NodeFlags;
-        version: string;
-        typeReferenceDirectives?: readonly string[];
-        libReferenceDirectives?: readonly string[];
-        referencedFiles?: readonly string[];
-        imports?: readonly StringLiteralLikeOfProgramFromBuildInfo[];
-        moduleAugmentations?: readonly ModuleNameOfProgramFromBuildInfo[];
-        ambientModuleNames?: readonly string[];
-        hasNoDefaultLib?: true;
         resolvedModules?: readonly ReadablePersistedProgramResolutionEntry[];
         resolvedTypeReferenceDirectiveNames?: readonly ReadablePersistedProgramResolutionEntry[];
         redirectInfo?: { readonly redirectTarget: { readonly path: string }; };
         includeReasons: readonly ReadablePersistedProgramFileIncludeReason[];
-        isSourceFileFromExternalLibraryPath?: true;
         redirectTargets?: readonly string[];
-        packageName?: string;
-    }
+    };
     enum ReadableFileIncludeKind {
         RootFile = "RootFile",
         SourceFromProjectReference = "SourceFromProjectReference",
@@ -308,19 +297,15 @@ interface Symbol {
         FilePreprocessingReferencedDiagnostic = "FilePreprocessingReferencedDiagnostic",
         FilePreprocessingFileExplainingDiagnostic = "FilePreprocessingFileExplainingDiagnostic"
     }
-    interface ReadablePersistedProgramFilePreprocessingReferencedDiagnostic {
+    type ReadablePersistedProgramFilePreprocessingReferencedDiagnostic = Omit<PersistedProgramFilePreprocessingReferencedDiagnostic, "kind" | "reason"> & {
         kind: ReadableFilePreprocessingDiagnosticsKind.FilePreprocessingReferencedDiagnostic;
         reason: ReadablePersistedProgramReferencedFile;
-        diagnostic: keyof typeof Diagnostics;
-        args?: (string | number | undefined)[];
-    }
-    interface ReadablePersistedProgramFilePreprocessingFileExplainingDiagnostic {
+    };
+    type ReadablePersistedProgramFilePreprocessingFileExplainingDiagnostic = Omit<PersistedProgramFilePreprocessingFileExplainingDiagnostic, "kind" | "file" | "fileProcessingReason"> & {
         kind: ReadableFilePreprocessingDiagnosticsKind.FilePreprocessingFileExplainingDiagnostic;
         file?: string;
         fileProcessingReason: ReadablePersistedProgramFileIncludeReason;
-        diagnostic: keyof typeof Diagnostics;
-        args?: (string | number | undefined)[];
-    }
+    };
     type ReadablePersistedProgramFilePreprocessingDiagnostic = ReadablePersistedProgramFilePreprocessingReferencedDiagnostic | ReadablePersistedProgramFilePreprocessingFileExplainingDiagnostic;
     interface ReadablePersistedProgramResolvedProjectReference {
         commandLine: {