Collect used variables in directives

Fixes #562
apollographql · Aug 19, 2016 · e4307ab · e4307ab
1 parent 65a18a4
commit e4307ab
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/src/data/diffAgainstStore.ts b/src/data/diffAgainstStore.ts
@@ -23,6 +23,7 @@ import {
 import {
   SelectionSet,
   Field,
+  Directive,
   Document,
   Selection,
   FragmentDefinition,
@@ -440,6 +441,22 @@ function collectUsedVariablesFromSelectionSet(selectionSet: SelectionSet) {
   })));
 }
 
+function collectUsedVariablesFromDirectives(directives: Directive[]) {
+  return flatten(directives.map(directive => {
+    if (directive.arguments) {
+      return flatten(directive.arguments.map(arg => {
+        if (arg.kind === 'Variable') {
+          return [(arg.value as Variable).name.value];
+        }
+
+        return [];
+      }));
+    }
+
+    return [];
+  }));
+}
+
 function collectUsedVariablesFromField(field: Field) {
   let variables = [];
 
@@ -460,6 +477,13 @@ function collectUsedVariablesFromField(field: Field) {
     ];
   }
 
+  if (field.directives) {
+    variables = [
+      ...variables,
+      ...collectUsedVariablesFromDirectives(field.directives),
+    ];
+  }
+
   return uniq(variables);
 }