Don't import locally defined fragment types

Reviewed By: kassens Differential Revision: D6849018 fbshipit-source-id: 84636771b23c9285f49a13527162613d8d7edd17
facebook · Jan 30, 2018 · 7985449 · 7985449 · kastermester · Feb 8, 2018
1 parent 970c254
commit 7985449
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/packages/relay-compiler/core/RelayFlowGenerator.js b/packages/relay-compiler/core/RelayFlowGenerator.js
@@ -59,6 +59,7 @@ type Options = {|
 
 export type State = {|
   ...Options,
+  +generatedFragments: Set<string>,
   +usedEnums: {[name: string]: GraphQLEnumType},
   +usedFragments: Set<string>,
 |};
@@ -228,6 +229,7 @@ function createVisitor(options: Options) {
     customScalars: options.customScalars,
     enumsHasteModule: options.enumsHasteModule,
     existingFragmentNames: options.existingFragmentNames,
+    generatedFragments: new Set(),
     inputFieldWhiteList: options.inputFieldWhiteList,
     relayRuntimeModule: options.relayRuntimeModule,
     usedEnums: {},
@@ -270,6 +272,7 @@ function createVisitor(options: Options) {
           }
           return [selection];
         });
+        state.generatedFragments.add(node.name);
         const refTypeName = getRefTypeName(node.name);
         const refType = t.expressionStatement(
           t.identifier(
@@ -406,12 +409,14 @@ function getFragmentImports(state: State) {
     const usedFragments = Array.from(state.usedFragments).sort();
     for (const usedFragment of usedFragments) {
       const refTypeName = getRefTypeName(usedFragment);
-      if (state.useHaste && state.existingFragmentNames.has(usedFragment)) {
-        // TODO(T22653277) support non-haste environments when importing
-        // fragments
-        imports.push(importTypes([refTypeName], usedFragment + '.graphql'));
-      } else {
-        imports.push(anyTypeAlias(refTypeName));
+      if (!state.generatedFragments.has(usedFragment)) {
+        if (state.useHaste && state.existingFragmentNames.has(usedFragment)) {
+          // TODO(T22653277) support non-haste environments when importing
+          // fragments
+          imports.push(importTypes([refTypeName], usedFragment + '.graphql'));
+        } else {
+          imports.push(anyTypeAlias(refTypeName));
+        }
       }
     }
   }

diff --git a/packages/relay-compiler/core/__tests__/__snapshots__/RelayFlowGenerator-test.js.snap b/packages/relay-compiler/core/__tests__/__snapshots__/RelayFlowGenerator-test.js.snap
@@ -359,6 +359,25 @@ export type PluralFragment = $ReadOnlyArray<{|
 |}>;
 `;
 
+exports[`RelayFlowGenerator matches expected output: recursive-fragments.graphql 1`] = `
+~~~~~~~~~~ INPUT ~~~~~~~~~~
+fragment FragmentSpread on Node {
+  id
+  ... @include(if: $condition) {
+    ...FragmentSpread
+  }
+}
+
+~~~~~~~~~~ OUTPUT ~~~~~~~~~~
+import type { FragmentReference } from 'relay-runtime';
+declare export opaque type FragmentSpread$ref: FragmentReference;
+export type FragmentSpread = {|
+  +id: string,
+  +$fragmentRefs: FragmentSpread$ref,
+  +$refType: FragmentSpread$ref,
+|};
+`;
+
 exports[`RelayFlowGenerator matches expected output: roots.graphql 1`] = `
 ~~~~~~~~~~ INPUT ~~~~~~~~~~
 query ExampleQuery($id: ID!) {

diff --git a/packages/relay-compiler/core/__tests__/fixtures/flow-generator/recursive-fragments.graphql b/packages/relay-compiler/core/__tests__/fixtures/flow-generator/recursive-fragments.graphql
@@ -0,0 +1,6 @@
+fragment FragmentSpread on Node {
+  id
+  ... @include(if: $condition) {
+    ...FragmentSpread
+  }
+}