add more tests, make fragment removal recursive

Author: justinanastos

packages/apollo-language-server/src/project/client.ts

@@ -385,12 +385,13 @@ export class GraphQLClientProject extends GraphQLProject {
       (!clientSchemaDirectives || !clientSchemaDirectives.length)
     )
       return current;
+    console.warn({ clientOnlyDirectives, clientSchemaDirectives });
 
     const filtered = Object.create(null);
     for (const operationName in current) {
       const document = current[operationName];
 
-      let serviceOnly: DocumentNode = removeDirectiveAnnotatedFields(
+      let serviceOnly = removeDirectiveAnnotatedFields(
         removeDirectives(document, clientOnlyDirectives as string[]),
         clientSchemaDirectives as string[]
       );

packages/apollo-language-server/src/utilities/__tests__/graphql.test.ts

@@ -56,32 +56,28 @@ describe("withTypenameFieldAddedWhereNeeded", () => {
     const withTypenames = withTypenameFieldAddedWhereNeeded(query);
 
     expect(print(withTypenames)).toMatchInlineSnapshot(`
-      "query CartItems {
-        product {
-          __typename
-          items {
-            __typename
-            ... on Table {
-              __typename
-              material
-            }
-            ... on Paint {
-              __typename
-              color
+            "query CartItems {
+              product {
+                __typename
+                items {
+                  __typename
+                  ... on Table {
+                    __typename
+                    material
+                  }
+                  ... on Paint {
+                    __typename
+                    color
+                  }
+                }
+              }
             }
-          }
-        }
-      }
-      "
-    `);
+            "
+        `);
   });
 });
 
 describe("removeDirectiveAnnotatedFields", () => {
-  it("should be a function", () => {
-    expect(typeof removeDirectiveAnnotatedFields).toBe("function");
-  });
-
   it("should remove fields with matching directives", () => {
     expect(
       print(
@@ -91,14 +87,14 @@ describe("removeDirectiveAnnotatedFields", () => {
         )
       )
     ).toMatchInlineSnapshot(`
-            "query Query {
-              fieldToKeep
-            }
-            "
-        `);
+                  "query Query {
+                    fieldToKeep
+                  }
+                  "
+            `);
   });
 
-  it("should remove object fields with matching directives", () => {
+  it("trim selections sets that are client only", () => {
     expect(
       print(
         removeDirectiveAnnotatedFields(
@@ -121,6 +117,83 @@ describe("removeDirectiveAnnotatedFields", () => {
     `);
   });
 
+  it("should remove fragments when a directive is used on a fragment spread", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            {
+              me { name }
+              ...ClientFields @client
+            }
+            fragment ClientFields on Query {
+              hello
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+        "{
+          me {
+            name
+          }
+        }
+        "
+    `);
+  });
+
+  it("should remove fragments when client directive is used inline", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            {
+              me { name }
+              ... on Query @client {
+                hello
+              }
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+            "{
+              me {
+                name
+              }
+            }
+            "
+        `);
+  });
+
+  it("should remove fragments when the client directive is on the definition", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            fragment ClientObject on Query @client {
+              hello
+            }
+            {
+              me { name }
+              ... ClientObject
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      "{
+        me {
+          name
+        }
+      }
+      "
+    `);
+  });
+
   it("should remove fragments that become unused when antecendant directives are removed", () => {
     expect(
       print(
@@ -189,4 +262,150 @@ describe("removeDirectiveAnnotatedFields", () => {
       "
     `);
   });
+
+  it("should recursively remove fragments that become unused when antecendant directives are removed", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            fragment One on Node {
+              ...Two
+              user {
+                friends {
+                  name
+                  ...Two @client
+                }
+              }
+            }
+            fragment Two on Node {
+              id
+            }
+
+            query {
+              me {
+                ...One
+              }
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      "fragment One on Node {
+        ...Two
+        user {
+          friends {
+            name
+          }
+        }
+      }
+
+      fragment Two on Node {
+        id
+      }
+
+      {
+        me {
+          ...One
+        }
+      }
+      "
+    `);
+  });
+
+  it("should remove fragment spreads from @client fragment definitions", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            fragment One on Node @client {
+              ...Two
+            }
+
+            fragment Two on Node {
+              id
+            }
+
+            query {
+              me {
+                name
+                ...One
+              }
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      "{
+        me {
+          name
+        }
+      }
+      "
+    `);
+  });
+
+  it("should remove all operations that have no selection set after fragments are removed", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            fragment One on Node @client {
+              ...Two
+            }
+
+            fragment Two on Node {
+              id
+            }
+
+            {
+              name
+              me {
+                ...One
+              }
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      "{
+        name
+      }
+      "
+    `);
+  });
+
+  it("should not remove fragment definitions that weren't removed by `removeDirectiveAnnotatedFields`", () => {
+    expect(
+      print(
+        removeDirectiveAnnotatedFields(
+          parse(`
+            fragment One on Node {
+              id
+            }
+
+            {
+              me {
+                name
+              }
+            }
+          `),
+          ["client"]
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      "fragment One on Node {
+        id
+      }
+
+      {
+        me {
+          name
+        }
+      }
+      "
+    `);
+  });
 });