use direct imports

Author: a-tarasyuk

src/compiler/binder.ts

@@ -1,64 +1,74 @@
+import * as performance from "./performance";
+import { getNodeId } from "./checkerUtilities";
 import {
-    __String, AccessExpression, addRelatedInfo, append, appendIfUnique, ArrayBindingElement, ArrayLiteralExpression,
-    ArrowFunction, AssignmentDeclarationKind, BinaryExpression, BinaryOperatorToken, BindableAccessExpression,
-    BindableObjectDefinePropertyCall, BindablePropertyAssignmentExpression, BindableStaticAccessExpression,
-    BindableStaticNameExpression, BindableStaticPropertyAssignmentExpression, BindingElement, Block,
-    BreakOrContinueStatement, CallChain, CallExpression, CaseBlock, CaseClause, cast, CatchClause, ClassLikeDeclaration,
-    ClassStaticBlockDeclaration, CompilerOptions, concatenate, ConditionalExpression, ConditionalTypeNode, contains,
-    createBinaryExpressionTrampoline, createDiagnosticForNodeInSourceFile, createFileDiagnostic, createQueue,
-    createSymbolTable, Debug, Declaration, declarationNameToString, DeleteExpression, DestructuringAssignment,
-    DiagnosticCategory, DiagnosticMessage, DiagnosticRelatedInformation, Diagnostics, DiagnosticWithLocation,
-    DoStatement, DynamicNamedDeclaration, ElementAccessChain, ElementAccessExpression, EntityNameExpression,
-    EnumDeclaration, escapeLeadingUnderscores, every, ExportAssignment, exportAssignmentIsAlias,
-    ExportDeclaration, ExportSpecifier, Expression, ExpressionStatement, findAncestor, FlowFlags, FlowLabel, FlowNode,
-    FlowReduceLabel, forEach, forEachChild, ForInOrOfStatement, ForStatement, FunctionDeclaration, FunctionExpression,
-    FunctionLikeDeclaration, GetAccessorDeclaration, getAssignedExpandoInitializer, getAssignmentDeclarationKind,
-    getAssignmentDeclarationPropertyAccessKind, getCombinedModifierFlags, getCombinedNodeFlags, getContainingClass,
-    getEffectiveContainerForJSDocTemplateTag, getElementOrPropertyAccessName, getEmitScriptTarget,
+    append, appendIfUnique, cast, concatenate, contains, createQueue, every, forEach, getRangesWhere,
+    isString, length, Pattern, some, tryCast,
+} from "./core";
+import { Debug } from "./debug";
+import { Diagnostics } from "./diagnosticInformationMap.generated";
+import { createBinaryExpressionTrampoline } from "./factory/binaryExpressionStateMachine";
+import {
+    isBinaryExpression, isBlock, isCallExpression, isClassStaticBlockDeclaration, isConditionalTypeNode,
+    isElementAccessExpression, isEnumDeclaration, isExportAssignment, isExportDeclaration, isExportSpecifier, isFunctionDeclaration,
+    isIdentifier, isJSDocEnumTag, isJSDocTemplateTag, isModuleBlock, isModuleDeclaration, isNamespaceExport, isNonNullExpression,
+    isObjectLiteralExpression, isOmittedExpression, isParenthesizedExpression, isPrefixUnaryExpression, isPrivateIdentifier,
+    isPropertyAccessExpression, isShorthandPropertyAssignment, isSourceFile, isTypeAliasDeclaration, isTypeOfExpression,
+    isVariableDeclaration, isVariableStatement,
+} from "./factory/nodeTests";
+import { forEachChild, isExternalModule } from "./parser";
+import { perfLogger } from "./perfLogger";
+import { tokenToString } from "./scanner";
+import { tracing, TracingNode } from "./tracing";
+import {
+    __String, AccessExpression, ArrayBindingElement, ArrayLiteralExpression, ArrowFunction, AssignmentDeclarationKind,
+    BinaryExpression, BinaryOperatorToken, BindableAccessExpression, BindableObjectDefinePropertyCall,
+    BindablePropertyAssignmentExpression, BindableStaticAccessExpression, BindableStaticNameExpression,
+    BindableStaticPropertyAssignmentExpression, BindingElement, Block, BreakOrContinueStatement, CallChain, CallExpression,
+    CaseBlock, CaseClause, CatchClause, ClassLikeDeclaration, ClassStaticBlockDeclaration, CompilerOptions, ConditionalExpression,
+    ConditionalTypeNode, Declaration, DeleteExpression, DestructuringAssignment, DiagnosticCategory, DiagnosticMessage,
+    DiagnosticRelatedInformation, DiagnosticWithLocation, DoStatement, DynamicNamedDeclaration, ElementAccessChain,
+    ElementAccessExpression, EntityNameExpression, EnumDeclaration, ExportAssignment, ExportDeclaration, ExportSpecifier,
+    Expression, ExpressionStatement, FlowFlags, FlowLabel, FlowNode, FlowReduceLabel, ForInOrOfStatement, ForStatement,
+    FunctionDeclaration, FunctionExpression, FunctionLikeDeclaration, GetAccessorDeclaration, Identifier, IfStatement, ImportClause,
+    InternalSymbolName, JSDocCallbackTag, JSDocClassTag, JSDocEnumTag, JSDocFunctionType, JSDocParameterTag, JSDocPropertyLikeTag,
+    JSDocSignature, JSDocTypedefTag, JSDocTypeLiteral, JsxAttribute, JsxAttributes, LabeledStatement, LiteralLikeElementAccessExpression,
+    MappedTypeNode, MethodDeclaration, ModifierFlags, ModuleBlock, ModuleDeclaration, NamespaceExportDeclaration, Node, NodeArray, NodeFlags,
+    NonNullChain, NonNullExpression, NumericLiteral, ObjectLiteralExpression, OptionalChain, ParameterDeclaration, ParenthesizedExpression,
+    PatternAmbientModule, PostfixUnaryExpression, PrefixUnaryExpression, PrivateIdentifier, PropertyAccessChain, PropertyAccessExpression,
+    PropertyDeclaration, PropertySignature, ReturnStatement, ScriptTarget, SetAccessorDeclaration, ShorthandPropertyAssignment,
+    SignatureDeclaration, SourceFile, SpreadElement, Statement, StringLiteral, SwitchStatement, Symbol, SymbolFlags, SymbolTable,
+    SyntaxKind, TextRange, ThrowStatement, TokenFlags, TryStatement, TypeLiteralNode, TypeOfExpression, TypeParameterDeclaration,
+    VariableDeclaration, WhileStatement, WithStatement,
+} from "./types";
+import {
+    addRelatedInfo, createDiagnosticForNodeInSourceFile, createFileDiagnostic, createSymbolTable, declarationNameToString,
+    exportAssignmentIsAlias, getAssignedExpandoInitializer, getAssignmentDeclarationKind, getAssignmentDeclarationPropertyAccessKind,
+    getContainingClass, getEffectiveContainerForJSDocTemplateTag, getElementOrPropertyAccessName, getEmitScriptTarget,
     getEnclosingBlockScopeContainer, getErrorSpanForNode, getEscapedTextOfIdentifierOrLiteral, getExpandoInitializer,
-    getHostSignatureFromJSDoc, getImmediatelyInvokedFunctionExpression, getJSDocTypeTag, getLeftmostAccessExpression,
-    getNameOfDeclaration, getNameOrArgument, getNodeId, getRangesWhere, getRightMostAssignedExpression,
-    getSourceFileOfNode, getSourceTextOfNodeFromSourceFile, getSpanOfTokenAtPosition, getStrictOptionValue,
-    getSymbolNameForPrivateIdentifier, getTextOfIdentifierOrLiteral, getThisContainer, getTokenPosOfNode,
-    hasDynamicName, hasJSDocNodes, hasSyntacticModifier, Identifier, idText, IfStatement, ImportClause,
-    InternalSymbolName, isAliasableExpression, isAmbientModule, isAssignmentExpression, isAssignmentOperator,
-    isAssignmentTarget, isAsyncFunction, isAutoAccessorPropertyDeclaration, isBinaryExpression,
-    isBindableObjectDefinePropertyCall, isBindableStaticAccessExpression, isBindableStaticNameExpression,
-    isBindingPattern, isBlock, isBlockOrCatchScoped, isCallExpression, isClassStaticBlockDeclaration,
-    isConditionalTypeNode, isDeclaration, isDeclarationStatement, isDestructuringAssignment, isDottedName,
-    isElementAccessExpression, isEmptyObjectLiteral, isEntityNameExpression, isEnumConst, isEnumDeclaration,
-    isExportAssignment, isExportDeclaration, isExportsIdentifier, isExportSpecifier, isExpression,
-    isExpressionOfOptionalChainRoot, isExternalModule, isExternalOrCommonJsModule, isForInOrOfStatement,
-    isFunctionDeclaration, isFunctionLike, isFunctionLikeDeclaration, isFunctionLikeOrClassStaticBlockDeclaration,
-    isFunctionSymbol, isGlobalScopeAugmentation, isIdentifier, isIdentifierName, isInJSFile, isInTopLevelContext,
-    isJSDocConstructSignature, isJSDocEnumTag, isJSDocTemplateTag, isJSDocTypeAlias, isJsonSourceFile,
-    isLeftHandSideExpression, isLogicalOrCoalescingAssignmentOperator, isModuleAugmentationExternal, isModuleBlock,
-    isModuleDeclaration, isModuleExportsAccessExpression, isNamedDeclaration, isNamespaceExport, isNonNullExpression,
-    isNullishCoalesce, isObjectLiteralExpression, isObjectLiteralMethod,
-    isObjectLiteralOrClassExpressionMethodOrAccessor, isOmittedExpression, isOptionalChain, isOptionalChainRoot,
-    isOutermostOptionalChain, isParameterDeclaration, isParameterPropertyDeclaration, isParenthesizedExpression,
-    isPartOfTypeQuery, isPrefixUnaryExpression, isPrivateIdentifier, isPrologueDirective,
-    isPropertyAccessEntityNameExpression, isPropertyAccessExpression, isPropertyNameLiteral, isPrototypeAccess,
-    isPushOrUnshiftIdentifier, isRequireCall, isShorthandPropertyAssignment, isSignedNumericLiteral, isSourceFile,
-    isSpecialPropertyDeclaration, isStatement, isStatementButNotDeclaration, isStatic, isString, isStringLiteralLike,
-    isStringOrNumericLiteralLike, isThisInitializedDeclaration, isTypeAliasDeclaration, isTypeOfExpression,
-    isVariableDeclaration, isVariableDeclarationInitializedToBareOrAccessedRequire, isVariableStatement,
-    JSDocCallbackTag, JSDocClassTag, JSDocEnumTag, JSDocFunctionType, JSDocParameterTag, JSDocPropertyLikeTag,
-    JSDocSignature, JSDocTypedefTag, JSDocTypeLiteral, JsxAttribute, JsxAttributes, LabeledStatement, length,
-    LiteralLikeElementAccessExpression, MappedTypeNode, MethodDeclaration, ModifierFlags, ModuleBlock,
-    ModuleDeclaration, Mutable, NamespaceExportDeclaration, Node, NodeArray, NodeFlags, nodeHasName, nodeIsMissing,
-    nodeIsPresent, NonNullChain, NonNullExpression, NumericLiteral, objectAllocator, ObjectLiteralExpression,
-    OptionalChain, ParameterDeclaration, ParenthesizedExpression, Pattern, PatternAmbientModule, perfLogger,
-    PostfixUnaryExpression, PrefixUnaryExpression, PrivateIdentifier, PropertyAccessChain, PropertyAccessExpression,
-    PropertyDeclaration, PropertySignature, removeFileExtension, ReturnStatement, ScriptTarget,
-    SetAccessorDeclaration, setParent, setParentRecursive, setValueDeclaration, ShorthandPropertyAssignment,
-    shouldPreserveConstEnums, SignatureDeclaration, skipParentheses, sliceAfter, some, SourceFile, SpreadElement,
-    Statement, StringLiteral, SwitchStatement, Symbol, SymbolFlags, symbolName, SymbolTable, SyntaxKind, TextRange,
-    ThrowStatement, TokenFlags, tokenToString, tracing, TracingNode, tryCast, tryParsePattern, TryStatement,
-    TypeLiteralNode, TypeOfExpression, TypeParameterDeclaration, unescapeLeadingUnderscores, unreachableCodeIsError,
-    unusedLabelIsError, VariableDeclaration, WhileStatement, WithStatement,
-} from "./_namespaces/ts";
-import * as performance from "./_namespaces/ts.performance";
+    getHostSignatureFromJSDoc, getImmediatelyInvokedFunctionExpression, getLeftmostAccessExpression, getNameOrArgument,
+    getRightMostAssignedExpression, getSourceFileOfNode, getSourceTextOfNodeFromSourceFile, getSpanOfTokenAtPosition,
+    getStrictOptionValue, getSymbolNameForPrivateIdentifier, getTextOfIdentifierOrLiteral, getThisContainer, getTokenPosOfNode,
+    hasDynamicName, hasSyntacticModifier, isAliasableExpression, isAmbientModule, isAssignmentExpression, isAssignmentOperator,
+    isAssignmentTarget, isAsyncFunction, isBindableObjectDefinePropertyCall, isBindableStaticAccessExpression,
+    isBindableStaticNameExpression, isBlockOrCatchScoped, isDestructuringAssignment, isDottedName, isEmptyObjectLiteral,
+    isEntityNameExpression, isEnumConst, isExportsIdentifier, isExternalOrCommonJsModule, isFunctionSymbol, isGlobalScopeAugmentation,
+    isIdentifierName, isInJSFile, isInTopLevelContext, isJSDocConstructSignature, isJSDocTypeAlias, isJsonSourceFile,
+    isLogicalOrCoalescingAssignmentOperator, isModuleAugmentationExternal, isModuleExportsAccessExpression,
+    isObjectLiteralMethod, isObjectLiteralOrClassExpressionMethodOrAccessor, isParameterDeclaration, isPartOfTypeQuery,
+    isPrologueDirective, isPropertyAccessEntityNameExpression, isPropertyNameLiteral, isPrototypeAccess, isPushOrUnshiftIdentifier,
+    isRequireCall, isSignedNumericLiteral, isSpecialPropertyDeclaration, isStatic, isStringOrNumericLiteralLike, isThisInitializedDeclaration,
+    isVariableDeclarationInitializedToBareOrAccessedRequire, Mutable, nodeIsMissing, nodeIsPresent, objectAllocator, removeFileExtension,
+    setParent, setParentRecursive, setValueDeclaration, shouldPreserveConstEnums, skipParentheses, sliceAfter, tryParsePattern,
+    unreachableCodeIsError, unusedLabelIsError,
+} from "./utilities";
+import {
+    escapeLeadingUnderscores, findAncestor, getCombinedModifierFlags, getCombinedNodeFlags, getJSDocTypeTag, getNameOfDeclaration,
+    hasJSDocNodes, idText, isAutoAccessorPropertyDeclaration, isBindingPattern, isDeclaration, isDeclarationStatement, isExpression,
+    isExpressionOfOptionalChainRoot, isForInOrOfStatement, isFunctionLike, isFunctionLikeDeclaration,
+    isFunctionLikeOrClassStaticBlockDeclaration, isLeftHandSideExpression, isNamedDeclaration, isNullishCoalesce, isOptionalChain,
+    isOptionalChainRoot, isOutermostOptionalChain, isParameterPropertyDeclaration, isStatement, isStatementButNotDeclaration,
+    isStringLiteralLike, nodeHasName, symbolName, unescapeLeadingUnderscores,
+} from "./utilitiesPublic";
 
 /** @internal */
 export const enum ModuleInstanceState {

src/compiler/builder.ts

@@ -1,20 +1,34 @@
-import * as ts from "./_namespaces/ts";
 import {
-    addRange, AffectedFileResult, arrayFrom, arrayToMap, BuilderProgram, BuilderProgramHost, BuilderState, BuildInfo,
-    BundleBuildInfo, CancellationToken, CommandLineOption, compareStringsCaseSensitive, compareValues, CompilerHost,
-    CompilerOptions, compilerOptionsAffectDeclarationPath, compilerOptionsAffectEmit,
-    compilerOptionsAffectSemanticDiagnostics, CompilerOptionsValue, concatenate, convertToOptionsWithAbsolutePaths,
-    createBuildInfo, createGetCanonicalFileName, createProgram, CustomTransformers, Debug, Diagnostic,
-    DiagnosticCategory, DiagnosticMessageChain, DiagnosticRelatedInformation, DiagnosticWithLocation,
-    EmitAndSemanticDiagnosticsBuilderProgram, EmitOnly, EmitResult, emitSkippedWithNoDiagnostics, emptyArray,
-    ensurePathIsNonModuleName, filterSemanticDiagnostics, forEach, forEachEntry, forEachKey, generateDjb2Hash,
-    GetCanonicalFileName, getDirectoryPath, getEmitDeclarations, getNormalizedAbsolutePath, getOptionsNameMap,
-    getOwnKeys, getRelativePathFromDirectory, getTsBuildInfoEmitOutputFilePath, handleNoEmitOptions, isArray,
-    isDeclarationFileName, isJsonSourceFile, isNumber, isString, map, mapDefined, maybeBind, noop, notImplemented,
-    outFile, Path, Program, ProjectReference, ReadBuildProgramHost, ReadonlyCollection,
-    returnFalse, returnUndefined, SemanticDiagnosticsBuilderProgram, skipTypeChecking, some, SourceFile,
-    sourceFileMayBeEmitted, SourceMapEmitResult, toPath, tryAddToSet, WriteFileCallback, WriteFileCallbackData,
-} from "./_namespaces/ts";
+    AffectedFileResult, BuilderProgram, BuilderProgramHost,
+    EmitAndSemanticDiagnosticsBuilderProgram, SemanticDiagnosticsBuilderProgram,
+} from "./builderPublic";
+import { BuilderState } from "./builderState";
+import { convertToOptionsWithAbsolutePaths, getOptionsNameMap } from "./commandLineParser";
+import {
+    addRange, arrayFrom, arrayToMap, compareStringsCaseSensitive, compareValues, concatenate, createGetCanonicalFileName,
+    emptyArray, forEach, GetCanonicalFileName, getOwnKeys, isArray, isNumber, isString, map, mapDefined, maybeBind, noop,
+    notImplemented, returnFalse, returnUndefined, some, tryAddToSet,
+} from "./core";
+import { ReadonlyCollection } from "./corePublic";
+import { Debug } from "./debug";
+import { createBuildInfo, getTsBuildInfoEmitOutputFilePath } from "./emitter";
+import { isDeclarationFileName } from "./parser";
+import {
+    ensurePathIsNonModuleName, getDirectoryPath, getNormalizedAbsolutePath,
+    getRelativePathFromDirectory, toPath,
+} from "./path";
+import { createProgram, emitSkippedWithNoDiagnostics, filterSemanticDiagnostics, handleNoEmitOptions } from "./program";
+import { generateDjb2Hash } from "./sys";
+import {
+    BuildInfo, BundleBuildInfo, CancellationToken, CommandLineOption, CompilerHost, CompilerOptions, CompilerOptionsValue,
+    CustomTransformers, Diagnostic, DiagnosticCategory, DiagnosticMessageChain, DiagnosticRelatedInformation, DiagnosticWithLocation,
+    EmitOnly, EmitResult, Path, Program, ProjectReference, SourceFile, SourceMapEmitResult, WriteFileCallback, WriteFileCallbackData,
+} from "./types";
+import {
+    compilerOptionsAffectDeclarationPath, compilerOptionsAffectEmit, compilerOptionsAffectSemanticDiagnostics, forEachEntry,
+    forEachKey, getEmitDeclarations, isJsonSourceFile, outFile, skipTypeChecking, sourceFileMayBeEmitted,
+} from "./utilities";
+import { ReadBuildProgramHost } from "./watchPublic";
 
 /** @internal */
 export interface ReusableDiagnostic extends ReusableDiagnosticRelatedInformation {
@@ -385,22 +399,22 @@ function convertToDiagnostics(diagnostics: readonly ReusableDiagnostic[], newPro
     if (!diagnostics.length) return emptyArray;
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory()));
     return diagnostics.map(diagnostic => {
-        const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
+        const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPathHelper);
         result.reportsUnnecessary = diagnostic.reportsUnnecessary;
         result.reportsDeprecated = diagnostic.reportDeprecated;
         result.source = diagnostic.source;
         result.skippedOn = diagnostic.skippedOn;
         const { relatedInformation } = diagnostic;
         result.relatedInformation = relatedInformation ?
             relatedInformation.length ?
-                relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram, toPath)) :
+                relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram, toPathHelper)) :
                 [] :
             undefined;
         return result;
     });
 
-    function toPath(path: string) {
-        return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+    function toPathHelper(path: string) {
+        return toPath(path, buildInfoDirectory, getCanonicalFileName);
     }
 }
 
@@ -1625,7 +1639,7 @@ export function createBuilderProgramUsingProgramBuildInfo(buildInfo: BuildInfo,
     const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
 
     let state: ReusableBuilderProgramState;
-    const filePaths = program.fileNames?.map(toPath);
+    const filePaths = program.fileNames?.map(toPathHelper);
     let filePathsSetList: Set<Path>[] | undefined;
     const latestChangedDtsFile = program.latestChangedDtsFile ? toAbsolutePath(program.latestChangedDtsFile) : undefined;
     if (isProgramBundleEmitBuildInfo(program)) {
@@ -1705,8 +1719,8 @@ export function createBuilderProgramUsingProgramBuildInfo(buildInfo: BuildInfo,
         hasChangedEmitSignature: returnFalse,
     };
 
-    function toPath(path: string) {
-        return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+    function toPathHelper(path: string) {
+        return toPath(path, buildInfoDirectory, getCanonicalFileName);
     }
 
     function toAbsolutePath(path: string) {