Skip to content

Commit 17443dd

Browse files
refactor: Applies swiftformat
1 parent c12295e commit 17443dd

File tree

8 files changed

+82
-81
lines changed

8 files changed

+82
-81
lines changed

Sources/GraphQL/Execution/Execute.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,8 @@ func completeValue(
933933
// If field type is a leaf type, Scalar or Enum, serialize to a valid value,
934934
// returning .null if serialization is not possible.
935935
if let returnType = returnType as? GraphQLLeafType {
936-
return exeContext.eventLoopGroup.next()
937-
.makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
936+
return try exeContext.eventLoopGroup.next()
937+
.makeSucceededFuture(completeLeafValue(returnType: returnType, result: r))
938938
}
939939

940940
// If field type is an abstract type, Interface or Union, determine the

Sources/GraphQL/Language/Parser.swift

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func parseDocument(lexer: Lexer) throws -> Document {
153153
var definitions: [Definition] = []
154154

155155
repeat {
156-
definitions.append(try parseDefinition(lexer: lexer))
156+
try definitions.append(parseDefinition(lexer: lexer))
157157
} while try !skip(lexer: lexer, kind: .eof)
158158

159159
return Document(
@@ -207,13 +207,13 @@ func parseOperationDefinition(lexer: Lexer) throws -> OperationDefinition {
207207
let start = lexer.token
208208

209209
if peek(lexer: lexer, kind: .openingBrace) {
210-
return OperationDefinition(
210+
return try OperationDefinition(
211211
loc: loc(lexer: lexer, startToken: start),
212212
operation: .query,
213213
name: nil,
214214
variableDefinitions: [], // nil
215215
directives: [],
216-
selectionSet: try parseSelectionSet(lexer: lexer)
216+
selectionSet: parseSelectionSet(lexer: lexer)
217217
)
218218
}
219219

@@ -225,13 +225,13 @@ func parseOperationDefinition(lexer: Lexer) throws -> OperationDefinition {
225225
name = try parseName(lexer: lexer)
226226
}
227227

228-
return OperationDefinition(
228+
return try OperationDefinition(
229229
loc: loc(lexer: lexer, startToken: start),
230230
operation: operation,
231231
name: name,
232-
variableDefinitions: try parseVariableDefinitions(lexer: lexer),
233-
directives: try parseDirectives(lexer: lexer),
234-
selectionSet: try parseSelectionSet(lexer: lexer)
232+
variableDefinitions: parseVariableDefinitions(lexer: lexer),
233+
directives: parseDirectives(lexer: lexer),
234+
selectionSet: parseSelectionSet(lexer: lexer)
235235
)
236236
}
237237

@@ -271,11 +271,11 @@ func parseVariableDefinitions(lexer: Lexer) throws -> [VariableDefinition] {
271271
*/
272272
func parseVariableDefinition(lexer: Lexer) throws -> VariableDefinition {
273273
let start = lexer.token
274-
return VariableDefinition(
274+
return try VariableDefinition(
275275
loc: loc(lexer: lexer, startToken: start),
276-
variable: try parseVariable(lexer: lexer),
277-
type: (try expect(lexer: lexer, kind: .colon), try parseTypeReference(lexer: lexer)).1,
278-
defaultValue: try skip(lexer: lexer, kind: .equals) ?
276+
variable: parseVariable(lexer: lexer),
277+
type: (expect(lexer: lexer, kind: .colon), parseTypeReference(lexer: lexer)).1,
278+
defaultValue: skip(lexer: lexer, kind: .equals) ?
279279
parseValueLiteral(lexer: lexer, isConst: true) : nil
280280
)
281281
}
@@ -286,9 +286,9 @@ func parseVariableDefinition(lexer: Lexer) throws -> VariableDefinition {
286286
func parseVariable(lexer: Lexer) throws -> Variable {
287287
let start = lexer.token
288288
try expect(lexer: lexer, kind: .dollar)
289-
return Variable(
289+
return try Variable(
290290
loc: loc(lexer: lexer, startToken: start),
291-
name: try parseName(lexer: lexer)
291+
name: parseName(lexer: lexer)
292292
)
293293
}
294294

@@ -297,9 +297,9 @@ func parseVariable(lexer: Lexer) throws -> Variable {
297297
*/
298298
func parseSelectionSet(lexer: Lexer) throws -> SelectionSet {
299299
let start = lexer.token
300-
return SelectionSet(
300+
return try SelectionSet(
301301
loc: loc(lexer: lexer, startToken: start),
302-
selections: try many(
302+
selections: many(
303303
lexer: lexer,
304304
openKind: .openingBrace,
305305
closeKind: .closingBrace,
@@ -340,14 +340,14 @@ func parseField(lexer: Lexer) throws -> Field {
340340
name = nameOrAlias
341341
}
342342

343-
return Field(
343+
return try Field(
344344
loc: loc(lexer: lexer, startToken: start),
345345
alias: alias,
346346
name: name,
347-
arguments: try parseArguments(lexer: lexer),
348-
directives: try parseDirectives(lexer: lexer),
347+
arguments: parseArguments(lexer: lexer),
348+
directives: parseDirectives(lexer: lexer),
349349
selectionSet: peek(lexer: lexer, kind: .openingBrace) ?
350-
try parseSelectionSet(lexer: lexer) :
350+
parseSelectionSet(lexer: lexer) :
351351
nil
352352
)
353353
}
@@ -370,12 +370,12 @@ func parseArguments(lexer: Lexer) throws -> [Argument] {
370370
*/
371371
func parseArgument(lexer: Lexer) throws -> Argument {
372372
let start = lexer.token
373-
return Argument(
373+
return try Argument(
374374
loc: loc(lexer: lexer, startToken: start),
375-
name: try parseName(lexer: lexer),
375+
name: parseName(lexer: lexer),
376376
value: (
377-
try expect(lexer: lexer, kind: .colon),
378-
try parseValueLiteral(lexer: lexer, isConst: false)
377+
expect(lexer: lexer, kind: .colon),
378+
parseValueLiteral(lexer: lexer, isConst: false)
379379
).1
380380
)
381381
}
@@ -393,10 +393,10 @@ func parseFragment(lexer: Lexer) throws -> Fragment {
393393
let start = lexer.token
394394
try expect(lexer: lexer, kind: .spread)
395395
if peek(lexer: lexer, kind: .name), lexer.token.value != "on" {
396-
return FragmentSpread(
396+
return try FragmentSpread(
397397
loc: loc(lexer: lexer, startToken: start),
398-
name: try parseFragmentName(lexer: lexer),
399-
directives: try parseDirectives(lexer: lexer)
398+
name: parseFragmentName(lexer: lexer),
399+
directives: parseDirectives(lexer: lexer)
400400
)
401401
}
402402

@@ -406,11 +406,11 @@ func parseFragment(lexer: Lexer) throws -> Fragment {
406406
try lexer.advance()
407407
typeCondition = try parseNamedType(lexer: lexer)
408408
}
409-
return InlineFragment(
409+
return try InlineFragment(
410410
loc: loc(lexer: lexer, startToken: start),
411411
typeCondition: typeCondition,
412-
directives: try parseDirectives(lexer: lexer),
413-
selectionSet: try parseSelectionSet(lexer: lexer)
412+
directives: parseDirectives(lexer: lexer),
413+
selectionSet: parseSelectionSet(lexer: lexer)
414414
)
415415
}
416416

@@ -423,15 +423,15 @@ func parseFragment(lexer: Lexer) throws -> Fragment {
423423
func parseFragmentDefinition(lexer: Lexer) throws -> FragmentDefinition {
424424
let start = lexer.token
425425
try expectKeyword(lexer: lexer, value: "fragment")
426-
return FragmentDefinition(
426+
return try FragmentDefinition(
427427
loc: loc(lexer: lexer, startToken: start),
428-
name: try parseFragmentName(lexer: lexer),
428+
name: parseFragmentName(lexer: lexer),
429429
typeCondition: (
430-
try expectKeyword(lexer: lexer, value: "on"),
431-
try parseNamedType(lexer: lexer)
430+
expectKeyword(lexer: lexer, value: "on"),
431+
parseNamedType(lexer: lexer)
432432
).1,
433-
directives: try parseDirectives(lexer: lexer),
434-
selectionSet: try parseSelectionSet(lexer: lexer)
433+
directives: parseDirectives(lexer: lexer),
434+
selectionSet: parseSelectionSet(lexer: lexer)
435435
)
436436
}
437437

@@ -538,9 +538,9 @@ func parseValueValue(lexer: Lexer) throws -> Value {
538538
func parseList(lexer: Lexer, isConst: Bool) throws -> ListValue {
539539
let start = lexer.token
540540
let item = isConst ? parseConstValue : parseValueValue
541-
return ListValue(
541+
return try ListValue(
542542
loc: loc(lexer: lexer, startToken: start),
543-
values: try any(
543+
values: any(
544544
lexer: lexer,
545545
openKind: .openingBracket,
546546
closeKind: .closingBracket,
@@ -560,7 +560,7 @@ func parseObject(lexer: Lexer, isConst: Bool) throws -> ObjectValue {
560560
var fields: [ObjectField] = []
561561

562562
while try !skip(lexer: lexer, kind: .closingBrace) {
563-
fields.append(try parseObjectField(lexer: lexer, isConst: isConst))
563+
try fields.append(parseObjectField(lexer: lexer, isConst: isConst))
564564
}
565565

566566
return ObjectValue(
@@ -574,12 +574,12 @@ func parseObject(lexer: Lexer, isConst: Bool) throws -> ObjectValue {
574574
*/
575575
func parseObjectField(lexer: Lexer, isConst: Bool) throws -> ObjectField {
576576
let start = lexer.token
577-
return ObjectField(
577+
return try ObjectField(
578578
loc: loc(lexer: lexer, startToken: start),
579-
name: try parseName(lexer: lexer),
579+
name: parseName(lexer: lexer),
580580
value: (
581-
try expect(lexer: lexer, kind: .colon),
582-
try parseValueLiteral(lexer: lexer, isConst: isConst)
581+
expect(lexer: lexer, kind: .colon),
582+
parseValueLiteral(lexer: lexer, isConst: isConst)
583583
).1
584584
)
585585
}
@@ -609,7 +609,7 @@ func parseDirectives(lexer: Lexer) throws -> [Directive] {
609609
var directives: [Directive] = []
610610

611611
while peek(lexer: lexer, kind: .at) {
612-
directives.append(try parseDirective(lexer: lexer))
612+
try directives.append(parseDirective(lexer: lexer))
613613
}
614614

615615
return directives
@@ -621,10 +621,10 @@ func parseDirectives(lexer: Lexer) throws -> [Directive] {
621621
func parseDirective(lexer: Lexer) throws -> Directive {
622622
let start = lexer.token
623623
try expect(lexer: lexer, kind: .at)
624-
return Directive(
624+
return try Directive(
625625
loc: loc(lexer: lexer, startToken: start),
626-
name: try parseName(lexer: lexer),
627-
arguments: try parseArguments(lexer: lexer)
626+
name: parseName(lexer: lexer),
627+
arguments: parseArguments(lexer: lexer)
628628
)
629629
}
630630

@@ -666,9 +666,9 @@ func parseTypeReference(lexer: Lexer) throws -> Type {
666666
*/
667667
func parseNamedType(lexer: Lexer) throws -> NamedType {
668668
let start = lexer.token
669-
return NamedType(
669+
return try NamedType(
670670
loc: loc(lexer: lexer, startToken: start),
671-
name: try parseName(lexer: lexer)
671+
name: parseName(lexer: lexer)
672672
)
673673
}
674674

@@ -909,12 +909,12 @@ func parseUnionTypeDefinition(lexer: Lexer) throws -> UnionTypeDefinition {
909909
try expectKeyword(lexer: lexer, value: "union")
910910
let name = try parseName(lexer: lexer)
911911
let directives = try parseDirectives(lexer: lexer)
912-
return UnionTypeDefinition(
912+
return try UnionTypeDefinition(
913913
loc: loc(lexer: lexer, startToken: start),
914914
description: description,
915915
name: name,
916916
directives: directives,
917-
types: try parseUnionMembers(lexer: lexer)
917+
types: parseUnionMembers(lexer: lexer)
918918
)
919919
}
920920

@@ -1290,7 +1290,7 @@ func any<T>(
12901290
var nodes: [T] = []
12911291

12921292
while try !skip(lexer: lexer, kind: closeKind) {
1293-
nodes.append(try parse(lexer))
1293+
try nodes.append(parse(lexer))
12941294
}
12951295

12961296
return nodes
@@ -1313,7 +1313,7 @@ func optionalMany<T>(
13131313
}
13141314
var nodes: [T] = []
13151315
while try !skip(lexer: lexer, kind: closeKind) {
1316-
nodes.append(try parse(lexer))
1316+
try nodes.append(parse(lexer))
13171317
}
13181318
return nodes
13191319
}
@@ -1333,7 +1333,7 @@ func many<T>(
13331333
try expect(lexer: lexer, kind: openKind)
13341334
var nodes = [try parse(lexer)]
13351335
while try !skip(lexer: lexer, kind: closeKind) {
1336-
nodes.append(try parse(lexer))
1336+
try nodes.append(parse(lexer))
13371337
}
13381338
return nodes
13391339
}

Sources/GraphQL/Type/Definition.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ func defineFieldMap(name: String, fields: GraphQLFieldMap) throws -> GraphQLFiel
393393
for (name, config) in fields {
394394
try assertValid(name: name)
395395

396-
let field = GraphQLFieldDefinition(
396+
let field = try GraphQLFieldDefinition(
397397
name: name,
398398
type: config.type,
399399
description: config.description,
400400
deprecationReason: config.deprecationReason,
401-
args: try defineArgumentMap(args: config.args),
401+
args: defineArgumentMap(args: config.args),
402402
resolve: config.resolve,
403403
subscribe: config.subscribe
404404
)

Sources/GraphQL/Utilities/NIO+Extensions.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public extension EventLoopFuture {
118118
///
119119
/// The key difference between this method and the regular `flatMap` is error handling.
120120
///
121-
/// With `tryFlatMap`, the provided callback _may_ throw Errors, causing the returned `EventLoopFuture<Value>`
121+
/// With `tryFlatMap`, the provided callback _may_ throw Errors, causing the returned
122+
/// `EventLoopFuture<Value>`
122123
/// to report failure immediately after the completion of the original `EventLoopFuture`.
123124
flatMap { [eventLoop] value in
124125
do {

0 commit comments

Comments
 (0)