Merge pull request #2 from rcarver/array-component

improve composability for arrays

Author: rcarver

Sources/ElasticsearchQueryBuilder/Components.swift

@@ -39,8 +39,19 @@ public enum esb {}
 
 extension esb {
 
+    /// The type of a top level query structure.
+    ///
+    /// Used with `@ElasticsearchQueryBuilder`
     public typealias QueryDSL = RootQueryable
 
+    /// The type of an array sub-component of a query.
+    ///
+    /// Used to create a reusable function to fill in the
+    /// body of another component.
+    ///
+    /// Used with `@QueryArrayBuilder`
+    public typealias QueryArray = ArrayComponent
+
     /// An empty component, adding nothing to the query syntax.
     public struct Nothing: DictComponent {
         public init() {}

Sources/ElasticsearchQueryBuilder/QueryBuilder.swift

@@ -35,13 +35,19 @@ public struct QueryDictBuilder {
 @resultBuilder
 public struct QueryArrayBuilder {
 
+    public static func buildPartialBlock<C: ArrayComponent>(first: C) -> AppendDictValues {
+        .init(wrapped: first.makeArray())
+    }
     public static func buildPartialBlock<C: DictComponent>(first: C) -> AppendDictValues {
         .init(wrapped: [first.makeDict()])
     }
     public static func buildPartialBlock(first: AppendDictValues) -> AppendDictValues {
         first
     }
 
+    public static func buildPartialBlock<C: ArrayComponent>(accumulated: AppendDictValues, next: C) -> AppendDictValues {
+        .init(wrapped: accumulated.wrapped + next.makeArray())
+    }
     public static func buildPartialBlock<C: DictComponent>(accumulated: AppendDictValues, next: C) -> AppendDictValues {
         .init(wrapped: accumulated.wrapped + [next.makeDict()])
     }

Tests/ElasticsearchQueryBuilderTests/ComponentTests.swift

@@ -43,6 +43,87 @@ final class KeyTests: XCTestCase {
     }
 }
 
+final class ComposableBuilderTests: XCTestCase {
+    func testBuildDict() throws {
+        @QueryDictBuilder func makeKey() -> some DictComponent {
+            esb.Key("match_bool_prefix") {
+                [
+                    "message": "quick brown f"
+                ]
+            }
+        }
+        @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
+            esb.Query {
+                makeKey()
+            }
+        }
+        XCTAssertNoDifference(build().makeQuery(), [
+            "query": [
+                "match_bool_prefix": [
+                    "message": "quick brown f"
+                ]
+            ]
+        ])
+    }
+    func testBuildArray() throws {
+        @QueryArrayBuilder func makeKey(_ isEnabled: Bool) -> some esb.QueryArray {
+            if isEnabled {
+                esb.Key("match_bool_prefix") {
+                    [
+                        "message": "quick brown f"
+                    ]
+                }
+            }
+        }
+        @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
+            esb.Filter {
+                makeKey(true)
+            }
+        }
+        XCTAssertNoDifference(build().makeQuery(), [
+            "filter": [
+                [
+                    "match_bool_prefix": [
+                        "message": "quick brown f"
+                    ]
+                ]
+            ]
+        ])
+    }
+    func testBuildArray2() throws {
+        @QueryArrayBuilder func makeKey(_ isEnabled: Bool, _ c: Int) -> esb.QueryArray {
+            if isEnabled {
+                esb.Key("match_bool_prefix") {
+                    [
+                        "message": .string("quick brown \(c)")
+                    ]
+                }
+            }
+        }
+        @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
+            esb.Filter {
+                makeKey(true, 1)
+                makeKey(false, 2)
+                makeKey(true, 3)
+            }
+        }
+        XCTAssertNoDifference(build().makeQuery(), [
+            "filter": [
+                [
+                    "match_bool_prefix": [
+                        "message": "quick brown 1"
+                    ]
+                ],
+                [
+                    "match_bool_prefix": [
+                        "message": "quick brown 3"
+                    ]
+                ]
+            ]
+        ])
+    }
+}
+
 final class QueryTests: XCTestCase {
     func testBuild() throws {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {