delete obsolete helpers

Author: a-tarasyuk

internal/ast/utilities.go

@@ -3638,78 +3638,15 @@ func GetSemanticJsxChildren(children []*JsxChild) []*JsxChild {
 	})
 }
 
-func IsExpandoPropertyDeclaration(node *Node) bool {
-	if node == nil {
-		return false
-	}
-	return IsPropertyAccessExpression(node) || IsElementAccessExpression(node) || IsBinaryExpression(node)
-}
-
-func GetExpandoInitializer(initializer *Node, isPrototypeAssignment bool) *Node {
-	if initializer.Kind == KindCallExpression {
-		expr := SkipParentheses(initializer.Expression())
-		if expr.Kind == KindFunctionExpression || expr.Kind == KindArrowFunction {
-			return initializer
-		}
-		return nil
-	}
-
-	if initializer.Kind == KindFunctionExpression || initializer.Kind == KindCallExpression || initializer.Kind == KindArrowFunction {
-		return initializer
-	}
-
-	if initializer.Kind == KindObjectLiteralExpression && (len(initializer.Properties()) == 0 || isPrototypeAssignment) {
-		return initializer
-	}
-
-	return nil
-}
-
-func GetEffectiveInitializer(node *Node) *Expression {
-	if IsInJSFile(node) && node.Initializer() != nil && IsBinaryExpression(node.Initializer()) {
-		initializer := node.Initializer().AsBinaryExpression()
-		if initializer.OperatorToken.Kind == KindBarBarToken || initializer.OperatorToken.Kind == KindQuestionQuestionToken {
-			if node.Name() != nil && IsEntityNameExpressionEx(node.Name(), IsInJSFile(node)) && IsSameEntityName(node.Name(), initializer.Left) {
-				return initializer.Right
-			}
-		}
-	}
-	return node.Initializer()
-}
-
-func GetDeclaredExpandoInitializer(node *Node) *Expression {
-	initializer := GetEffectiveInitializer(node)
+func IsExpandoInitializer(initializer *Node) bool {
 	if initializer == nil {
-		return nil
-	}
-	return GetExpandoInitializer(initializer, IsPrototypeAccess(node.Name()))
-}
-
-func IsPrototypeAccess(node *Node) bool {
-	return IsBindableStaticAccessExpression(node, false /*excludeThisKeyword*/)
-}
-
-func IsLiteralLikeAccess(node *Node) bool {
-	return IsPropertyAccessExpression(node) || IsLiteralLikeElementAccess(node)
-}
-
-func GetNameOrArgument(node *Expression) *Expression {
-	if IsPropertyAccessExpression(node) {
-		return node.Name()
-	}
-	return node.AsElementAccessExpression().ArgumentExpression
-}
-
-func IsSameEntityName(name *Expression, initializer *Expression) bool {
-	if IsPropertyNameLiteral(name) && IsPropertyNameLiteral(initializer) {
-		return name.Text() == initializer.Text()
+		return false
 	}
-	if IsMemberName(name) && IsLiteralLikeAccess(initializer) && (initializer.Expression().Kind == KindThisKeyword || IsIdentifier(initializer.Expression()) &&
-		(initializer.Expression().Text() == "window" || initializer.Expression().Text() == "self" || initializer.Expression().Text() == "global")) {
-		return IsSameEntityName(name, GetNameOrArgument(initializer))
+	if IsFunctionExpressionOrArrowFunction(initializer) {
+		return true
 	}
-	if IsLiteralLikeAccess(name) && IsLiteralLikeAccess(initializer) {
-		return GetElementOrPropertyAccessName(name) == GetElementOrPropertyAccessName(initializer) && IsSameEntityName(name.Expression(), initializer.Expression())
+	if IsInJSFile(initializer) {
+		return IsClassExpression(initializer) || (IsObjectLiteralExpression(initializer) && len(initializer.AsObjectLiteralExpression().Properties.Nodes) == 0)
 	}
 	return false
 }

internal/binder/binder.go

@@ -1019,30 +1019,18 @@ func getInitializerSymbol(symbol *ast.Symbol) *ast.Symbol {
 	case ast.IsVariableDeclaration(declaration) &&
 		(declaration.Parent.Flags&ast.NodeFlagsConst != 0 || ast.IsInJSFile(declaration)):
 		initializer := declaration.Initializer()
-		if isExpandoInitializer(initializer) {
+		if ast.IsExpandoInitializer(initializer) {
 			return initializer.Symbol()
 		}
 	case ast.IsBinaryExpression(declaration) && ast.IsInJSFile(declaration):
 		initializer := declaration.AsBinaryExpression().Right
-		if isExpandoInitializer(initializer) {
+		if ast.IsExpandoInitializer(initializer) {
 			return initializer.Symbol()
 		}
 	}
 	return nil
 }
 
-func isExpandoInitializer(initializer *ast.Node) bool {
-	if initializer == nil {
-		return false
-	}
-	if ast.IsFunctionExpressionOrArrowFunction(initializer) {
-		return true
-	} else if ast.IsInJSFile(initializer) {
-		return ast.IsClassExpression(initializer) || (ast.IsObjectLiteralExpression(initializer) && len(initializer.AsObjectLiteralExpression().Properties.Nodes) == 0)
-	}
-	return false
-}
-
 func (b *Binder) bindThisPropertyAssignment(node *ast.Node) {
 	if !ast.IsInJSFile(node) {
 		return

internal/checker/emitresolver.go

@@ -612,33 +612,33 @@ func (r *emitResolver) IsExpandoFunctionDeclaration(node *ast.Node) bool {
 	r.checkerMu.Lock()
 	defer r.checkerMu.Unlock()
 
-	var symbol *ast.Symbol
+	var declaration *ast.Node
 	if ast.IsVariableDeclaration(node) {
-		if node.Type() != nil || (!ast.IsInJSFile(node) && !ast.IsVarConstLike(node)) {
-			return false
-		}
-		initializer := ast.GetDeclaredExpandoInitializer(node)
-		if initializer == nil || !ast.CanHaveSymbol(initializer) {
-			return false
+		initializer := node.Initializer()
+		if node.Type() == nil && (ast.IsInJSFile(node) || ast.IsVarConstLike(node)) && ast.IsExpandoInitializer(initializer) {
+			declaration = initializer
 		}
-		symbol = r.checker.getSymbolOfDeclaration(initializer)
-	} else if ast.IsFunctionDeclaration(node) {
-		symbol = r.checker.getSymbolOfDeclaration(node)
 	}
 
+	if ast.IsFunctionDeclaration(node) {
+		declaration = node
+	}
+
+	if declaration == nil {
+		return false
+	}
+
+	symbol := r.checker.getSymbolOfDeclaration(declaration)
 	if symbol == nil || (symbol.Flags&(ast.SymbolFlagsFunction|ast.SymbolFlagsVariable)) == 0 {
 		return false
 	}
 
 	exports := r.checker.getExportsOfSymbol(symbol)
 	for _, p := range exports {
-		if p.Flags&ast.SymbolFlagsValue == 0 {
-			continue
-		}
-		if p.ValueDeclaration == nil {
+		if p.ValueDeclaration == nil || p.Flags&ast.SymbolFlagsValue == 0 || p.Flags&ast.SymbolFlagsAssignment == 0 {
 			continue
 		}
-		if ast.IsExpandoPropertyDeclaration(p.ValueDeclaration) {
+		if p.ValueDeclaration.Flags&ast.NodeFlagsAmbient == 0 {
 			return true
 		}
 	}

internal/transformers/declarations/transform.go

@@ -1181,10 +1181,7 @@ func (tx *DeclarationTransformer) transformFunctionDeclaration(input *ast.Functi
 		declarations := []*ast.Statement{}
 
 		for _, p := range props {
-			if p.ValueDeclaration == nil {
-				continue
-			}
-			if !ast.IsExpandoPropertyDeclaration(p.ValueDeclaration) {
+			if p.ValueDeclaration == nil || p.Flags&ast.SymbolFlagsAssignment == 0 {
 				continue
 			}
 			if !scanner.IsIdentifierText(p.Name, core.LanguageVariantStandard) {