buildExpression overload

Author: RoBo-Inc

Sources/SwiftSyntaxBuilder/ListBuilder.swift

@@ -32,6 +32,7 @@ public protocol ListBuilder {
   /// Provides contextual type information for statement
   /// expressions to translate them into partial results.
   static func buildExpression(_ expression: Expression) -> Component
+  static func buildExpression(_ expression: some Sequence<Expression>) -> Component
 
   /// Add all the elements of `expression` to this result builder, effectively flattening them.
   ///
@@ -66,39 +67,42 @@ public protocol ListBuilder {
   static func buildFinalResult(_ component: Component) -> FinalResult
 }
 
-public extension ListBuilder {
-  static func buildBlock(_ components: Component...) -> Component {
+extension ListBuilder {
+  public static func buildBlock(_ components: Component...) -> Component {
     components.flatMap { $0 }
   }
-  static func buildExpression(_ expression: Expression) -> Component {
+  public static func buildExpression(_ expression: Expression) -> Component {
     [expression]
   }
+  public static func buildExpression(_ expression: some Sequence<Expression>) -> Component {
+    .init(expression)
+  }
   @_disfavoredOverload
-  static func buildExpression(_ expression: FinalResult) -> Component {
+  public static func buildExpression(_ expression: FinalResult) -> Component {
     expression.map { $0 }
   }
-  static func buildOptional(_ component: Component?) -> Component {
+  public static func buildOptional(_ component: Component?) -> Component {
     component ?? []
   }
-  static func buildEither(first component: Component) -> Component {
+  public static func buildEither(first component: Component) -> Component {
     component
   }
-  static func buildEither(second component: Component) -> Component {
+  public static func buildEither(second component: Component) -> Component {
     component
   }
-  static func buildArray(_ components: [Component]) -> Component {
+  public static func buildArray(_ components: [Component]) -> Component {
     components.flatMap { $0 }
   }
-  static func buildLimitedAvailability(_ component: Component) -> Component {
+  public static func buildLimitedAvailability(_ component: Component) -> Component {
     component
   }
-  static func buildFinalResult(_ component: Component) -> FinalResult {
+  public static func buildFinalResult(_ component: Component) -> FinalResult {
     .init(component)
   }
 }
 
-public extension ListBuilder where Expression: WithTrailingCommaSyntax {
-  static func buildFinalResult(_ component: Component) -> FinalResult {
+extension ListBuilder where Expression: WithTrailingCommaSyntax {
+  public static func buildFinalResult(_ component: Component) -> FinalResult {
     .init(
       component.enumerated().map { index, expression in
         index < component.endIndex - 1 ? expression.ensuringTrailingComma() : expression

Sources/SwiftSyntaxBuilder/ResultBuilderExtensions.swift

@@ -14,50 +14,90 @@ import SwiftSyntax
 
 extension CodeBlockItemListBuilder {
   public static func buildExpression(_ expression: some ExprSyntaxProtocol) -> Component {
-    return buildExpression(CodeBlockItemSyntax(item: .expr(ExprSyntax(expression))))
+    buildExpression(CodeBlockItemSyntax(item: .expr(ExprSyntax(expression))))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<ExprSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { CodeBlockItemSyntax(item: .expr(ExprSyntax($0))) })
   }
 
   public static func buildExpression(_ expression: some StmtSyntaxProtocol) -> Component {
-    return buildExpression(CodeBlockItemSyntax(item: .stmt(StmtSyntax(expression))))
+    buildExpression(CodeBlockItemSyntax(item: .stmt(StmtSyntax(expression))))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<StmtSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { CodeBlockItemSyntax(item: .stmt(StmtSyntax($0))) })
   }
 
   public static func buildExpression(_ expression: some DeclSyntaxProtocol) -> Component {
-    return buildExpression(CodeBlockItemSyntax(item: .decl(DeclSyntax(expression))))
+    buildExpression(CodeBlockItemSyntax(item: .decl(DeclSyntax(expression))))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<DeclSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { CodeBlockItemSyntax(item: .decl(DeclSyntax($0))) })
   }
 }
 
 extension ConditionElementListBuilder {
   public static func buildExpression(_ expression: some ExprSyntaxProtocol) -> Component {
-    return buildExpression(ConditionElementSyntax(condition: .expression(ExprSyntax(expression))))
+    buildExpression(ConditionElementSyntax(condition: .expression(ExprSyntax(expression))))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<ExprSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { ConditionElementSyntax(condition: .expression(ExprSyntax($0))) })
   }
 
   public static func buildExpression(_ expression: AvailabilityConditionSyntax) -> Component {
-    return buildExpression(ConditionElementSyntax(condition: .availability(expression)))
+    buildExpression(ConditionElementSyntax(condition: .availability(expression)))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<AvailabilityConditionSyntax>) -> Component {
+    buildExpression(expression.map { ConditionElementSyntax(condition: .availability($0)) })
   }
 
   public static func buildExpression(_ expression: MatchingPatternConditionSyntax) -> Component {
-    return buildExpression(ConditionElementSyntax(condition: .matchingPattern(expression)))
+    buildExpression(ConditionElementSyntax(condition: .matchingPattern(expression)))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<MatchingPatternConditionSyntax>) -> Component {
+    buildExpression(expression.map { ConditionElementSyntax(condition: .matchingPattern($0)) })
   }
 
   public static func buildExpression(_ expression: OptionalBindingConditionSyntax) -> Component {
-    return buildExpression(ConditionElementSyntax(condition: .optionalBinding(expression)))
+    buildExpression(ConditionElementSyntax(condition: .optionalBinding(expression)))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<OptionalBindingConditionSyntax>) -> Component {
+    buildExpression(expression.map { ConditionElementSyntax(condition: .optionalBinding($0)) })
   }
 }
 
 extension MemberBlockItemListBuilder {
   public static func buildExpression(_ expression: some DeclSyntaxProtocol) -> Component {
-    return buildExpression(MemberBlockItemSyntax(decl: expression))
+    buildExpression(MemberBlockItemSyntax(decl: expression))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<DeclSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { MemberBlockItemSyntax(decl: $0) })
   }
 }
 
 extension ExprListBuilder {
   public static func buildExpression(_ expression: some ExprSyntaxProtocol) -> Component {
-    return buildExpression(ExprSyntax(fromProtocol: expression))
+    buildExpression(ExprSyntax(fromProtocol: expression))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<ExprSyntaxProtocol>) -> Component {
+    buildExpression(expression.map { ExprSyntax(fromProtocol: $0) })
   }
 }
 
 extension UnexpectedNodesBuilder {
   public static func buildExpression(_ expression: some SyntaxProtocol) -> Component {
-    return buildExpression(Syntax(fromProtocol: expression))
+    buildExpression(Syntax(fromProtocol: expression))
+  }
+
+  public static func buildExpression(_ expression: some Sequence<SyntaxProtocol>) -> Component {
+    buildExpression(expression.map { Syntax(fromProtocol: $0) })
   }
 }

Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift

@@ -18,13 +18,14 @@ final class CollectionNodeFlatteningTests: XCTestCase {
   func test_FlattenCodeBlockItemListWithBuilder() {
     @CodeBlockItemListBuilder
     func buildInnerCodeBlockItemList() -> CodeBlockItemListSyntax {
-      FunctionCallExprSyntax(callee: ExprSyntax("innerBuilder"))
+      [ExprSyntax("innerBuilder1"), ExprSyntax("innerBuilder2")].lazy.map {
+        FunctionCallExprSyntax(callee: $0)
+      }
     }
 
     @CodeBlockItemListBuilder
     func buildOuterCodeBlockItemList() -> CodeBlockItemListSyntax {
       FunctionCallExprSyntax(callee: ExprSyntax("outerBuilder"))
-
       buildInnerCodeBlockItemList()
     }
 
@@ -39,7 +40,8 @@ final class CollectionNodeFlatteningTests: XCTestCase {
       {
           outsideBuilder()
           outerBuilder()
-          innerBuilder()
+          innerBuilder1()
+          innerBuilder2()
       }
       """
     )
@@ -59,4 +61,18 @@ final class CollectionNodeFlatteningTests: XCTestCase {
       """
     )
   }
+
+  func test_FlattenCodeBlockItemListWithCodeBlockItemStringArray() {
+    let buildable = CodeBlockItemListSyntax {
+      ["let one = object.methodOne()", "let two = object.methodTwo()"]
+    }
+
+    assertBuildResult(
+      buildable,
+      """
+      let one = object.methodOne()
+      let two = object.methodTwo()
+      """
+    )
+  }
 }