fix missing output individual files options

Author: designatednerd

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

@@ -49,7 +49,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.classDeclarationForOperation(operations["HeroName"]);
+      generator.classDeclarationForOperation(operations["HeroName"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -67,7 +67,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.classDeclarationForOperation(operations["Hero"]);
+      generator.classDeclarationForOperation(operations["Hero"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -85,7 +85,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.classDeclarationForOperation(operations["Hero"]);
+      generator.classDeclarationForOperation(operations["Hero"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -127,7 +127,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.classDeclarationForOperation(operations["CreateReview"]);
+      generator.classDeclarationForOperation(operations["CreateReview"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -147,7 +147,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.classDeclarationForOperation(operations["Hero"]);
+      generator.classDeclarationForOperation(operations["Hero"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -182,7 +182,7 @@ describe("Swift code generation", () => {
         { generateOperationIds: true, mergeInFieldsFromFragmentSpreads: true }
       );
 
-      generator.classDeclarationForOperation(operations["Hero"]);
+      generator.classDeclarationForOperation(operations["Hero"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -360,7 +360,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.structDeclarationForFragment(fragments["HeroDetails"]);
+      generator.structDeclarationForFragment(fragments["HeroDetails"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -373,7 +373,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.structDeclarationForFragment(fragments["DroidDetails"]);
+      generator.structDeclarationForFragment(fragments["DroidDetails"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -388,7 +388,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.structDeclarationForFragment(fragments["HeroDetails"]);
+      generator.structDeclarationForFragment(fragments["HeroDetails"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -405,7 +405,7 @@ describe("Swift code generation", () => {
         }
       `);
 
-      generator.structDeclarationForFragment(fragments["HeroDetails"]);
+      generator.structDeclarationForFragment(fragments["HeroDetails"], false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -424,10 +424,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -444,10 +447,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -466,10 +472,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -491,10 +500,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -516,10 +528,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -539,10 +554,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -566,10 +584,13 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -586,18 +607,21 @@ describe("Swift code generation", () => {
       const selectionSet = (operations["Hero"].selectionSet
         .selections[0] as Field).selectionSet as SelectionSet;
 
-      generator.structDeclarationForSelectionSet({
-        structName: "Hero",
-        selectionSet
-      });
+      generator.structDeclarationForSelectionSet(
+        {
+          structName: "Hero",
+          selectionSet
+        },
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });
   });
 
   describe("#typeDeclarationForGraphQLType()", () => {
     it("should generate an enum declaration for a GraphQLEnumType", () => {
-      generator.typeDeclarationForGraphQLType(schema.getType("Episode"));
+      generator.typeDeclarationForGraphQLType(schema.getType("Episode"), false);
 
       expect(generator.output).toMatchSnapshot();
     });
@@ -608,13 +632,16 @@ describe("Swift code generation", () => {
         values: { PUBLIC: { value: "PUBLIC" }, PRIVATE: { value: "PRIVATE" } }
       });
 
-      generator.typeDeclarationForGraphQLType(albumPrivaciesEnum);
+      generator.typeDeclarationForGraphQLType(albumPrivaciesEnum, false);
 
       expect(generator.output).toMatchSnapshot();
     });
 
     it("should generate a struct declaration for a GraphQLInputObjectType", () => {
-      generator.typeDeclarationForGraphQLType(schema.getType("ReviewInput"));
+      generator.typeDeclarationForGraphQLType(
+        schema.getType("ReviewInput"),
+        false
+      );
 
       expect(generator.output).toMatchSnapshot();
     });

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

@@ -175,7 +175,7 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
       options: { namespace },
       fragments
     } = this.context;
-    const isRedundant = !!namespace;
+    const isRedundant = !!namespace && !outputIndividualFiles;
     const modifiers = isRedundant ? ["final"] : ["public", "final"];
 
     this.classDeclaration(