CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+### v2.4.0
+- Add support for descriptors [jamiter](https://github.com/jamiter) in [PR #99](https://github.com/apollographql/graphql-tag/pull/99)
+
+### v2.3.0
+- Add flow support [michalkvasnicak](https://github.com/michalkvasnicak) in [PR #98](https://github.com/apollographql/graphql-tag/pull/98)
+
 ### v2.2.2
 - Make parsing line endings kind agnostic [vlasenko](https://github.com/vlasenko) in [PR #95](https://github.com/apollographql/graphql-tag/pull/95)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-tag",
-  "version": "2.2.2",
+  "version": "2.4.0",
   "description": "A JavaScript template literal tag that parses GraphQL queries",
   "main": "./lib/graphql-tag.umd.js",
   "module": "./src/index.js",

src/index.js

@@ -1,6 +1,8 @@
 var parser = require('graphql/language/parser');
+var buildASTSchema = require('graphql/utilities/buildASTSchema');
 
 var parse = parser.parse;
+var getDescription = buildASTSchema.getDescription;
 
 // Strip insignificant whitespace
 // Note that this could do a lot more, such as reorder fields etc.
@@ -83,6 +85,14 @@ function stripLoc(doc, removeLocAtThisLevel) {
     });
   }
 
+  if (!doc.description) {
+    var description = getDescription(doc);
+
+    if (description) {
+      doc.description = description;
+    }
+  }
+
   if (docType !== '[object Object]') {
     throw new Error('Unexpected input.');
   }

test.js

@@ -433,5 +433,21 @@ const assert = require('chai').assert;
     //   `);
     // });
 
+    describe('descriptors', function() {
+      it('adds comments as descriptors', function() {
+        const ast = gql`
+          # This is a type descriptor
+          type Foo {
+            # This is a field descriptor
+            bar: String
+            baz: Int
+          }
+        `;
+        assert.equal(ast.definitions[0].description, 'This is a type descriptor');
+        assert.equal(ast.definitions[0].fields[0].description, 'This is a field descriptor');
+        assert.equal(ast.definitions[0].fields[1].description, undefined);
+      })
+    })
+
   });
 });