Refactor store code and move global state to store/data instead (#134)

* Move store code to src/store/

* Refactor to move all global state to store/data

* Add some more comments to store/data.ts

* Simplify updateDependencies

src/ast/index.ts

@@ -1,3 +1,4 @@
 export { getFieldArguments, normalizeVariables } from './variables';
+export { SchemaPredicates } from './schemaPredicates';
 export * from './traversal';
 export * from './node';

src/ast/variables.ts

@@ -4,8 +4,8 @@ import {
   valueFromASTUntyped,
 } from 'graphql';
 
-import { makeDict } from '../helpers/dict';
 import { getName } from './node';
+import { makeDict } from '../store';
 import { Variables } from '../types';
 
 /** Evaluates a fields arguments taking vars into account */

src/cacheExchange.ts

@@ -10,9 +10,8 @@ import {
 import { IntrospectionQuery } from 'graphql';
 import { filter, map, merge, pipe, share, tap } from 'wonka';
 import { query, write, writeOptimistic } from './operations';
-import { SchemaPredicates } from './ast/schemaPredicates';
-import { makeDict } from './helpers/dict';
-import { Store } from './store';
+import { SchemaPredicates } from './ast';
+import { makeDict, Store, clearOptimistic } from './store';
 
 import {
   UpdatesConfig,
@@ -208,7 +207,7 @@ export const cacheExchange = (opts?: CacheExchangeOpts): Exchange => ({
     const { key } = operation;
     if (optimisticKeys.has(key)) {
       optimisticKeys.delete(key);
-      store.clearOptimistic(key);
+      clearOptimistic(store.data, key);
     }
 
     let writeDependencies: Set<string> | void;

src/index.ts

@@ -1,5 +1,5 @@
 export * from './operations';
 export * from './types';
-export { Store } from './store';
+export { Store, initDataState, clearDataState } from './store';
 export { cacheExchange } from './cacheExchange';
 export { populateExchange } from './populateExchange';

src/operations/invalidate.test.ts

@@ -1,7 +1,8 @@
-import { Store, initStoreState, clearStoreState } from '../store';
 import gql from 'graphql-tag';
 import { write } from './write';
 import { invalidate } from './invalidate';
+import * as InMemoryData from '../store/data';
+import { Store } from '../store';
 import { SchemaPredicates } from '../ast/schemaPredicates';
 
 const TODO_QUERY = gql`
@@ -48,11 +49,7 @@ describe('Query', () => {
     );
     spy.console = jest.spyOn(console, 'warn');
 
-    initStoreState(store, 0);
-  });
-
-  afterEach(() => {
-    clearStoreState();
+    InMemoryData.initDataState(store.data, 0);
   });
 
   it('should warn once for invalid fields on an entity', () => {

src/operations/invalidate.ts

@@ -17,10 +17,10 @@ import {
   SelectionSet,
 } from '../types';
 
-import { Store, addDependency } from '../store';
+import * as InMemoryData from '../store/data';
+import { Store, keyOfField } from '../store';
+import { SchemaPredicates } from '../ast';
 import { SelectionIterator } from './shared';
-import { joinKeys, keyOfField } from '../helpers';
-import { SchemaPredicates } from '../ast/schemaPredicates';
 
 interface Context {
   store: Store;
@@ -51,17 +51,15 @@ export const invalidateSelection = (
   entityKey: string,
   select: SelectionSet
 ) => {
-  const { store } = ctx;
   const isQuery = entityKey === 'Query';
 
   let typename: EntityField;
   if (!isQuery) {
-    addDependency(entityKey);
-    typename = store.getField(entityKey, '__typename');
+    typename = InMemoryData.readRecord(entityKey, '__typename');
     if (typeof typename !== 'string') {
       return;
     } else {
-      store.writeRecord(undefined, entityKey, keyOfField('__typename'));
+      InMemoryData.writeRecord(entityKey, '__typename', undefined);
     }
   } else {
     typename = entityKey;
@@ -76,7 +74,6 @@ export const invalidateSelection = (
       fieldName,
       getFieldArguments(node, ctx.variables)
     );
-    const key = joinKeys(entityKey, fieldKey);
 
     if (
       process.env.NODE_ENV !== 'production' &&
@@ -86,15 +83,14 @@ export const invalidateSelection = (
       ctx.schemaPredicates.isFieldAvailableOnType(typename, fieldName);
     }
 
-    if (isQuery) addDependency(key);
-
     if (node.selectionSet === undefined) {
-      store.writeRecord(undefined, entityKey, fieldKey);
+      InMemoryData.writeRecord(entityKey, fieldKey, undefined);
     } else {
       const fieldSelect = getSelectionSet(node);
-      const link = store.getLink(entityKey, fieldKey);
-      store.writeLink(undefined, entityKey, fieldKey);
-      store.writeRecord(undefined, entityKey, fieldKey);
+      const link = InMemoryData.readLink(entityKey, fieldKey);
+
+      InMemoryData.writeLink(entityKey, fieldKey, undefined);
+      InMemoryData.writeRecord(entityKey, fieldKey, undefined);
 
       if (Array.isArray(link)) {
         for (let i = 0, l = link.length; i < l; i++) {