CONVERSION STEP - stripNamespaces

Author: jakebailey

Diff for: src/compiler/binder.ts

@@ -1,6 +1,6 @@
+import * as ts from "./ts";
 
 /* @internal */
-namespace ts {
 export const enum ModuleInstanceState {
     NonInstantiated = 0,
     Instantiated = 1,
@@ -15,6 +15,7 @@ interface ActiveLabel {
     referenced: boolean;
 }
 
+/* @internal */
 export function getModuleInstanceState(node: ts.ModuleDeclaration, visited?: ts.ESMap<number, ModuleInstanceState | undefined>): ModuleInstanceState {
     if (node.body && !node.body.parent) {
         // getModuleInstanceStateForAliasTarget needs to walk up the parent chain, so parent pointers must be set on this tree already
@@ -173,6 +174,7 @@ function initFlowNode<T extends ts.FlowNode>(node: T) {
 
 const binder = createBinder();
 
+/* @internal */
 export function bindSourceFile(file: ts.SourceFile, options: ts.CompilerOptions) {
     ts.performance.mark("beforeBind");
     ts.perfLogger.logStartBindFile("" + file.fileName);
@@ -3502,6 +3504,7 @@ function isPurelyTypeDeclaration(s: ts.Statement): boolean {
     }
 }
 
+/* @internal */
 export function isExportsOrModuleExportsOrAlias(sourceFile: ts.SourceFile, node: ts.Expression): boolean {
     let i = 0;
     const q = [node];
@@ -3536,4 +3539,3 @@ function lookupSymbolForName(container: ts.Node, name: ts.__String): ts.Symbol |
     }
     return container.symbol && container.symbol.exports && container.symbol.exports.get(name);
 }
-}

Diff for: src/compiler/builder.ts

@@ -1,5 +1,6 @@
-/*@internal*/
-namespace ts {
+import * as ts from "./ts";
+
+/* @internal */
 export interface ReusableDiagnostic extends ReusableDiagnosticRelatedInformation {
     /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
     reportsUnnecessary?: {};
@@ -9,6 +10,7 @@ export interface ReusableDiagnostic extends ReusableDiagnosticRelatedInformation
     skippedOn?: keyof ts.CompilerOptions;
 }
 
+/* @internal */
 export interface ReusableDiagnosticRelatedInformation {
     category: ts.DiagnosticCategory;
     code: number;
@@ -18,8 +20,10 @@ export interface ReusableDiagnosticRelatedInformation {
     messageText: string | ReusableDiagnosticMessageChain;
 }
 
+/* @internal */
 export type ReusableDiagnosticMessageChain = ts.DiagnosticMessageChain;
 
+/* @internal */
 export interface ReusableBuilderProgramState extends ts.ReusableBuilderState {
     /**
      * Cache of bind and check diagnostics for files with their Path being the key
@@ -76,11 +80,13 @@ export interface ReusableBuilderProgramState extends ts.ReusableBuilderState {
     hasReusableDiagnostic?: true;
 }
 
+/* @internal */
 export const enum BuilderFileEmit {
     DtsOnly,
     Full
 }
 
+/* @internal */
 /**
  * State to store the changed files, affected files and cache semantic diagnostics
  */
@@ -773,11 +779,17 @@ function getBinderAndCheckerDiagnosticsOfFile(state: BuilderProgramState, source
     return ts.filterSemanticDiagnostics(diagnostics, state.compilerOptions);
 }
 
+/* @internal */
 export type ProgramBuildInfoFileId = number & { __programBuildInfoFileIdBrand: any };
+/* @internal */
 export type ProgramBuildInfoFileIdListId = number & { __programBuildInfoFileIdListIdBrand: any };
+/* @internal */
 export type ProgramBuildInfoDiagnostic = ProgramBuildInfoFileId | [fileId: ProgramBuildInfoFileId, diagnostics: readonly ReusableDiagnostic[]];
+/* @internal */
 export type ProgramBuilderInfoFilePendingEmit = [fileId: ProgramBuildInfoFileId, emitKind: BuilderFileEmit];
+/* @internal */
 export type ProgramBuildInfoReferencedMap = [fileId: ProgramBuildInfoFileId, fileIdListId: ProgramBuildInfoFileIdListId][];
+/* @internal */
 export type ProgramBuildInfoBuilderStateFileInfo = Omit<ts.BuilderState.FileInfo, "signature"> & {
     /**
      * Signature is
@@ -787,10 +799,12 @@ export type ProgramBuildInfoBuilderStateFileInfo = Omit<ts.BuilderState.FileInfo
      */
     signature: string | false | undefined;
 };
+/* @internal */
 /**
  * ProgramBuildInfoFileInfo is string if FileInfo.version === FileInfo.signature && !FileInfo.affectsGlobalScope otherwise encoded FileInfo
  */
 export type ProgramBuildInfoFileInfo = string | ProgramBuildInfoBuilderStateFileInfo;
+/* @internal */
 export interface ProgramBuildInfo {
     fileNames: readonly string[];
     fileInfos: readonly ProgramBuildInfoFileInfo[];
@@ -993,18 +1007,21 @@ function convertToReusableDiagnosticRelatedInformation(diagnostic: ts.Diagnostic
     };
 }
 
+/* @internal */
 export enum BuilderProgramKind {
     SemanticDiagnosticsBuilderProgram,
     EmitAndSemanticDiagnosticsBuilderProgram
 }
 
+/* @internal */
 export interface BuilderCreationParameters {
     newProgram: ts.Program;
     host: ts.BuilderProgramHost;
     oldProgram: ts.BuilderProgram | undefined;
     configFileParsingDiagnostics: readonly ts.Diagnostic[];
 }
 
+/* @internal */
 export function getBuilderCreationParameters(newProgramOrRootNames: ts.Program | readonly string[] | undefined, hostOrOptions: ts.BuilderProgramHost | ts.CompilerOptions | undefined, oldProgramOrHost?: ts.BuilderProgram | ts.CompilerHost, configFileParsingDiagnosticsOrOldProgram?: readonly ts.Diagnostic[] | ts.BuilderProgram, configFileParsingDiagnostics?: readonly ts.Diagnostic[], projectReferences?: readonly ts.ProjectReference[]): BuilderCreationParameters {
     let host: ts.BuilderProgramHost;
     let newProgram: ts.Program;
@@ -1037,8 +1054,11 @@ export function getBuilderCreationParameters(newProgramOrRootNames: ts.Program |
     return { host, newProgram, oldProgram, configFileParsingDiagnostics: configFileParsingDiagnostics || ts.emptyArray };
 }
 
+/* @internal */
 export function createBuilderProgram(kind: BuilderProgramKind.SemanticDiagnosticsBuilderProgram, builderCreationParameters: BuilderCreationParameters): ts.SemanticDiagnosticsBuilderProgram;
+/* @internal */
 export function createBuilderProgram(kind: BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram, builderCreationParameters: BuilderCreationParameters): ts.EmitAndSemanticDiagnosticsBuilderProgram;
+/* @internal */
 export function createBuilderProgram(kind: BuilderProgramKind, { newProgram, host, oldProgram, configFileParsingDiagnostics }: BuilderCreationParameters) {
     // Return same program if underlying program doesnt change
     let oldState = oldProgram && oldProgram.getState();
@@ -1351,6 +1371,7 @@ function addToAffectedFilesPendingEmit(state: BuilderProgramState, affectedFileP
     }
 }
 
+/* @internal */
 export function toBuilderStateFileInfo(fileInfo: ProgramBuildInfoFileInfo): ts.BuilderState.FileInfo {
     return ts.isString(fileInfo) ?
         { version: fileInfo, signature: fileInfo, affectsGlobalScope: undefined, impliedFormat: undefined } :
@@ -1359,6 +1380,7 @@ export function toBuilderStateFileInfo(fileInfo: ProgramBuildInfoFileInfo): ts.B
             { version: fileInfo.version, signature: fileInfo.signature === false ? undefined : fileInfo.version, affectsGlobalScope: fileInfo.affectsGlobalScope, impliedFormat: fileInfo.impliedFormat };
 }
 
+/* @internal */
 export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, host: ts.ReadBuildProgramHost): ts.EmitAndSemanticDiagnosticsBuilderProgram {
     const buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
     const getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
@@ -1432,6 +1454,7 @@ export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInf
     }
 }
 
+/* @internal */
 export function createRedirectedBuilderProgram(getState: () => { program: ts.Program | undefined; compilerOptions: ts.CompilerOptions; }, configFileParsingDiagnostics: readonly ts.Diagnostic[]): ts.BuilderProgram {
     return {
         getState: ts.notImplemented,
@@ -1460,4 +1483,3 @@ export function createRedirectedBuilderProgram(getState: () => { program: ts.Pro
         return ts.Debug.checkDefined(getState().program);
     }
 }
-}

Diff for: src/compiler/builderPublic.ts

@@ -1,4 +1,5 @@
-namespace ts {
+import * as ts from "./ts";
+
 export type AffectedFileResult<T> = { result: T; affected: ts.SourceFile | ts.Program; } | undefined;
 
 export interface BuilderProgramHost {
@@ -171,4 +172,3 @@ export function createAbstractBuilder(newProgramOrRootNames: ts.Program | readon
     const { newProgram, configFileParsingDiagnostics: newConfigFileParsingDiagnostics } = ts.getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences);
     return ts.createRedirectedBuilderProgram(() => ({ program: newProgram, compilerOptions: newProgram.getCompilerOptions() }), newConfigFileParsingDiagnostics);
 }
-}

Diff for: src/compiler/builderState.ts

@@ -1,5 +1,6 @@
-/*@internal*/
-namespace ts {
+import * as ts from "./ts";
+
+/* @internal */
 export function getFileEmitOutput(program: ts.Program, sourceFile: ts.SourceFile, emitOnlyDtsFiles: boolean,
     cancellationToken?: ts.CancellationToken, customTransformers?: ts.CustomTransformers, forceDtsEmit?: boolean): ts.EmitOutput {
     const outputFiles: ts.OutputFile[] = [];
@@ -11,6 +12,7 @@ export function getFileEmitOutput(program: ts.Program, sourceFile: ts.SourceFile
     }
 }
 
+/* @internal */
 export interface ReusableBuilderState {
     /**
      * Information of the file eg. its version, signature etc
@@ -29,6 +31,7 @@ export interface ReusableBuilderState {
     readonly exportedModulesMap?: BuilderState.ReadonlyManyToManyPathMap | undefined;
 }
 
+/* @internal */
 export interface BuilderState {
     /**
      * Information of the file eg. its version, signature etc
@@ -69,6 +72,7 @@ export interface BuilderState {
     allFileNames?: readonly string[];
 }
 
+/* @internal */
 export namespace BuilderState {
     /**
      * Information about the source file: Its version and optional signature from last emit
@@ -647,4 +651,3 @@ export namespace BuilderState {
         return ts.arrayFrom(ts.mapDefinedIterator(seenFileNamesMap.values(), value => value));
     }
 }
-}

Diff for: src/compiler/builderStatePublic.ts

@@ -1,4 +1,5 @@
-namespace ts {
+import * as ts from "./ts";
+
 export interface EmitOutput {
     outputFiles: OutputFile[];
     emitSkipped: boolean;
@@ -11,4 +12,3 @@ export interface OutputFile {
     writeByteOrderMark: boolean;
     text: string;
 }
-}

Diff for: src/compiler/checker.ts

@@ -1,5 +1,5 @@
-/* @internal */
-namespace ts {
+import * as ts from "./ts";
+
 const ambientModuleSymbolRegex = /^".+"$/;
 const anon = "(anonymous)" as ts.__String & string;
 
@@ -284,6 +284,7 @@ function NodeLinks(this: ts.NodeLinks) {
     this.flags = 0;
 }
 
+/* @internal */
 export function getNodeId(node: ts.Node): number {
     if (!node.id) {
         node.id = nextNodeId;
@@ -292,6 +293,7 @@ export function getNodeId(node: ts.Node): number {
     return node.id;
 }
 
+/* @internal */
 export function getSymbolId(symbol: ts.Symbol): ts.SymbolId {
     if (!symbol.id) {
         symbol.id = nextSymbolId;
@@ -301,12 +303,14 @@ export function getSymbolId(symbol: ts.Symbol): ts.SymbolId {
     return symbol.id;
 }
 
+/* @internal */
 export function isInstantiatedModule(node: ts.ModuleDeclaration, preserveConstEnums: boolean) {
     const moduleState = ts.getModuleInstanceState(node);
     return moduleState === ts.ModuleInstanceState.Instantiated ||
         (preserveConstEnums && moduleState === ts.ModuleInstanceState.ConstEnumOnly);
 }
 
+/* @internal */
 export function createTypeChecker(host: ts.TypeCheckerHost): ts.TypeChecker {
     const getPackagesMap = ts.memoize(() => {
         // A package name maps to true when we detect it has .d.ts files.
@@ -45226,11 +45230,12 @@ function getIterationTypesKeyFromIterationTypeKind(typeKind: IterationTypeKind)
     }
 }
 
+/* @internal */
 export function signatureHasRestParameter(s: ts.Signature) {
     return !!(s.flags & ts.SignatureFlags.HasRestParameter);
 }
 
+/* @internal */
 export function signatureHasLiteralTypes(s: ts.Signature) {
     return !!(s.flags & ts.SignatureFlags.HasLiteralTypes);
 }
-}

Diff for: src/compiler/commandLineParser.ts

@@ -1,4 +1,5 @@
-namespace ts {
+import * as ts from "./ts";
+
 /* @internal */
 export const compileOnSaveCommandLineOption: ts.CommandLineOption = {
     name: "compileOnSave",
@@ -3666,4 +3667,3 @@ function getDefaultValueForOption(option: ts.CommandLineOption) {
             return ts.Debug.fail("Expected 'option.type' to have entries.");
     }
 }
-}