rcarver
diff --git a/‎Package.resolved‎
Lines changed: 4 additions & 4 deletions b/‎Package.resolved‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Tests/ElasticsearchQueryBuilderTests/ComponentTests.swift‎
Lines changed: 26 additions & 26 deletions b/‎Tests/ElasticsearchQueryBuilderTests/ComponentTests.swift‎
Lines changed: 26 additions & 26 deletions
@@ -8,7 +8,7 @@ final class NothingTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Nothing()
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -17,7 +17,7 @@ final class KeyTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Key("boost", .float(1.2))
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "boost": 1.2
         ])
     }
@@ -29,7 +29,7 @@ final class KeyTests: XCTestCase {
                 ]
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "match_bool_prefix": [
                 "message": "quick brown f"
             ]
@@ -39,7 +39,7 @@ final class KeyTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Key("match", .dict([:]))
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -57,7 +57,7 @@ final class ComposableBuilderTests: XCTestCase {
                 makeKey()
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "query": [
                 "match_bool_prefix": [
                     "message": "quick brown f"
@@ -80,7 +80,7 @@ final class ComposableBuilderTests: XCTestCase {
                 makeKey(true)
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "filter": [
                 [
                     "match_bool_prefix": [
@@ -107,7 +107,7 @@ final class ComposableBuilderTests: XCTestCase {
                 makeKey(true, 3)
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "filter": [
                 [
                     "match_bool_prefix": [
@@ -135,7 +135,7 @@ final class QueryTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "query": [
                 "match_bool_prefix": [
                     "message": "quick brown f"
@@ -149,7 +149,7 @@ final class QueryTests: XCTestCase {
                 esb.Key("match", .dict([:]))
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -196,7 +196,7 @@ final class BoolTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build(true).makeQuery(), [
+        expectNoDifference(build(true).makeQuery(), [
             "bool": [
                 "minimum_should_match": 1,
                 "should": [
@@ -229,7 +229,7 @@ final class BoolTests: XCTestCase {
                 ]
             ]
         ])
-        XCTAssertNoDifference(build(false).makeQuery(), [
+        expectNoDifference(build(false).makeQuery(), [
             "bool": [
                 "minimum_should_match": 1
             ]
@@ -252,7 +252,7 @@ final class BoolTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -268,7 +268,7 @@ final class SortTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "sort": [
                 [
                     "_score": [ "order": "desc" ]
@@ -289,7 +289,7 @@ final class SortTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -298,15 +298,15 @@ final class TermTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Term("name", "joe")
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "term": [ "name": "joe" ]
         ])
     }
     func testBuildEmpty() throws {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Term("name", nil)
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -315,15 +315,15 @@ final class TermsORTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.TermsOR("name", ["joe", "mary"])
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "terms": [ "name": ["joe", "mary"] ]
         ])
     }
     func testBuildEmpty() throws {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.TermsOR("name", [])
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -334,7 +334,7 @@ final class TermsANDTests: XCTestCase {
                 esb.TermsAND("name", ["joe", "mary"])
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "filter": [
                 [ "term": [ "name": "joe" ] ],
                 [ "term": [ "name": "mary" ] ],
@@ -347,7 +347,7 @@ final class TermsANDTests: XCTestCase {
                 esb.TermsAND("name", [])
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
 }
 
@@ -356,7 +356,7 @@ final class KNearestNeighborTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.kNearestNeighbor("vector_field", [1,2,3])
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "knn": [
                 "field": "vector_field",
                 "query_vector": [1.0, 2.0, 3.0],
@@ -378,7 +378,7 @@ final class KNearestNeighborTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "knn": [
                 "field": "vector_field",
                 "query_vector": [1.0, 2.0, 3.0],
@@ -422,7 +422,7 @@ final class FunctionScoreTests: XCTestCase {
                 }
             }
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "function_score": [
                 "bool": [
                     "should": [
@@ -452,21 +452,21 @@ final class SearchPaginationTests: XCTestCase {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Pagination()
         }
-        XCTAssertNoDifference(build().makeQuery(), [:])
+        expectNoDifference(build().makeQuery(), [:])
     }
     func testBuildFirst() throws {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Pagination(from: 10)
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "from": 10
         ])
     }
     func testBuildFirstSize() throws {
         @ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {
             esb.Pagination(from: 10, size: 20)
         }
-        XCTAssertNoDifference(build().makeQuery(), [
+        expectNoDifference(build().makeQuery(), [
             "from": 10,
             "size": 20,
         ])
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ final class NothingTests: XCTestCase {`
`8`	`8`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`9`	`9`	`esb.Nothing()`
`10`	`10`	`}`
`11`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`11`	`+ expectNoDifference(build().makeQuery(), [:])`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`@@ -17,7 +17,7 @@ final class KeyTests: XCTestCase {`
`17`	`17`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`18`	`18`	`esb.Key("boost", .float(1.2))`
`19`	`19`	`}`
`20`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`20`	`+ expectNoDifference(build().makeQuery(), [`
`21`	`21`	`"boost": 1.2`
`22`	`22`	`])`
`23`	`23`	`}`
`@@ -29,7 +29,7 @@ final class KeyTests: XCTestCase {`
`29`	`29`	`]`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`32`	`+ expectNoDifference(build().makeQuery(), [`
`33`	`33`	`"match_bool_prefix": [`
`34`	`34`	`"message": "quick brown f"`
`35`	`35`	`]`
`@@ -39,7 +39,7 @@ final class KeyTests: XCTestCase {`
`39`	`39`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`40`	`40`	`esb.Key("match", .dict([:]))`
`41`	`41`	`}`
`42`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`42`	`+ expectNoDifference(build().makeQuery(), [:])`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -57,7 +57,7 @@ final class ComposableBuilderTests: XCTestCase {`
`57`	`57`	`makeKey()`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`60`	`+ expectNoDifference(build().makeQuery(), [`
`61`	`61`	`"query": [`
`62`	`62`	`"match_bool_prefix": [`
`63`	`63`	`"message": "quick brown f"`
`@@ -80,7 +80,7 @@ final class ComposableBuilderTests: XCTestCase {`
`80`	`80`	`makeKey(true)`
`81`	`81`	`}`
`82`	`82`	`}`
`83`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`83`	`+ expectNoDifference(build().makeQuery(), [`
`84`	`84`	`"filter": [`
`85`	`85`	`[`
`86`	`86`	`"match_bool_prefix": [`
`@@ -107,7 +107,7 @@ final class ComposableBuilderTests: XCTestCase {`
`107`	`107`	`makeKey(true, 3)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`110`	`+ expectNoDifference(build().makeQuery(), [`
`111`	`111`	`"filter": [`
`112`	`112`	`[`
`113`	`113`	`"match_bool_prefix": [`
`@@ -135,7 +135,7 @@ final class QueryTests: XCTestCase {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`138`	`+ expectNoDifference(build().makeQuery(), [`
`139`	`139`	`"query": [`
`140`	`140`	`"match_bool_prefix": [`
`141`	`141`	`"message": "quick brown f"`
`@@ -149,7 +149,7 @@ final class QueryTests: XCTestCase {`
`149`	`149`	`esb.Key("match", .dict([:]))`
`150`	`150`	`}`
`151`	`151`	`}`
`152`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`152`	`+ expectNoDifference(build().makeQuery(), [:])`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`@@ -196,7 +196,7 @@ final class BoolTests: XCTestCase {`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- XCTAssertNoDifference(build(true).makeQuery(), [`
	`199`	`+ expectNoDifference(build(true).makeQuery(), [`
`200`	`200`	`"bool": [`
`201`	`201`	`"minimum_should_match": 1,`
`202`	`202`	`"should": [`
`@@ -229,7 +229,7 @@ final class BoolTests: XCTestCase {`
`229`	`229`	`]`
`230`	`230`	`]`
`231`	`231`	`])`
`232`		`- XCTAssertNoDifference(build(false).makeQuery(), [`
	`232`	`+ expectNoDifference(build(false).makeQuery(), [`
`233`	`233`	`"bool": [`
`234`	`234`	`"minimum_should_match": 1`
`235`	`235`	`]`
`@@ -252,7 +252,7 @@ final class BoolTests: XCTestCase {`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`	`}`
`255`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`255`	`+ expectNoDifference(build().makeQuery(), [:])`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`@@ -268,7 +268,7 @@ final class SortTests: XCTestCase {`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`}`
`271`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`271`	`+ expectNoDifference(build().makeQuery(), [`
`272`	`272`	`"sort": [`
`273`	`273`	`[`
`274`	`274`	`"_score": [ "order": "desc" ]`
`@@ -289,7 +289,7 @@ final class SortTests: XCTestCase {`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`	`}`
`292`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`292`	`+ expectNoDifference(build().makeQuery(), [:])`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`@@ -298,15 +298,15 @@ final class TermTests: XCTestCase {`
`298`	`298`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`299`	`299`	`esb.Term("name", "joe")`
`300`	`300`	`}`
`301`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`301`	`+ expectNoDifference(build().makeQuery(), [`
`302`	`302`	`"term": [ "name": "joe" ]`
`303`	`303`	`])`
`304`	`304`	`}`
`305`	`305`	`func testBuildEmpty() throws {`
`306`	`306`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`307`	`307`	`esb.Term("name", nil)`
`308`	`308`	`}`
`309`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`309`	`+ expectNoDifference(build().makeQuery(), [:])`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`@@ -315,15 +315,15 @@ final class TermsORTests: XCTestCase {`
`315`	`315`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`316`	`316`	`esb.TermsOR("name", ["joe", "mary"])`
`317`	`317`	`}`
`318`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`318`	`+ expectNoDifference(build().makeQuery(), [`
`319`	`319`	`"terms": [ "name": ["joe", "mary"] ]`
`320`	`320`	`])`
`321`	`321`	`}`
`322`	`322`	`func testBuildEmpty() throws {`
`323`	`323`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`324`	`324`	`esb.TermsOR("name", [])`
`325`	`325`	`}`
`326`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`326`	`+ expectNoDifference(build().makeQuery(), [:])`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`@@ -334,7 +334,7 @@ final class TermsANDTests: XCTestCase {`
`334`	`334`	`esb.TermsAND("name", ["joe", "mary"])`
`335`	`335`	`}`
`336`	`336`	`}`
`337`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`337`	`+ expectNoDifference(build().makeQuery(), [`
`338`	`338`	`"filter": [`
`339`	`339`	`[ "term": [ "name": "joe" ] ],`
`340`	`340`	`[ "term": [ "name": "mary" ] ],`
`@@ -347,7 +347,7 @@ final class TermsANDTests: XCTestCase {`
`347`	`347`	`esb.TermsAND("name", [])`
`348`	`348`	`}`
`349`	`349`	`}`
`350`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`350`	`+ expectNoDifference(build().makeQuery(), [:])`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`@@ -356,7 +356,7 @@ final class KNearestNeighborTests: XCTestCase {`
`356`	`356`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`357`	`357`	`esb.kNearestNeighbor("vector_field", [1,2,3])`
`358`	`358`	`}`
`359`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`359`	`+ expectNoDifference(build().makeQuery(), [`
`360`	`360`	`"knn": [`
`361`	`361`	`"field": "vector_field",`
`362`	`362`	`"query_vector": [1.0, 2.0, 3.0],`
`@@ -378,7 +378,7 @@ final class KNearestNeighborTests: XCTestCase {`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`	`}`
`381`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`381`	`+ expectNoDifference(build().makeQuery(), [`
`382`	`382`	`"knn": [`
`383`	`383`	`"field": "vector_field",`
`384`	`384`	`"query_vector": [1.0, 2.0, 3.0],`
`@@ -422,7 +422,7 @@ final class FunctionScoreTests: XCTestCase {`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`	`}`
`425`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`425`	`+ expectNoDifference(build().makeQuery(), [`
`426`	`426`	`"function_score": [`
`427`	`427`	`"bool": [`
`428`	`428`	`"should": [`
`@@ -452,21 +452,21 @@ final class SearchPaginationTests: XCTestCase {`
`452`	`452`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`453`	`453`	`esb.Pagination()`
`454`	`454`	`}`
`455`		`- XCTAssertNoDifference(build().makeQuery(), [:])`
	`455`	`+ expectNoDifference(build().makeQuery(), [:])`
`456`	`456`	`}`
`457`	`457`	`func testBuildFirst() throws {`
`458`	`458`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`459`	`459`	`esb.Pagination(from: 10)`
`460`	`460`	`}`
`461`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`461`	`+ expectNoDifference(build().makeQuery(), [`
`462`	`462`	`"from": 10`
`463`	`463`	`])`
`464`	`464`	`}`
`465`	`465`	`func testBuildFirstSize() throws {`
`466`	`466`	`@ElasticsearchQueryBuilder func build() -> some esb.QueryDSL {`
`467`	`467`	`esb.Pagination(from: 10, size: 20)`
`468`	`468`	`}`
`469`		`- XCTAssertNoDifference(build().makeQuery(), [`
	`469`	`+ expectNoDifference(build().makeQuery(), [`
`470`	`470`	`"from": 10,`
`471`	`471`	`"size": 20,`
`472`	`472`	`])`