fix(fragment): fix filter function logic for PR #94 and issue #90

evenchange4 · May 21, 2019 · c085590 · c085590
1 parent 3e11be6
commit c085590
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/__tests__/__snapshots__/macro.test.js.snap b/src/__tests__/__snapshots__/macro.test.js.snap
@@ -131,7 +131,7 @@ const query = {
         }
       }]
     }
-  }].concat(frag1.definitions, frag2.definitions).reduce((acc, definition) => definition.kind !== "FragmentDefinition" || acc.find(curDef => curDef.name.value === definition.name.value) ? acc : acc.concat(definition), []),
+  }].concat(frag1.definitions, frag2.definitions).reduce((acc, definition) => definition.kind === 'FragmentDefinition' && acc.find(curDef => curDef.kind === 'FragmentDefinition' && curDef.name.value === definition.name.value) ? acc : acc.concat(definition), []),
   "loc": {
     "start": 0,
     "end": 39,
@@ -262,7 +262,7 @@ const query = {
         }
       }]
     }
-  }].concat(userFragment.definitions).reduce((acc, definition) => definition.kind !== "FragmentDefinition" || acc.find(curDef => curDef.name.value === definition.name.value) ? acc : acc.concat(definition), []),
+  }].concat(userFragment.definitions).reduce((acc, definition) => definition.kind === 'FragmentDefinition' && acc.find(curDef => curDef.kind === 'FragmentDefinition' && curDef.name.value === definition.name.value) ? acc : acc.concat(definition), []),
   "loc": {
     "start": 0,
     "end": 82,

diff --git a/src/utils/compileWithFragment.js b/src/utils/compileWithFragment.js
@@ -4,12 +4,17 @@ import serialize from 'babel-literal-to-ast';
 import template from '@babel/template';
 
 /**
+ * TODO: Reduce runtime to improve performance
  * ref: https://github.com/gajus/babel-plugin-graphql-tag/blob/35edbae44990bf20be2de7139dc0ce5843f70bff/src/index.js#L25
  */
 const uniqueFn = template.ast(`
   (acc, definition) =>
-    definition.kind !== "FragmentDefinition" ||
-    acc.find(curDef => curDef.name.value === definition.name.value)
+    definition.kind === 'FragmentDefinition' &&
+    acc.find(
+      curDef =>
+        curDef.kind === 'FragmentDefinition' &&
+        curDef.name.value === definition.name.value,
+    )
       ? acc
       : acc.concat(definition)
 `);