Upgrade to GraphQL 0.5.0

facebook · May 5, 2016 · fe9fa91 · fe9fa91
1 parent 1941fcb
commit fe9fa91
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 121 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "eslint-plugin-react": "^5.0.1",
     "fbjs-scripts": "^0.7.0",
     "flow-bin": "0.24.1",
-    "graphql": "0.4.13",
+    "graphql": "0.5.0",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-derequire": "^2.1.0",

diff --git a/scripts/babel-relay-plugin/lib/HASH b/scripts/babel-relay-plugin/lib/HASH
@@ -1 +1 @@
-poYhnSoUhrpmb95d1rq1EP9B9BE=
+gPEyhVvztpBecZiMXer9Doo+wGw=
diff --git a/scripts/babel-relay-plugin/lib/RelayQLAST.js b/scripts/babel-relay-plugin/lib/RelayQLAST.js
@@ -539,7 +539,7 @@ var RelayQLType = function () {
         } else if (types.isAbstractType(type) && fieldAST && fieldAST.directives && fieldAST.directives.some(function (directive) {
           return directive.name.value === 'fixme_fat_interface';
         })) {
-          var possibleTypes = type.getPossibleTypes();
+          var possibleTypes = this.context.schema.getPossibleTypes();
 
           var _loop = function _loop(ii) {
             var possibleField = possibleTypes[ii].getFields()[fieldName];
@@ -589,7 +589,7 @@ var RelayQLType = function () {
       var _this16 = this;
 
       invariant(this.isAbstract(), 'Cannot get concrete types of a concrete type.');
-      return this.schemaUnmodifiedType.getPossibleTypes().map(function (concreteType) {
+      return this.context.schema.getPossibleTypes().map(function (concreteType) {
         return new RelayQLType(_this16.context, concreteType);
       });
     }

diff --git a/scripts/babel-relay-plugin/lib/tools/generateSchemaJson.js b/scripts/babel-relay-plugin/lib/tools/generateSchemaJson.js
@@ -31,7 +31,7 @@ try {
 
     var body = fs.readFileSync(inFile, 'utf8');
     var ast = language.parse(body);
-    var astSchema = utilities.buildASTSchema(ast, 'Root', 'Mutation', 'Subscription');
+    var astSchema = utilities.buildASTSchema(ast);
     graphql.graphql(astSchema, utilities.introspectionQuery).then(function (result) {
       var out = JSON.stringify(result, null, 2);
       fs.writeFileSync(outFile, out);
@@ -40,4 +40,4 @@ try {
 } catch (error) {
   console.error(error);
   console.error(error.stack);
-}
+}
diff --git a/scripts/babel-relay-plugin/package.json b/scripts/babel-relay-plugin/package.json
@@ -42,7 +42,7 @@
     "rimraf": "^2.5.2"
   },
   "dependencies": {
-    "graphql": "^0.4.18"
+    "graphql": "^0.5.0"
   },
   "jest": {
     "persistModuleRegistryBetweenSpecs": true,

diff --git a/scripts/babel-relay-plugin/src/RelayQLAST.js b/scripts/babel-relay-plugin/src/RelayQLAST.js
@@ -498,7 +498,7 @@ class RelayQLType {
           directive => directive.name.value === 'fixme_fat_interface'
         )
       ) {
-        const possibleTypes = type.getPossibleTypes();
+        const possibleTypes = this.context.schema.getPossibleTypes();
         for (let ii = 0; ii < possibleTypes.length; ii++) {
           const possibleField = possibleTypes[ii].getFields()[fieldName];
           if (possibleField) {
@@ -541,7 +541,7 @@ class RelayQLType {
       this.isAbstract(),
       'Cannot get concrete types of a concrete type.'
     );
-    return this.schemaUnmodifiedType.getPossibleTypes().map(
+    return this.context.schema.getPossibleTypes().map(
       concreteType => new RelayQLType(this.context, concreteType)
     );
   }

diff --git a/scripts/babel-relay-plugin/src/__tests__/testschema.rfc.graphql b/scripts/babel-relay-plugin/src/__tests__/testschema.rfc.graphql
@@ -182,3 +182,9 @@ enum Gender {
 }
 
 union Media = Story | ProfilePicture
+
+schema {
+  query: Root
+  mutation: Mutation
+  subscription: Subscription
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		poYhnSoUhrpmb95d1rq1EP9B9BE=
		gPEyhVvztpBecZiMXer9Doo+wGw=