Handle cases when storing server-defined models in local state (#488)

* Handle cases when storing server-defined models in local state

* Add unit tests

Author: shadaj

packages/apollo-cli/src/commands/codegen/__tests__/__snapshots__/generate.test.ts.snap

@@ -355,11 +355,16 @@ export interface SimpleQuery_serverSideField {
   addedLocalData: string;
 }
 
+export interface SimpleQuery_localServerModel {
+  serverData: string;
+}
+
 export interface SimpleQuery {
   hello: string;
   localState: string;
   complexLocalState: SimpleQuery_complexLocalState;
   serverSideField: SimpleQuery_serverSideField;
+  localServerModel: SimpleQuery_localServerModel;
 }
 
 /* tslint:disable */
@@ -393,11 +398,16 @@ export interface SimpleQuery_serverSideField {
   addedLocalData: string;
 }
 
+export interface SimpleQuery_localServerModel {
+  serverData: string;
+}
+
 export interface SimpleQuery {
   hello: string;
   localState: string;
   complexLocalState: SimpleQuery_complexLocalState;
   serverSideField: SimpleQuery_serverSideField;
+  localServerModel: SimpleQuery_localServerModel;
 }
 
 /* tslint:disable */

packages/apollo-cli/src/commands/codegen/__tests__/fixtures/clientSideSchema.graphql

@@ -1,6 +1,7 @@
 extend type Query {
   localState: String!
   complexLocalState: LocalType!
+  localServerModel: ServerField!
 }
 
 type LocalType {

packages/apollo-cli/src/commands/codegen/__tests__/fixtures/clientSideSchemaQuery.graphql

@@ -9,4 +9,8 @@ query SimpleQuery {
     serverData
     addedLocalData @client
   }
+
+  localServerModel @client {
+    serverData # this is actually stored in the client though
+  }
 }

packages/apollo-cli/src/commands/codegen/__tests__/generate.test.ts

@@ -61,18 +61,7 @@ type RemovedType {
 
 const clientSideSchemaTag = `
 gql\`
-extend type Query {
-  localState: String!
-  complexLocalState: LocalType!
-}
-
-type LocalType {
-  someData: String!
-}
-
-extend type ServerField {
-  addedLocalData: String!
-}
+${clientSideSchema}
 \`
 `;
 

packages/apollo-codegen-core/src/compiler/index.ts

@@ -303,7 +303,7 @@ class Compiler {
           ]);
         }
 
-        if (!(fieldDef.astNode && (fieldDef.astNode as any).__client) && (isClient || fieldIsClient)) {
+        if (!(fieldDef.astNode && (fieldDef.astNode as any).__client) && fieldIsClient) {
           throw new GraphQLError(`Cannot query server-side field "${name}" on type "${String(parentType)}" with @client directive`, [
             selectionNode
           ]);