Revert "feat(apollo-cache-inmemory): support custom directives (apoll…

…ographql#2710)" This reverts commit de38f3c.
peggyrayzis · Jan 30, 2018 · cdaf3d6 · cdaf3d6
1 parent 219078a
commit cdaf3d6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 84 deletions.
diff --git a/packages/apollo-cache-inmemory/src/__tests__/readFromStore.ts b/packages/apollo-cache-inmemory/src/__tests__/readFromStore.ts
@@ -165,38 +165,6 @@ describe('reading from the store', () => {
     });
   });
 
-  it('runs a basic query with custom directives', () => {
-    const query = gql`
-      query {
-        id
-        firstName @include(if: true)
-        lastName @upperCase
-        birthDate @dateFormat(format: "DD-MM-YYYY")
-      }
-    `;
-
-    const store = defaultNormalizedCacheFactory({
-      ROOT_QUERY: {
-        id: 'abcd',
-        firstName: 'James',
-        'lastName@upperCase': 'BOND',
-        'birthDate@dateFormat({"format":"DD-MM-YYYY"})': '20-05-1940',
-      },
-    });
-
-    const result = readQueryFromStore({
-      store,
-      query,
-    });
-
-    expect(result).toEqual({
-      id: 'abcd',
-      firstName: 'James',
-      lastName: 'BOND',
-      birthDate: '20-05-1940',
-    });
-  });
-
   it('runs a basic query with default values for arguments', () => {
     const query = gql`
       query someBigQuery(

diff --git a/packages/apollo-cache-inmemory/src/__tests__/writeToStore.ts b/packages/apollo-cache-inmemory/src/__tests__/writeToStore.ts
@@ -221,38 +221,6 @@ describe('writing to the store', () => {
     });
   });
 
-  it('properly normalizes a query with custom directives', () => {
-    const query = gql`
-      query {
-        id
-        firstName @include(if: true)
-        lastName @upperCase
-        birthDate @dateFormat(format: "DD-MM-YYYY")
-      }
-    `;
-
-    const result: any = {
-      id: 'abcd',
-      firstName: 'James',
-      lastName: 'BOND',
-      birthDate: '20-05-1940',
-    };
-
-    const normalized = writeQueryToStore({
-      result,
-      query,
-    });
-
-    expect(normalized.toObject()).toEqual({
-      ROOT_QUERY: {
-        id: 'abcd',
-        firstName: 'James',
-        'lastName@upperCase': 'BOND',
-        'birthDate@dateFormat({"format":"DD-MM-YYYY"})': '20-05-1940',
-      },
-    });
-  });
-
   it('properly normalizes a nested object with an ID', () => {
     const query = gql`
       {

diff --git a/packages/apollo-client/AUTHORS b/packages/apollo-client/AUTHORS
@@ -89,4 +89,3 @@ Robert Simon <[email protected]>
 Sondre Maere Overskaug <[email protected]>
 Tim Griesser <[email protected]>
 Adam Tuttle <[email protected]>
-Greg Bergé <[email protected]>
diff --git a/packages/apollo-utilities/CHANGELOG.md b/packages/apollo-utilities/CHANGELOG.md
@@ -6,9 +6,6 @@
 ### 1.1.1
 - Fix typo in error message for invalid argument being passed to @skip or @include directives [PR#2867](https://github.com/apollographql/apollo-client/pull/2867)
 
-### 1.1.0
-- update `getStoreKeyName` to support custom directives
-
 ### 1.0.5
 - package dependency updates
 

diff --git a/packages/apollo-utilities/src/storeUtils.ts b/packages/apollo-utilities/src/storeUtils.ts
@@ -164,8 +164,6 @@ export type Directives = {
   };
 };
 
-const KNOWN_DIRECTIVES: string[] = ['connection', 'include', 'skip'];
-
 export function getStoreKeyName(
   fieldName: string,
   args?: Object,
@@ -199,25 +197,13 @@ export function getStoreKeyName(
     }
   }
 
-  let completeFieldName: string = fieldName;
-
   if (args) {
     const stringifiedArgs: string = JSON.stringify(args);
-    completeFieldName += `(${stringifiedArgs})`;
-  }
 
-  if (directives) {
-    Object.keys(directives).forEach(key => {
-      if (KNOWN_DIRECTIVES.indexOf(key) !== -1) return;
-      if (directives[key] && Object.keys(directives[key]).length) {
-        completeFieldName += `@${key}(${JSON.stringify(directives[key])})`;
-      } else {
-        completeFieldName += `@${key}`;
-      }
-    });
+    return `${fieldName}(${stringifiedArgs})`;
   }
 
-  return completeFieldName;
+  return fieldName;
 }
 
 export function argumentsObjectFromField(