@@ -6,11 +6,11 @@ func print(ast: Node) -> String {
66 ast. printed
77}
88
9- fileprivate protocol Printable {
9+ private protocol Printable {
1010 var printed : String { get }
1111}
1212
13- fileprivate let MAX_LINE_LENGTH = 80
13+ private let MAX_LINE_LENGTH = 80
1414
1515extension Name : Printable {
1616 var printed : String { value }
@@ -36,7 +36,7 @@ extension OperationDefinition: Printable {
3636 let prefix = join ( [
3737 operation. rawValue,
3838 join ( [ name, varDefs] ) ,
39- join ( directives, " " )
39+ join ( directives, " " ) ,
4040 ] , " " )
4141
4242 // Anonymous queries with no directives or variable definitions can use
@@ -73,7 +73,7 @@ extension Field: Printable {
7373 argsLine,
7474 wrap ( " " , join ( directives, " " ) ) ,
7575 wrap ( " " , selectionSet) ,
76- ] ) ;
76+ ] )
7777 }
7878}
7979
@@ -84,6 +84,7 @@ extension Argument: Printable {
8484}
8585
8686// TODO: Add Nullability Modifiers
87+
8788// MARK: - Nullability Modifiers
8889
8990//
@@ -117,14 +118,15 @@ extension InlineFragment: Printable {
117118 " ... " ,
118119 wrap ( " on " , typeCondition) ,
119120 join ( directives, " " ) ,
120- selectionSet
121+ selectionSet,
121122 ] , " " )
122123 }
123124}
124125
125126extension FragmentDefinition : Printable {
126127 var printed : String {
127- " fragment " + name + " on " + typeCondition + " " + wrap( " " , join ( directives, " " ) , " " ) + selectionSet
128+ " fragment " + name + " on " + typeCondition + " " + wrap( " " , join ( directives, " " ) , " " ) +
129+ selectionSet
128130 }
129131}
130132
@@ -210,8 +212,8 @@ extension NonNullType: Printable {
210212
211213extension SchemaDefinition : Printable {
212214 var printed : String {
213- wrap ( " " , description, " \n " ) +
214- join( [ " schema " , join ( directives, " " ) , block ( operationTypes) ] , " " )
215+ wrap ( " " , description, " \n " ) +
216+ join( [ " schema " , join ( directives, " " ) , block ( operationTypes) ] , " " )
215217 }
216218}
217219
@@ -221,15 +223,24 @@ extension OperationTypeDefinition: Printable {
221223
222224extension ScalarTypeDefinition : Printable {
223225 var printed : String {
224- wrap ( " " , description, " \n " ) +
225- join( [ " scalar " , name. printed, join ( directives, " " ) ] , " " )
226+ wrap ( " " , description, " \n " ) +
227+ join( [ " scalar " , name. printed, join ( directives, " " ) ] , " " )
226228 }
227229}
228230
229231extension ObjectTypeDefinition : Printable {
230232 var printed : String {
231233 wrap ( " " , description, " \n " ) +
232- join( [ " type " , name, wrap ( " implements " , join ( interfaces, " & " ) ) , join ( directives, " " ) , block ( fields) ] , " " )
234+ join(
235+ [
236+ " type " ,
237+ name,
238+ wrap ( " implements " , join ( interfaces, " & " ) ) ,
239+ join ( directives, " " ) ,
240+ block ( fields) ,
241+ ] ,
242+ " "
243+ )
233244 }
234245}
235246
@@ -248,42 +259,58 @@ extension FieldDefinition: Printable {
248259extension InputValueDefinition : Printable {
249260 var printed : String {
250261 wrap ( " " , description, " \n " ) +
251- join( [ name + " : " + type. printed, wrap ( " = " , defaultValue? . printed) , join ( directives, " " ) ] , " " )
262+ join(
263+ [
264+ name + " : " + type. printed,
265+ wrap ( " = " , defaultValue? . printed) ,
266+ join ( directives, " " ) ,
267+ ] ,
268+ " "
269+ )
252270 }
253271}
254272
255273extension InterfaceTypeDefinition : Printable {
256274 var printed : String {
257275 wrap ( " " , description, " \n " ) +
258- join( [ " interface " , name, wrap ( " implements " , join ( interfaces, " & " ) ) , join ( directives, " " ) , block ( fields) ] , " " )
276+ join(
277+ [
278+ " interface " ,
279+ name,
280+ wrap ( " implements " , join ( interfaces, " & " ) ) ,
281+ join ( directives, " " ) ,
282+ block ( fields) ,
283+ ] ,
284+ " "
285+ )
259286 }
260287}
261288
262289extension UnionTypeDefinition : Printable {
263290 var printed : String {
264291 wrap ( " " , description, " \n " ) +
265- join( [ " union " , name, join ( directives, " " ) , wrap ( " = " , join ( types, " | " ) ) ] , " " )
292+ join( [ " union " , name, join ( directives, " " ) , wrap ( " = " , join ( types, " | " ) ) ] , " " )
266293 }
267294}
268295
269296extension EnumTypeDefinition : Printable {
270297 var printed : String {
271298 wrap ( " " , description, " \n " ) +
272- join( [ " enum " , name, join ( directives, " " ) , block ( values) ] , " " )
299+ join( [ " enum " , name, join ( directives, " " ) , block ( values) ] , " " )
273300 }
274301}
275302
276303extension EnumValueDefinition : Printable {
277304 var printed : String {
278- wrap ( " " , description, " \n " ) +
279- join( [ name, join ( directives, " " ) ] , " " )
305+ wrap ( " " , description, " \n " ) +
306+ join( [ name, join ( directives, " " ) ] , " " )
280307 }
281308}
282309
283310extension InputObjectTypeDefinition : Printable {
284311 var printed : String {
285312 wrap ( " " , description, " \n " ) +
286- join( [ " input " , name, join ( directives, " " ) , block ( fields) ] , " " )
313+ join( [ " input " , name, join ( directives, " " ) , block ( fields) ] , " " )
287314 }
288315}
289316
@@ -292,8 +319,8 @@ extension DirectiveDefinition: Printable {
292319 let prefix = wrap ( " " , description, " \n " ) + " directive @ " + name
293320
294321 let args = hasMultilineItems ( arguments) ?
295- wrap ( " ( \n " , indent ( join ( arguments, " \n " ) ) , " \n ) " ) :
296- wrap ( " ( " , join ( arguments, " , " ) , " ) " )
322+ wrap ( " ( \n " , indent ( join ( arguments, " \n " ) ) , " \n ) " ) :
323+ wrap ( " ( " , join ( arguments, " , " ) , " ) " )
297324
298325 return prefix + args + ( repeatable ? " repeatable " : " " ) + " on " + join( locations, " | " )
299326 }
@@ -342,85 +369,85 @@ extension InputObjectExtensionDefinition: Printable {
342369}
343370
344371/// If content is not null or empty, then wrap with start and end, otherwise print an empty string.
345- fileprivate func wrap( _ start: String , _ content: String ? , _ end: String = " " ) -> String {
372+ private func wrap( _ start: String , _ content: String ? , _ end: String = " " ) -> String {
346373 guard let content = content, !content. isEmpty else {
347374 return " "
348375 }
349376 return start + content + end
350377}
351378
352- fileprivate func wrap( _ start: String , _ content: Printable ? , _ end: String = " " ) -> String {
379+ private func wrap( _ start: String , _ content: Printable ? , _ end: String = " " ) -> String {
353380 wrap ( start, content? . printed, end)
354381}
355382
356- fileprivate func indent( _ string: String ) -> String {
383+ private func indent( _ string: String ) -> String {
357384 wrap ( " " , string. replacingOccurrences ( of: " \n " , with: " \n " ) )
358385}
359386
360- fileprivate func indent( _ string: Printable ) -> String {
387+ private func indent( _ string: Printable ) -> String {
361388 indent ( string. printed)
362389}
363390
364391/// Given array, print an empty string if it is null or empty, otherwise
365392/// print all items together separated by separator if provided
366- fileprivate func join( _ array: [ String ? ] ? , _ seperator: String = " " ) -> String {
393+ private func join( _ array: [ String ? ] ? , _ seperator: String = " " ) -> String {
367394 array? . compactMap { $0 } . filter { !$0. isEmpty } . joined ( separator: seperator) ?? " "
368395}
369396
370- fileprivate func join( _ array: [ Printable ? ] ? , _ seperator: String = " " ) -> String {
397+ private func join( _ array: [ Printable ? ] ? , _ seperator: String = " " ) -> String {
371398 join ( array? . map { $0? . printed } , seperator)
372399}
373400
374401/// Given array, print each item on its own line, wrapped in an indented `{ }` block.
375- fileprivate func block( _ array: [ String ? ] ? ) -> String {
402+ private func block( _ array: [ String ? ] ? ) -> String {
376403 wrap ( " { \n " , indent ( join ( array, " \n " ) ) , " \n } " )
377404}
378405
379- fileprivate func block( _ array: [ Printable ? ] ? ) -> String {
406+ private func block( _ array: [ Printable ? ] ? ) -> String {
380407 block ( array? . map { $0? . printed } )
381408}
382409
383- fileprivate func hasMultilineItems( _ array: [ String ] ? ) -> Bool {
410+ private func hasMultilineItems( _ array: [ String ] ? ) -> Bool {
384411 // FIXME: https://github.com/graphql/graphql-js/issues/2203
385412 array? . contains { x in x. contains { $0. isNewline } } ?? false
386413}
387414
388- fileprivate func hasMultilineItems( _ array: [ Printable ] ? ) -> Bool {
415+ private func hasMultilineItems( _ array: [ Printable ] ? ) -> Bool {
389416 hasMultilineItems ( array? . map { $0. printed } )
390417}
391418
392- fileprivate func + ( lhs: String , rhs: Printable ) -> String {
419+ private func + ( lhs: String , rhs: Printable ) -> String {
393420 lhs + rhs. printed
394421}
395422
396- fileprivate func + ( lhs: Printable , rhs: String ) -> String {
423+ private func + ( lhs: Printable , rhs: String ) -> String {
397424 lhs. printed + rhs
398425}
399426
400427extension String : Printable {
401428 fileprivate var printed : String { self }
402429}
403430
404- extension Node {
405- fileprivate var printed : String {
431+ private extension Node {
432+ var printed : String {
406433 ( self as? Printable ) ? . printed ?? " UnknownNode "
407434 }
408435}
409436
410- extension Value {
411- fileprivate var printed : String {
437+ private extension Value {
438+ var printed : String {
412439 ( self as? Printable ) ? . printed ?? " UnknownValue "
413440 }
414441}
415442
416- extension Selection {
417- fileprivate var printed : String {
443+ private extension Selection {
444+ var printed : String {
418445 ( self as? Printable ) ? . printed ?? " UnknownSelection "
419446 }
420447}
421448
422- extension ` Type` {
423- fileprivate var printed : String {
449+ private extension Type {
450+ var printed : String {
424451 ( self as? Printable ) ? . printed ?? " UnknownType "
425452 }
426453}
0 commit comments