fix feature flags

Author: robrichard

src/__tests__/starWarsDeferredQuery-test.js

@@ -13,7 +13,7 @@ import {
 
 describe('Star Wars Query Deferred Tests', () => {
   describe('Compatibility', () => {
-    it('Can disable @defer and return would-be deferred data as part of initial result', async () => {
+    it('Should throw error if using @defer without enabling in the schema', async () => {
       const query = `
         query HeroNameQuery {
           hero {

src/__tests__/starWarsStreamQuery-test.js

@@ -13,7 +13,7 @@ import {
 
 describe('Star Wars Query Stream Tests', () => {
   describe('Compatibility', () => {
-    it('Can disable @stream and return would-be streamed data as part of initial result', async () => {
+    it('Should throw error if using @stream without enabling in the schema', async () => {
       const query = `
         query HeroFriendsQuery {
           hero {
@@ -26,24 +26,12 @@ describe('Star Wars Query Stream Tests', () => {
       `;
       const result = await graphql(StarWarsSchema, query);
       expect(result).to.deep.equal({
-        data: {
-          hero: {
-            friends: [
-              {
-                id: '1000',
-                name: 'Luke Skywalker',
-              },
-              {
-                id: '1002',
-                name: 'Han Solo',
-              },
-              {
-                id: '1003',
-                name: 'Leia Organa',
-              },
-            ],
+        errors: [
+          {
+            message: 'Unknown directive "@stream".',
+            locations: [{ line: 4, column: 21 }],
           },
-        },
+        ],
       });
     });
     it('Can disable @stream using if argument', async () => {

src/type/schema.js

@@ -142,8 +142,8 @@ export class GraphQLSchema {
   // Used as a cache for validateSchema().
   __validationErrors: ?$ReadOnlyArray<GraphQLError>;
   // Referenced by execute()
-  __experimentalDefer: boolean;
-  __experimentalStream: boolean;
+  __experimentalDefer: ?boolean;
+  __experimentalStream: ?boolean;
 
   constructor(config: $ReadOnly<GraphQLSchemaConfig>): void {
     // If this schema was built from a source known to be valid, then it may be
@@ -166,7 +166,6 @@ export class GraphQLSchema {
     this.astNode = config.astNode;
     this.extensionASTNodes = config.extensionASTNodes;
 
-    this.__experimentalStream = config.experimentalStream || false;
     this._queryType = config.query;
     this._mutationType = config.mutation;
     this._subscriptionType = config.subscription;
@@ -185,18 +184,14 @@ export class GraphQLSchema {
       }
     }
 
-    if (config.__experimentalDefer) {
-      this.____experimentalDefer = true;
+    if (config.experimentalDefer) {
+      this.__experimentalDefer = true;
       this._directives = [].concat(this._directives, [GraphQLDeferDirective]);
-    } else {
-      this.____experimentalDefer = false;
     }
 
     if (config.experimentalStream) {
       this.__experimentalStream = true;
       this._directives = [].concat(this._directives, [GraphQLStreamDirective]);
-    } else {
-      this.__experimentalStream = false;
     }
 
     if (this._queryType != null) {