Enum and namespace transformer

internal/ast/ast.go

@@ -74,6 +74,7 @@ type NodeFactory struct {
 
 func newNode(kind Kind, data nodeData) *Node {
 	n := data.AsNode()
+	n.Loc = core.UndefinedTextRange()
 	n.Kind = kind
 	n.data = data
 	return n
@@ -104,7 +105,11 @@ func (list *NodeList) Pos() int { return list.Loc.Pos() }
 func (list *NodeList) End() int { return list.Loc.End() }
 
 func (list *NodeList) HasTrailingComma() bool {
-	return len(list.Nodes) > 0 && list.Nodes[len(list.Nodes)-1].End() < list.End()
+	if len(list.Nodes) == 0 || PositionIsSynthesized(list.End()) {
+		return false
+	}
+	last := list.Nodes[len(list.Nodes)-1]
+	return !PositionIsSynthesized(last.End()) && last.End() < list.End()
 }
 
 // ModifierList
@@ -257,6 +262,14 @@ func (n *Node) Expression() *Node {
 		return n.AsAwaitExpression().Expression
 	case KindYieldExpression:
 		return n.AsYieldExpression().Expression
+	case KindIfStatement:
+		return n.AsIfStatement().Expression
+	case KindDoStatement:
+		return n.AsDoStatement().Expression
+	case KindWhileStatement:
+		return n.AsWhileStatement().Expression
+	case KindWithStatement:
+		return n.AsWithStatement().Expression
 	case KindForInStatement, KindForOfStatement:
 		return n.AsForInOrOfStatement().Expression
 	case KindSwitchStatement:
@@ -267,14 +280,12 @@ func (n *Node) Expression() *Node {
 		return n.AsExpressionStatement().Expression
 	case KindReturnStatement:
 		return n.AsReturnStatement().Expression
+	case KindThrowStatement:
+		return n.AsThrowStatement().Expression
 	case KindExternalModuleReference:
 		return n.AsExternalModuleReference().Expression
-	case KindIfStatement:
-		return n.AsIfStatement().Expression
-	case KindWhileStatement:
-		return n.AsWhileStatement().Expression
-	case KindDoStatement:
-		return n.AsDoStatement().Expression
+	case KindExportAssignment:
+		return n.AsExportAssignment().Expression
 	}
 	panic("Unhandled case in Node.Expression")
 }
@@ -1487,7 +1498,9 @@ type (
 	ParameterDeclarationNode        = Node
 	HeritageClauseNode              = Node
 	ExpressionWithTypeArgumentsNode = Node
+	EnumDeclarationNode             = Node
 	EnumMemberNode                  = Node
+	ModuleDeclarationNode           = Node
 	ImportClauseNode                = Node
 	ImportAttributesNode            = Node
 	ImportAttributeNode             = Node
@@ -4244,6 +4257,9 @@ type BinaryExpression struct {
 }
 
 func (f *NodeFactory) NewBinaryExpression(left *Expression, operatorToken *TokenNode, right *Expression) *Node {
+	if operatorToken == nil {
+		panic("operatorToken is required")
+	}
 	data := f.binaryExpressionPool.New()
 	data.Left = left
 	data.OperatorToken = operatorToken

internal/ast/utilities.go

@@ -1269,7 +1269,7 @@ func GetNameOfDeclaration(declaration *Node) *Node {
 	if declaration == nil {
 		return nil
 	}
-	nonAssignedName := getNonAssignedNameOfDeclaration(declaration)
+	nonAssignedName := GetNonAssignedNameOfDeclaration(declaration)
 	if nonAssignedName != nil {
 		return nonAssignedName
 	}
@@ -1279,7 +1279,8 @@ func GetNameOfDeclaration(declaration *Node) *Node {
 	return nil
 }
 
-func getNonAssignedNameOfDeclaration(declaration *Node) *Node {
+func GetNonAssignedNameOfDeclaration(declaration *Node) *Node {
+	// !!!
 	switch declaration.Kind {
 	case KindBinaryExpression:
 		if IsFunctionPropertyAssignment(declaration) {
@@ -2137,3 +2138,69 @@ func NodeHasName(statement *Node, id *Node) bool {
 	}
 	return false
 }
+
+func GetAssertedTypeNode(node *Node) *Node {
+	switch node.Kind {
+	case KindAsExpression:
+		return node.AsAsExpression().Type
+	case KindSatisfiesExpression:
+		return node.AsSatisfiesExpression().Type
+	case KindTypeAssertionExpression:
+		return node.AsTypeAssertion().Type
+	}
+	panic("Unhandled case in getAssertedTypeNode")
+}
+
+func IsConstAssertion(node *Node) bool {
+	switch node.Kind {
+	case KindAsExpression, KindTypeAssertionExpression:
+		return IsConstTypeReference(GetAssertedTypeNode(node))
+	}
+	return false
+}
+
+func IsConstTypeReference(node *Node) bool {
+	return IsTypeReferenceNode(node) && len(node.TypeArguments()) == 0 && IsIdentifier(node.AsTypeReferenceNode().TypeName) && node.AsTypeReferenceNode().TypeName.Text() == "const"
+}
+
+func IsGlobalSourceFile(node *Node) bool {
+	return node.Kind == KindSourceFile && !IsExternalOrCommonJsModule(node.AsSourceFile())
+}
+
+func IsParameterLikeOrReturnTag(node *Node) bool {
+	switch node.Kind {
+	case KindParameter, KindTypeParameter, KindJSDocParameterTag, KindJSDocReturnTag:
+		return true
+	}
+	return false
+}
+
+func GetDeclarationOfKind(symbol *Symbol, kind Kind) *Node {
+	for _, declaration := range symbol.Declarations {
+		if declaration.Kind == kind {
+			return declaration
+		}
+	}
+	return nil
+}
+
+func FindConstructorDeclaration(node *ClassLikeDeclaration) *Node {
+	for _, member := range node.ClassLikeData().Members.Nodes {
+		if IsConstructorDeclaration(member) && NodeIsPresent(member.AsConstructorDeclaration().Body) {
+			return member
+		}
+	}
+	return nil
+}
+
+func GetFirstIdentifier(node *Node) *Node {
+	switch node.Kind {
+	case KindIdentifier:
+		return node
+	case KindQualifiedName:
+		return GetFirstIdentifier(node.AsQualifiedName().Left)
+	case KindPropertyAccessExpression:
+		return GetFirstIdentifier(node.AsPropertyAccessExpression().Expression)
+	}
+	panic("Unhandled case in GetFirstIdentifier")
+}

internal/ast/visitor.go

@@ -7,8 +7,8 @@ import (
 // NodeVisitor
 
 type NodeVisitor struct {
-	Visit   func(node *Node) *Node // The callback used to visit a node
-	Factory NodeFactory            // A NodeFactory used to produce new nodes when passed to VisitEachChild
+	Visit   func(node *Node) *Node // Required. The callback used to visit a node
+	Factory *NodeFactory           // Required. The NodeFactory used to produce new nodes when passed to VisitEachChild
 	Hooks   NodeVisitorHooks       // Hooks to be invoked when visiting a node
 }
 
@@ -155,7 +155,7 @@ func (v *NodeVisitor) VisitEachChild(node *Node) *Node {
 
 	updated := node.VisitEachChild(v)
 	if updated != node && v.Hooks.SetOriginal != nil {
-		v.Hooks.SetOriginal(node, updated)
+		v.Hooks.SetOriginal(updated, node)
 	}
 	return updated
 }