fix circular imports

Author: a-tarasyuk

src/compiler/checker.ts

@@ -15,7 +15,7 @@ import { Diagnostics } from "./diagnosticInformationMap.generated";
 import { createPrinter } from "./emitter";
 import { createBinaryExpressionTrampoline } from "./factory/binaryExpressionStateMachine";
 import { addSyntheticLeadingComment, setCommentRange, setEmitFlags, setSyntheticLeadingComments } from "./factory/emitNode";
-import { factory, setOriginalNode } from "./factory/nodeFactory";
+import { factory } from "./factory/nodeFactory";
 import {
     isArrayBindingPattern, isArrayLiteralExpression, isArrowFunction, isBinaryExpression, isBindingElement, isBlock,
     isCallExpression, isCallSignatureDeclaration, isCatchClause, isClassDeclaration, isClassExpression, isClassStaticBlockDeclaration,
@@ -38,10 +38,9 @@ import {
     isTypeQueryNode, isTypeReferenceNode, isVariableDeclaration, isVariableDeclarationList, isVariableStatement,
 } from "./factory/nodeTests";
 import {
-    canHaveIllegalDecorators, canHaveIllegalModifiers, createEmptyExports,
-    findUseStrictPrologue, getJSDocTypeAssertionType, isCommaSequence, isJSDocTypeAssertion, skipOuterExpressions,
+    canHaveIllegalModifiers, createEmptyExports, getJSDocTypeAssertionType, isCommaSequence,
 } from "./factory/utilities";
-import { canHaveDecorators, canHaveModifiers, setTextRange } from "./factory/utilitiesPublic";
+import { canHaveDecorators, canHaveModifiers, setOriginalNode, setTextRange } from "./factory/utilitiesPublic";
 import { getTypesPackageName, mangleScopedPackageName } from "./moduleNameResolver";
 import { countPathComponents, getModuleSpecifiers } from "./moduleSpecifiers";
 import { forEachChild, forEachChildRecursively, isExternalModule, parseIsolatedEntityName, parseNodeFactory } from "./parser";
@@ -111,12 +110,12 @@ import {
     Visitor, VisitResult, VoidExpression, WhileStatement, WideningContext, WithStatement, YieldExpression,
 } from "./types";
 import {
-    addRelatedInfo, arrayIsHomogeneous, AssignmentKind, canHaveExportModifier, chainDiagnosticMessages, compareDiagnostics,
+    addRelatedInfo, arrayIsHomogeneous, AssignmentKind, canHaveExportModifier, canHaveIllegalDecorators, chainDiagnosticMessages, compareDiagnostics,
     concatenateDiagnosticMessageChains, containsParseError, copyEntries, createCompilerDiagnostic, createDiagnosticCollection,
     createDiagnosticForFileFromMessageChain, createDiagnosticForNode, createDiagnosticForNodeArray, createDiagnosticForNodeFromMessageChain,
     createDiagnosticMessageChainFromDiagnostic, createFileDiagnostic, createPropertyNameNodeForIdentifierOrLiteral, createSymbolTable,
     createTextWriter, declarationNameToString, defaultMaximumTruncationLength, entityNameToString, escapeString, exportAssignmentIsAlias,
-    expressionResultIsUnused, externalHelpersModuleNameText, forEachEnclosingBlockScopeContainer, forEachEntry, forEachImportClauseDeclaration,
+    expressionResultIsUnused, externalHelpersModuleNameText, findUseStrictPrologue, forEachEnclosingBlockScopeContainer, forEachEntry, forEachImportClauseDeclaration,
     forEachKey, forEachReturnStatement, forEachYieldExpression, formatMessage, FunctionFlags, getAliasDeclarationFromName,
     getAllAccessorDeclarations, getAllowSyntheticDefaultImports, getAncestor, getAssignedExpandoInitializer, getAssignmentDeclarationKind,
     getAssignmentDeclarationPropertyAccessKind, getAssignmentTargetKind, getCheckFlags, getClassExtendsHeritageElement,
@@ -150,7 +149,7 @@ import {
     isExternalModuleAugmentation, isExternalModuleImportEqualsDeclaration, isExternalOrCommonJsModule, isFunctionExpressionOrArrowFunction,
     isGlobalScopeAugmentation, isIdentifierTypePredicate, isIdentifierTypeReference, isImportCall, isInExpressionContext,
     isInfinityOrNaNString, isInJSDoc, isInJSFile, isInJsonFile, isInternalModuleImportEqualsDeclaration, isInTopLevelContext,
-    isIntrinsicJsxName, isJSDocConstructSignature, isJSDocIndexSignature, isJSDocTypeAlias, isJsonSourceFile, isJSXTagName, isKnownSymbol,
+    isIntrinsicJsxName, isJSDocConstructSignature, isJSDocIndexSignature, isJSDocTypeAlias, isJSDocTypeAssertion, isJsonSourceFile, isJSXTagName, isKnownSymbol,
     isLateVisibilityPaintedStatement, isLet, isLiteralComputedPropertyDeclarationName, isLiteralImportTypeNode, isModuleExportsAccessExpression,
     isModuleIdentifier, isModuleWithStringLiteralName, isNamespaceReexportDeclaration, isNightly, isNodeDescendantOf, isNumericLiteralName,
     isObjectLiteralMethod, isObjectLiteralOrClassExpressionMethodOrAccessor, isOptionalJSDocPropertyLikeTag, isParameterDeclaration,
@@ -167,7 +166,7 @@ import {
     nodeStartsNewLexicalEnvironment, noTruncationMaximumTruncationLength, objectAllocator, outFile, parameterIsThisKeyword,
     parsePseudoBigInt, pseudoBigIntToString, rangeOfNode, rangeOfTypeParameters, removeExtension, resolutionExtensionIsTSOrJson,
     resolvingEmptyArray, setNodeFlags, setParent, setTextRangePosEnd, setValueDeclaration, shouldPreserveConstEnums,
-    signatureHasLiteralTypes, signatureHasRestParameter, skipParentheses, skipTypeChecking,
+    signatureHasLiteralTypes, signatureHasRestParameter, skipOuterExpressions, skipParentheses, skipTypeChecking,
     stripQuotes, tryExtractTSExtension, tryGetClassImplementingOrExtendingExpressionWithTypeArguments, tryGetExtensionFromPath,
     tryGetModuleSpecifierFromDeclaration, tryGetPropertyAccessOrIdentifierToString, usingSingleLineStringWriter,
     walkUpParenthesizedExpressions, walkUpParenthesizedTypes, walkUpParenthesizedTypesAndGetParentAndChild,

src/compiler/emitter.ts

@@ -16,7 +16,7 @@ import {
     getCommentRange, getConstantValue, getEmitHelpers, getSnippetElement, getSourceMapRange, getStartsOnNewLine,
     getSyntheticLeadingComments, getSyntheticTrailingComments, getTypeNode,
 } from "./factory/emitNode";
-import { createInputFilesWithFileTexts, factory, setOriginalNode } from "./factory/nodeFactory";
+import { createInputFilesWithFileTexts, factory } from "./factory/nodeFactory";
 import {
     isArrowFunction, isBinaryExpression, isBlock, isBundle, isDecorator, isEmptyStatement, isExportAssignment, isExportSpecifier,
     isIdentifier, isJsxClosingElement, isJsxOpeningElement, isModuleDeclaration, isNumericLiteral, isParenthesizedExpression,
@@ -27,7 +27,7 @@ import {
     formatGeneratedName, formatGeneratedNamePart, getExternalHelpersModuleName,
     getNodeForGeneratedName, hasRecordedExternalHelpers,
 } from "./factory/utilities";
-import { setTextRange } from "./factory/utilitiesPublic";
+import { setOriginalNode, setTextRange } from "./factory/utilitiesPublic";
 import { forEachChild, isDeclarationFileName, isJSDocLikeText } from "./parser";
 import {
     combinePaths, comparePaths, directorySeparator, ensurePathIsNonModuleName, ensureTrailingDirectorySeparator,

src/compiler/factory/emitHelpers.ts

@@ -1,56 +1,17 @@
 import { arrayToMap, compareValues, memoize } from "../core";
 import { Comparison } from "../corePublic";
 import { Debug } from "../debug";
-import { PrivateIdentifierKind } from "../transformers/classFields";
 import {
     __String, ArrayLiteralExpression, BindingOrAssignmentElement, Block, EmitFlags, EmitHelper,
     EmitHelperUniqueNameCallback, EmitNode, EntityName, Expression, FunctionExpression, GeneratedIdentifierFlags,
-    Identifier, ScriptTarget, SyntaxKind, TextRange, TransformationContext, UnscopedEmitHelper
+    Identifier, ScriptTarget, SyntaxKind, TextRange, TransformationContext, UnscopedEmitHelper, PrivateIdentifierKind, EmitHelperFactory
 } from "../types";
 import { getEmitFlags, getEmitScriptTarget } from "../utilities";
 import { setEmitFlags } from "./emitNode";
 import { isCallExpression, isComputedPropertyName, isIdentifier } from "./nodeTests";
 import { createExpressionFromEntityName, getPropertyNameOfBindingOrAssignmentElement } from "./utilities";
 import { setTextRange } from "./utilitiesPublic";
 
-/** @internal */
-export interface EmitHelperFactory {
-    getUnscopedHelperName(name: string): Identifier;
-    // TypeScript Helpers
-    createDecorateHelper(decoratorExpressions: readonly Expression[], target: Expression, memberName?: Expression, descriptor?: Expression): Expression;
-    createMetadataHelper(metadataKey: string, metadataValue: Expression): Expression;
-    createParamHelper(expression: Expression, parameterOffset: number): Expression;
-    // ES2018 Helpers
-    createAssignHelper(attributesSegments: readonly Expression[]): Expression;
-    createAwaitHelper(expression: Expression): Expression;
-    createAsyncGeneratorHelper(generatorFunc: FunctionExpression, hasLexicalThis: boolean): Expression;
-    createAsyncDelegatorHelper(expression: Expression): Expression;
-    createAsyncValuesHelper(expression: Expression): Expression;
-    // ES2018 Destructuring Helpers
-    createRestHelper(value: Expression, elements: readonly BindingOrAssignmentElement[], computedTempVariables: readonly Expression[] | undefined, location: TextRange): Expression;
-    // ES2017 Helpers
-    createAwaiterHelper(hasLexicalThis: boolean, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression | undefined, body: Block): Expression;
-    // ES2015 Helpers
-    createExtendsHelper(name: Identifier): Expression;
-    createTemplateObjectHelper(cooked: ArrayLiteralExpression, raw: ArrayLiteralExpression): Expression;
-    createSpreadArrayHelper(to: Expression, from: Expression, packFrom: boolean): Expression;
-    // ES2015 Destructuring Helpers
-    createValuesHelper(expression: Expression): Expression;
-    createReadHelper(iteratorRecord: Expression, count: number | undefined): Expression;
-    // ES2015 Generator Helpers
-    createGeneratorHelper(body: FunctionExpression): Expression;
-    // ES Module Helpers
-    createCreateBindingHelper(module: Expression, inputName: Expression, outputName: Expression | undefined): Expression;
-    createImportStarHelper(expression: Expression): Expression;
-    createImportStarCallbackHelper(): Expression;
-    createImportDefaultHelper(expression: Expression): Expression;
-    createExportStarHelper(moduleExpression: Expression, exportsExpression?: Expression): Expression;
-    // Class Fields Helpers
-    createClassPrivateFieldGetHelper(receiver: Expression, state: Identifier, kind: PrivateIdentifierKind, f: Identifier | undefined): Expression;
-    createClassPrivateFieldSetHelper(receiver: Expression, state: Identifier, value: Expression, kind: PrivateIdentifierKind, f: Identifier | undefined): Expression;
-    createClassPrivateFieldInHelper(state: Identifier, receiver: Expression): Expression;
-}
-
 /** @internal */
 export function createEmitHelperFactory(context: TransformationContext): EmitHelperFactory {
     const factory = context.factory;

src/compiler/factory/nodeConverters.ts

@@ -7,12 +7,11 @@ import {
 } from "../types";
 import { isBindingPattern, isExpression, isObjectLiteralElementLike } from "../utilitiesPublic";
 import { getStartsOnNewLine, setStartsOnNewLine } from "./emitNode";
-import { setOriginalNode } from "./nodeFactory";
 import {
     isArrayBindingPattern, isArrayLiteralExpression, isBindingElement, isBlock,
     isIdentifier, isObjectBindingPattern, isObjectLiteralExpression
 } from "./nodeTests";
-import { setTextRange } from "./utilitiesPublic";
+import { setTextRange, setOriginalNode } from "./utilitiesPublic";
 
 /** @internal */
 export function createNodeConverters(factory: NodeFactory): NodeConverters {

src/compiler/factory/nodeFactory.ts

@@ -1,6 +1,6 @@
 import { getNodeId } from "../checkerUtilities";
 import {
-    addRange, append, appendIfUnique, cast, emptyArray, every, forEach, hasProperty, isArray, isString,
+    addRange, append, cast, emptyArray, every, forEach, hasProperty, isArray, isString,
     lastOrUndefined, map, memoize, memoizeOne, reduceLeft, returnTrue, sameFlatMap, singleOrUndefined, some, startsWith,
 } from "../core";
 import { Push } from "../corePublic";
@@ -50,18 +50,19 @@ import {
     SourceMapSource, SpreadAssignment, SpreadElement, Statement, StringLiteral, StringLiteralLike, SuperExpression, SwitchStatement,
     SyntaxKind, SyntaxList, SyntheticExpression, SyntheticReferenceExpression, TaggedTemplateExpression, TemplateExpression, TemplateHead,
     TemplateLiteral, TemplateLiteralLikeNode, TemplateLiteralToken, TemplateLiteralTypeNode, TemplateLiteralTypeSpan, TemplateMiddle,
-    TemplateSpan, TemplateTail, TextRange, ThisExpression, ThisTypeNode, ThrowStatement, Token, TokenFlags, TransformFlags, TrueLiteral,
+    TemplateSpan, TemplateTail, ThisExpression, ThisTypeNode, ThrowStatement, Token, TokenFlags, TransformFlags, TrueLiteral,
     TryStatement, TupleTypeNode, Type, TypeAliasDeclaration, TypeAssertion, TypeElement, TypeLiteralNode, TypeNode, TypeOfExpression,
     TypeOfTag, TypeOperatorNode, TypeParameterDeclaration, TypePredicateNode, TypeQueryNode, TypeReferenceNode, UnionOrIntersectionTypeNode,
     UnionTypeNode, UnparsedNode, UnparsedPrepend, UnparsedPrologue, UnparsedSource, UnparsedSourceText, UnparsedSyntheticReference,
     UnparsedTextLike, UnscopedEmitHelper, VariableDeclaration, VariableDeclarationList, VariableStatement, VisitResult, VoidExpression,
     WhileStatement, WithStatement, YieldExpression,
 } from "../types";
 import {
+    findUseStrictPrologue,
     getEmitFlags, getTextOfIdentifierOrLiteral, hasInvalidEscape, hasStaticModifier, hasSyntacticModifier,
-    isCustomPrologue, isHoistedFunction, isHoistedVariableStatement, isLogicalOrCoalescingAssignmentOperator, isPrologueDirective,
+    isCustomPrologue, isHoistedFunction, isHoistedVariableStatement, isLogicalOrCoalescingAssignmentOperator, isOuterExpression, isPrologueDirective,
     isSuperProperty, isThisIdentifier, modifiersToFlags, Mutable, nodeIsSynthesized, objectAllocator, pseudoBigIntToString,
-    setEachParent, setParent, setTextRangePosEnd, setTextRangePosWidth, skipParentheses,
+    setEachParent, setParent, setTextRangePosEnd, setTextRangePosWidth, skipOuterExpressions, skipParentheses,
 } from "../utilities";
 import {
     escapeLeadingUnderscores, getNameOfDeclaration, idText, isAssignmentPattern, isCallChain, isElementAccessChain,
@@ -87,10 +88,10 @@ import {
 } from "./nodeTests";
 import { createParenthesizerRules, nullParenthesizerRules } from "./parenthesizerRules";
 import {
-    findUseStrictPrologue, formatGeneratedName, getElementsOfBindingOrAssignmentPattern, getJSDocTypeAliasName,
-    getTargetOfBindingOrAssignmentElement, isLocalName, isOuterExpression, skipOuterExpressions, startOnNewLine,
+    formatGeneratedName, getElementsOfBindingOrAssignmentPattern, getJSDocTypeAliasName,
+    getTargetOfBindingOrAssignmentElement, isLocalName, startOnNewLine,
 } from "./utilities";
-import { canHaveModifiers, setTextRange } from "./utilitiesPublic";
+import { canHaveModifiers, setTextRange, setOriginalNode } from "./utilitiesPublic";
 
 let nextAutoGenerateId = 0;
 
@@ -6980,54 +6981,3 @@ let SourceMapSource: new (fileName: string, text: string, skipTrivia?: (pos: num
 export function createSourceMapSource(fileName: string, text: string, skipTrivia?: (pos: number) => number): SourceMapSource {
     return new (SourceMapSource || (SourceMapSource = objectAllocator.getSourceMapSourceConstructor()))(fileName, text, skipTrivia);
 }
-
-// Utilities
-
-export function setOriginalNode<T extends Node>(node: T, original: Node | undefined): T {
-    node.original = original;
-    if (original) {
-        const emitNode = original.emitNode;
-        if (emitNode) node.emitNode = mergeEmitNode(emitNode, node.emitNode);
-    }
-    return node;
-}
-
-function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode | undefined) {
-    const {
-        flags,
-        leadingComments,
-        trailingComments,
-        commentRange,
-        sourceMapRange,
-        tokenSourceMapRanges,
-        constantValue,
-        helpers,
-        startsOnNewLine,
-        snippetElement,
-    } = sourceEmitNode;
-    if (!destEmitNode) destEmitNode = {} as EmitNode;
-    // We are using `.slice()` here in case `destEmitNode.leadingComments` is pushed to later.
-    if (leadingComments) destEmitNode.leadingComments = addRange(leadingComments.slice(), destEmitNode.leadingComments);
-    if (trailingComments) destEmitNode.trailingComments = addRange(trailingComments.slice(), destEmitNode.trailingComments);
-    if (flags) destEmitNode.flags = flags & ~EmitFlags.Immutable;
-    if (commentRange) destEmitNode.commentRange = commentRange;
-    if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange;
-    if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges!);
-    if (constantValue !== undefined) destEmitNode.constantValue = constantValue;
-    if (helpers) {
-        for (const helper of helpers) {
-            destEmitNode.helpers = appendIfUnique(destEmitNode.helpers, helper);
-        }
-    }
-    if (startsOnNewLine !== undefined) destEmitNode.startsOnNewLine = startsOnNewLine;
-    if (snippetElement !== undefined) destEmitNode.snippetElement = snippetElement;
-    return destEmitNode;
-}
-
-function mergeTokenSourceMapRanges(sourceRanges: (TextRange | undefined)[], destRanges: (TextRange | undefined)[]) {
-    if (!destRanges) destRanges = [];
-    for (const key in sourceRanges) {
-        destRanges[key] = sourceRanges[key];
-    }
-    return destRanges;
-}