Skip redundant modifiers

Author: michaelnisi

packages/apollo-codegen-swift/src/codeGeneration.ts

@@ -168,10 +168,16 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
         throw new GraphQLError(`Unsupported operation type "${operationType}"`);
     }
 
+    const {
+      options: { namespace },
+      fragments
+    } = this.context;
+    const modifiers = !!namespace ? ["final"] : ["public", "final"];
+
     this.classDeclaration(
       {
         className,
-        modifiers: ["public", "final"],
+        modifiers: modifiers,
         adoptedProtocols: [protocol]
       },
       () => {
@@ -184,13 +190,13 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
 
         const fragmentsReferenced = collectFragmentsReferenced(
           operation.selectionSet,
-          this.context.fragments
+          fragments
         );
 
         if (this.context.options.generateOperationIds) {
           const { operationId } = generateOperationId(
             operation,
-            this.context.fragments,
+            fragments,
             fragmentsReferenced
           );
           operation.operationId = operationId;
@@ -343,7 +349,11 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
     before?: Function,
     after?: Function
   ) {
-    this.structDeclaration({ structName, adoptedProtocols }, () => {
+    const {
+      options: { namespace, mergeInFieldsFromFragmentSpreads }
+    } = this.context;
+
+    this.structDeclaration({ structName, adoptedProtocols, namespace }, () => {
       if (before) {
         before();
       }
@@ -383,7 +393,7 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
 
       const fields = collectAndMergeFields(
         variant,
-        !!this.context.options.mergeInFieldsFromFragmentSpreads
+        !!mergeInFieldsFromFragmentSpreads
       ).map(field => this.helpers.propertyFromField(field as Field));
 
       const fragmentSpreads = variant.fragmentSpreads.map(fragmentSpread => {

packages/apollo-codegen-swift/src/language.ts

@@ -13,6 +13,7 @@ export interface Struct {
   structName: string;
   adoptedProtocols?: string[];
   description?: string;
+  namespace?: string;
 }
 
 export interface Protocol {
@@ -136,13 +137,23 @@ export class SwiftGenerator<Context> extends CodeGenerator<
   }
 
   structDeclaration(
-    { structName, description, adoptedProtocols = [] }: Struct,
+    {
+      structName,
+      description,
+      adoptedProtocols = [],
+      namespace = undefined
+    }: Struct,
     closure: Function
   ) {
     this.printNewlineIfNeeded();
     this.comment(description);
+
+    const isRedundant =
+      adoptedProtocols.includes("GraphQLFragment") && !!namespace;
+    const modifier = isRedundant ? "" : "public ";
+
     this.printOnNewline(
-      `public struct ${escapeIdentifierIfNeeded(structName)}`
+      `${modifier}struct ${escapeIdentifierIfNeeded(structName)}`
     );
     this.print(wrap(": ", join(adoptedProtocols, ", ")));
     this.pushScope({ typeName: structName });