Fix duplicate queries in named exports

loader.js

@@ -115,10 +115,13 @@ module.exports = function(source) {
 
     function oneQuery(doc, operationName) {
       // Copy the DocumentNode, but clear out the definitions
-      var newDoc = Object.assign({}, doc);
-
-      var op = findOperation(doc, operationName);
-      newDoc.definitions = [op];
+      var newDoc = {
+        kind: doc.kind,
+        definitions: [findOperation(doc, operationName)]
+      };
+      if (doc.hasOwnProperty("loc")) {
+        newDoc.loc = doc.loc;
+      }
 
       // Now, for the operation we're running, find any fragments referenced by
       // it or the fragments it references

test/graphql.js

@@ -83,6 +83,21 @@ const assert = require('chai').assert;
       assert.equal(module.exports.Q2.definitions.length, 1);
     });
 
+    // see https://github.com/apollographql/graphql-tag/issues/168
+    it('does not nest queries needlessly in named exports', () => {
+      const jsSource = loader.call({ cacheable() {} }, `
+        query Q1 { testQuery }
+        query Q2 { testQuery2 }
+        query Q3 { test Query3 }
+      `);
+      const module = { exports: undefined };
+      eval(jsSource);
+
+      assert.notExists(module.exports.Q2.Q1);
+      assert.notExists(module.exports.Q3.Q1);
+      assert.notExists(module.exports.Q3.Q2);
+    });
+
     it('tracks fragment dependencies from multiple queries through webpack loader', () => {
       const jsSource = loader.call({ cacheable() {} }, `
         fragment F1 on F { testQuery }