Skip to content

Commit b6a0f51

Browse files
committed
feat(Mask) filter fields in Schema::Printer
1 parent a9d56c0 commit b6a0f51

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

lib/graphql/schema/printer.rb

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,10 @@ module FieldPrinter
163163
include ArgsPrinter
164164
include DescriptionPrinter
165165
def print_fields(type)
166-
<<<<<<< 137bcc8f6ab8d063ceff257cb4d00bf661f71d43
167-
type.all_fields.map.with_index{ |field, i|
166+
fields = type.all_fields.select { |f| schema.visible_field?(f) }
167+
fields.map.with_index { |field, i|
168168
"#{print_description(field, ' ', i == 0)}"\
169169
" #{field.name}#{print_args(field, ' ')}: #{field.type}#{print_deprecated(field)}"
170-
=======
171-
# TODO: filter
172-
type.all_fields.map{ |field|
173-
" #{field.name}#{print_args(field)}: #{field.type}#{print_deprecated(field)}"
174-
>>>>>>> feat(Mask) hide some types in schema print-out
175170
}.join("\n")
176171
end
177172
end
@@ -212,11 +207,15 @@ def self.print(type, schema)
212207
else
213208
implementations = nil
214209
end
210+
<<<<<<< 971205bf4f2a871cc525d07b1d1873cac8212acd
215211

216212
"#{print_description(type)}"\
217213
"type #{type.name}#{implementations} {\n"\
218214
"#{print_fields(type)}\n"\
219215
"}"
216+
=======
217+
"type #{type.name}#{implementations} {\n#{print_fields(type, schema)}\n}"
218+
>>>>>>> feat(Mask) filter fields in Schema::Printer
220219
end
221220
end
222221

@@ -228,8 +227,12 @@ def self.print(type)
228227
"#{print_description(type)}"\
229228
=======
230229
def self.print(type, schema)
230+
<<<<<<< 971205bf4f2a871cc525d07b1d1873cac8212acd
231231
>>>>>>> feat(Mask) hide some types in schema print-out
232232
"interface #{type.name} {\n#{print_fields(type)}\n}"
233+
=======
234+
"interface #{type.name} {\n#{print_fields(type, schema)}\n}"
235+
>>>>>>> feat(Mask) filter fields in Schema::Printer
233236
end
234237
end
235238

spec/graphql/schema/mask_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def get_recursive_field_type_names(field_result)
272272
schema_print = GraphQL::Schema::Printer.print_schema(MaskHelpers::Schema)
273273
mask_print = GraphQL::Schema::Printer.print_schema(mask)
274274
assert_includes schema_print, "Phoneme"
275-
refute_includes schema_print, "Phoneme"
275+
refute_includes mask_print, "Phoneme"
276276
end
277277
end
278278

0 commit comments

Comments
 (0)