Merge pull request #176 from apollostack/minor-refactor

Minor refactor
apollographql · May 5, 2016 · e7c1248 · e7c1248
2 parents bc65a15 + ebf063d
commit e7c1248
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/src/data/resultUtils.ts b/src/data/resultUtils.ts
diff --git a/src/data/store.ts b/src/data/store.ts
@@ -24,7 +24,7 @@ import {
 
 import {
   graphQLResultHasError,
-} from './resultUtils';
+} from './storeUtils';
 
 export interface NormalizedCache {
   [dataId: string]: StoreObject;

diff --git a/src/data/storeUtils.ts b/src/data/storeUtils.ts
@@ -5,10 +5,12 @@ import {
   StringValue,
   BooleanValue,
   Variable,
+  InlineFragment,
   Value,
+  Selection,
+  GraphQLResult,
 } from 'graphql';
 
-
 import includes = require('lodash.includes');
 
 type ScalarValue = IntValue | FloatValue | StringValue | BooleanValue;
@@ -52,3 +54,15 @@ export function resultKeyNameFromField(field: Field): string {
     field.alias.value :
     field.name.value;
 }
+
+export function isField(selection: Selection): selection is Field {
+  return selection.kind === 'Field';
+}
+
+export function isInlineFragment(selection: Selection): selection is InlineFragment {
+  return selection.kind === 'InlineFragment';
+}
+
+export function graphQLResultHasError(result: GraphQLResult) {
+  return result.errors && result.errors.length;
+}
diff --git a/src/data/writeToStore.ts b/src/data/writeToStore.ts
@@ -14,15 +14,15 @@ import {
 import {
   storeKeyNameFromField,
   resultKeyNameFromField,
+  isField,
+  isInlineFragment,
 } from './storeUtils';
 
 import {
   OperationDefinition,
   SelectionSet,
-  Selection,
   FragmentDefinition,
   Field,
-  InlineFragment,
   Document,
 } from 'graphql';
 
@@ -250,11 +250,3 @@ function writeFieldToStore({
 
   store[dataId] = newStoreObj;
 }
-
-function isField(selection: Selection): selection is Field {
-  return selection.kind === 'Field';
-}
-
-function isInlineFragment(selection: Selection): selection is InlineFragment {
-  return selection.kind === 'InlineFragment';
-}
diff --git a/src/queries/store.ts b/src/queries/store.ts
@@ -9,7 +9,7 @@ import {
 
 import {
   graphQLResultHasError,
-} from '../data/resultUtils';
+} from '../data/storeUtils';
 
 import {
   SelectionSet,