@apollo/gateway 2.0.0-alpha.2 → 2.0.0-alpha.6

package/dist/supergraphManagers/UplinkFetcher/outOfBandReporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/outOfBandReporter.ts"],"names":[],"mappings":";;;AAEA,mEAI0C;AAG7B,QAAA,0BAA0B,GAAgB;;;;CAItD,CAAC;AAEF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAepD,KAAK,UAAU,iCAAiC,CAAC,EACtD,KAAK,EACL,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GAUR;;IAEC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,IAAI,SAAoB,CAAC;IACzB,IAAI,CAAC,QAAQ,EAAE;QACb,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;KACxC;SAAM;QAEL,QAAQ,QAAQ,CAAC,MAAM,EAAE;YACvB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,WAAW,CAAC;gBAClC,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,OAAO,CAAC;gBAC9B,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;gBACvC,MAAM;YACR;gBACE,SAAS,GAAG,wBAAS,CAAC,KAAK,CAAC;SAC/B;KACF;IAED,MAAM,YAAY,GAAuB,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAA,CAAC;IAEhE,MAAM,SAAS,GAA+B;QAC5C,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACD,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,EAAE;aAC3B;YACD,QAAQ,EAAE,QAAQ;gBAChB,CAAC,CAAC;oBACE,cAAc,EAAE,QAAQ,CAAC,MAAM;oBAC/B,IAAI,EAAE,YAAY;iBACnB;gBACH,CAAC,CAAC,IAAI;YACR,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;YAClC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;YAC9B,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,kCAA0B;gBACjC,SAAS;aACV,CAAC;YACF,OAAO,EAAE;gBACP,2BAA2B,EAAE,IAAI;gBACjC,8BAA8B,EAAE,OAAO;gBACvC,YAAY,EAAE,GAAG,IAAI,IAAI,OAAO,EAAE;gBAClC,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QACH,MAAM,cAAc,GAA4B,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzE,IAAI,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,0CAAE,WAAW,CAAA,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,uCAAuC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,CACtF,CAAC;SACH;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uCAAuC,MAAA,CAAC,CAAC,OAAO,mCAAI,CAAC,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AA/FD,8EA+FC"}

package/dist/supergraphManagers/index.d.ts

@@ -0,0 +1,6 @@
+export { LocalCompose } from './LocalCompose';
+export { LegacyFetcher } from './LegacyFetcher';
+export { IntrospectAndCompose } from './IntrospectAndCompose';
+export { UplinkFetcher } from './UplinkFetcher';
+export { UplinkFetcherError } from './UplinkFetcher/loadSupergraphSdlFromStorage';
+//# sourceMappingURL=index.d.ts.map

package/dist/supergraphManagers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA"}

package/dist/supergraphManagers/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UplinkFetcherError = exports.UplinkFetcher = exports.IntrospectAndCompose = exports.LegacyFetcher = exports.LocalCompose = void 0;
+var LocalCompose_1 = require("./LocalCompose");
+Object.defineProperty(exports, "LocalCompose", { enumerable: true, get: function () { return LocalCompose_1.LocalCompose; } });
+var LegacyFetcher_1 = require("./LegacyFetcher");
+Object.defineProperty(exports, "LegacyFetcher", { enumerable: true, get: function () { return LegacyFetcher_1.LegacyFetcher; } });
+var IntrospectAndCompose_1 = require("./IntrospectAndCompose");
+Object.defineProperty(exports, "IntrospectAndCompose", { enumerable: true, get: function () { return IntrospectAndCompose_1.IntrospectAndCompose; } });
+var UplinkFetcher_1 = require("./UplinkFetcher");
+Object.defineProperty(exports, "UplinkFetcher", { enumerable: true, get: function () { return UplinkFetcher_1.UplinkFetcher; } });
+var loadSupergraphSdlFromStorage_1 = require("./UplinkFetcher/loadSupergraphSdlFromStorage");
+Object.defineProperty(exports, "UplinkFetcherError", { enumerable: true, get: function () { return loadSupergraphSdlFromStorage_1.UplinkFetcherError; } });
+//# sourceMappingURL=index.js.map

package/dist/supergraphManagers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,6FAAiF;AAAxE,kIAAA,kBAAkB,OAAA"}

package/dist/utilities/createHash.d.ts

@@ -0,0 +1,2 @@
+export declare function createHash(kind: string): import('crypto').Hash;
+//# sourceMappingURL=createHash.d.ts.map

package/dist/utilities/createHash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createHash.d.ts","sourceRoot":"","sources":["../../src/utilities/createHash.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,QAAQ,EAAE,IAAI,CAO/D"}

package/dist/utilities/createHash.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHash = void 0;
+const isNodeLike_1 = __importDefault(require("./isNodeLike"));
+function createHash(kind) {
+    if (isNodeLike_1.default) {
+        return module.require('crypto').createHash(kind);
+    }
+    return require('sha.js')(kind);
+}
+exports.createHash = createHash;
+//# sourceMappingURL=createHash.js.map

package/dist/utilities/createHash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createHash.js","sourceRoot":"","sources":["../../src/utilities/createHash.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAsC;AAEtC,SAAgB,UAAU,CAAE,IAAY;IACtC,IAAI,oBAAU,EAAE;QAGd,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;KAClD;IACD,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAPD,gCAOC"}

package/dist/utilities/isNodeLike.d.ts

@@ -0,0 +1,3 @@
+declare const _default: boolean;
+export default _default;
+//# sourceMappingURL=isNodeLike.d.ts.map

package/dist/utilities/isNodeLike.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isNodeLike.d.ts","sourceRoot":"","sources":["../../src/utilities/isNodeLike.ts"],"names":[],"mappings":";AAAA,wBAU4C"}

package/dist/utilities/isNodeLike.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = typeof process === 'object' &&
+    process &&
+    process.release &&
+    process.versions &&
+    typeof process.versions.node === 'string';
+//# sourceMappingURL=isNodeLike.js.map

package/dist/utilities/isNodeLike.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isNodeLike.js","sourceRoot":"","sources":["../../src/utilities/isNodeLike.ts"],"names":[],"mappings":";;AAAA,kBAAe,OAAO,OAAO,KAAK,QAAQ;IACxC,OAAO;IAKP,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAGhB,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.6",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -25,12 +25,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "^2.0.0-alpha.2",
+    "@apollo/composition": "^2.0.0-alpha.6",
     "@apollo/core-schema": "^0.2.0",
-    "@apollo/query-planner": "^2.0.0-alpha.2",
+    "@apollo/query-planner": "^2.0.0-alpha.6",
+    "@josephg/resolvable": "^1.0.1",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.5.12",
-    "apollo-graphql": "^0.9.5",
     "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
     "apollo-server-caching": "^0.7.0 || ^3.0.0",
     "apollo-server-core": "^2.23.0 || ^3.0.0",
@@ -38,12 +38,14 @@
     "apollo-server-errors": "^2.5.0 || ^3.0.0",
     "apollo-server-types": "^0.9.0 || ^3.0.0",
     "apollo-utilities": "^1.3.0",
+    "async-retry": "^1.3.3",
     "loglevel": "^1.6.1",
     "make-fetch-happen": "^8.0.0",
-    "pretty-format": "^27.0.0"
+    "pretty-format": "^27.0.0",
+    "sha.js": "^2.4.11"
   },
   "peerDependencies": {
-    "graphql": "^15.7.0"
+    "graphql": "^16.0.0"
   },
-  "gitHead": "9265ba09ec5620b931861a44603d7d5f7d4688f2"
+  "gitHead": "ee84b3fd9df161c3a94ae3d70e82a14dba5794ba"
 }

package/src/__mocks__/make-fetch-happen-fetcher.ts

@@ -20,6 +20,7 @@ interface MakeFetchHappenMock extends jest.MockedFunction<typeof fetch> {
 }
 
 const mockMakeFetchHappen = jest.fn(fetcher) as unknown as MakeFetchHappenMock;
+const defaults = () => mockMakeFetchHappen;
 
 mockMakeFetchHappen.mockResponseOnce = (
   data?: BodyInit,
@@ -47,7 +48,8 @@ mockMakeFetchHappen.mockJSONResponseOnce = (
 };
 
 const makeFetchMock = {
-  makeFetchHappenFetcher: mockMakeFetchHappen,
+  fetch: mockMakeFetchHappen,
+  defaults,
 };
 
 jest.doMock('make-fetch-happen', () => makeFetchMock);

package/src/__tests__/build-query-plan.feature

@@ -27,6 +27,7 @@ Scenario: should not confuse union types with overlapping field names
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Image{attributes{url}}...on Text{attributes{bold text}}}}"
       }
     }
@@ -51,6 +52,7 @@ Scenario: should use a single fetch when requesting a root field from one servic
         "kind": "Fetch",
         "serviceName": "accounts",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{me{name{first}}}"
       }
     }
@@ -81,6 +83,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{name{first}}}"
           },
           {
@@ -90,6 +93,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                 "kind": "Fetch",
                 "serviceName": "product",
                 "variableUsages": [],
+                "operationKind": "query",
                 "operation": "{topProducts{__typename ...on Book{__typename isbn}...on Furniture{name}}}"
               },
               {
@@ -109,6 +113,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                     }
                   ],
                   "variableUsages": [],
+                  "operationKind": "query",
                   "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                 }
               },
@@ -131,6 +136,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                     }
                   ],
                   "variableUsages": [],
+                  "operationKind": "query",
                   "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                 }
               }
@@ -164,6 +170,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topProducts{__typename ...on Book{__typename isbn}...on Furniture{name}}product(upc:\"1\"){__typename ...on Book{__typename isbn}...on Furniture{name}}}"
           },
           {
@@ -189,6 +196,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                     }
                   },
@@ -211,6 +219,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                     }
                   }
@@ -236,6 +245,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                     }
                   },
@@ -258,6 +268,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                     }
                   }
@@ -292,6 +303,7 @@ Scenario: should use a single fetch when requesting relationship subfields from
         "kind": "Fetch",
         "serviceName": "reviews",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topReviews{body author{reviews{body}}}}"
       }
     }
@@ -320,6 +332,7 @@ Scenario: should use a single fetch when requesting relationship subfields and p
         "kind": "Fetch",
         "serviceName": "reviews",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topReviews{body author{id reviews{body}}}}"
       }
     }
@@ -350,6 +363,7 @@ Scenario: when requesting an extension field from another service, it should add
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id name{first}}}"
           },
           {
@@ -369,6 +383,7 @@ Scenario: when requesting an extension field from another service, it should add
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}}}}"
             }
           }
@@ -399,6 +414,7 @@ Scenario: when requesting an extension field from another service, when the pare
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id}}"
           },
           {
@@ -418,6 +434,7 @@ Scenario: when requesting an extension field from another service, when the pare
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}}}}"
             }
           }
@@ -449,6 +466,7 @@ Scenario: when requesting an extension field from another service, should only a
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id}}"
           },
           {
@@ -468,6 +486,7 @@ Scenario: when requesting an extension field from another service, should only a
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}numberOfReviews}}}"
             }
           }
@@ -501,6 +520,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{body author{__typename id}}}"
           },
           {
@@ -520,6 +540,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name{first}}}}"
             }
           }
@@ -548,6 +569,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topCars{__typename id price}}"
           },
           {
@@ -568,6 +590,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Car{retailPrice}}}"
             }
           }
@@ -600,6 +623,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{author{__typename id}}}"
           },
           {
@@ -619,6 +643,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name{first}}}}"
             }
           }
@@ -649,6 +674,7 @@ Scenario: when requesting a relationship field with extension subfields from a d
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{author{__typename id}}}"
           },
           {
@@ -668,6 +694,7 @@ Scenario: when requesting a relationship field with extension subfields from a d
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{birthDate}}}"
             }
           }
@@ -693,6 +720,7 @@ Scenario: for abstract types, it should add __typename when fetching objects of
         "kind": "Fetch",
         "serviceName": "product",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topProducts{__typename price}}"
       }
     }
@@ -721,6 +749,7 @@ Scenario: should break up when traversing an extension field on an interface typ
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topProducts{__typename price ...on Book{__typename isbn}...on Furniture{__typename upc}}}"
           },
           {
@@ -748,6 +777,7 @@ Scenario: should break up when traversing an extension field on an interface typ
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{reviews{body}}...on Furniture{reviews{body}}}}"
             }
           }
@@ -781,6 +811,7 @@ Scenario: interface fragments should expand into possible types only
             "kind": "Fetch",
             "serviceName": "books",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{books{__typename isbn title year}}"
           },
           {
@@ -802,6 +833,7 @@ Scenario: interface fragments should expand into possible types only
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
             }
           }
@@ -829,6 +861,7 @@ Scenario: interface inside interface should expand into possible types only
         "kind": "Fetch",
         "serviceName": "product",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{product(upc:\"\"){__typename details{__typename country}}}"
       }
     }
@@ -870,6 +903,7 @@ Scenario: should properly expand nested unions with inline fragments
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Image{attributes{url}}...on Text{attributes{bold}}}}"
       }
     }
@@ -912,6 +946,7 @@ Scenario: deduplicates fields / selections regardless of adjacency and type cond
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Text{attributes{bold text}}}}"
       }
     }
@@ -947,6 +982,7 @@ Scenario: deduplicates fields / selections regardless of adjacency and type cond
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Text{attributes{bold text}}}}"
       }
     }
@@ -972,6 +1008,7 @@ Scenario: supports basic, single-service mutation
         "username",
         "password"
       ],
+      "operationKind": "mutation",
       "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){id}}"
     }
   }
@@ -1005,6 +1042,7 @@ Scenario: supports mutations with a cross-service request
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1032,6 +1070,7 @@ Scenario: supports mutations with a cross-service request
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1063,6 +1102,7 @@ Scenario: supports mutations with a cross-service request
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         }
@@ -1097,6 +1137,7 @@ Scenario: returning across service boundaries
             "upc",
             "body"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{__typename upc}}}"
         },
         {
@@ -1124,6 +1165,7 @@ Scenario: returning across service boundaries
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Furniture{name}}}"
           }
         }
@@ -1170,6 +1212,7 @@ Scenario: supports multiple root mutations
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1197,6 +1240,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1228,6 +1272,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         },
@@ -1238,6 +1283,7 @@ Scenario: supports multiple root mutations
             "upc",
             "body"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{__typename upc}}}"
         },
         {
@@ -1265,6 +1311,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Furniture{name}}}"
           }
         }
@@ -1319,6 +1366,7 @@ Scenario: multiple root mutations with correct service order
             "body",
             "updatedReview"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!$updatedReview:UpdateReviewInput!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{upc}}updateReview(review:$updatedReview){id body}}"
         },
         {
@@ -1328,6 +1376,7 @@ Scenario: multiple root mutations with correct service order
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1355,6 +1404,7 @@ Scenario: multiple root mutations with correct service order
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1386,6 +1436,7 @@ Scenario: multiple root mutations with correct service order
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         },
@@ -1395,6 +1446,7 @@ Scenario: multiple root mutations with correct service order
           "variableUsages": [
             "reviewId"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($reviewId:ID!){deleteReview(id:$reviewId)}"
         }
       ]