Merge branch 'master' into customize-validation-rules

alloy · web-flow · commit 94ece0bca06e · 2019-05-23T15:46:06.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,7 @@
 ## Upcoming
 
 - `apollo`
-  - Add debugging logs to `apollo client:push` and `apollo service:push` [# 1273](https://github.com/apollographql/apollo-tooling/pull/1273)
-  - remove `apollo service:info` command, since it's undocumented and unused [#1274](https://github.com/apollographql/apollo-tooling/pull/1274)
+  - Update client:push command with new resolver and more output [#1290](https://github.com/apollographql/apollo-tooling/pull/1290)
 - `apollo-codegen-core`
   - <First `apollo-codegen-core` related entry goes here>
 - `apollo-codegen-flow`
@@ -21,11 +20,27 @@
   - <First `apollo-graphql` related entry goes here>
 - `apollo-language-server`
   - Allow configuration of validation rules [#1288](https://github.com/apollographql/apollo-tooling/pull/1288)
+  - update stats window types [#1292](https://github.com/apollographql/apollo-tooling/pull/1292)
 - `apollo-tools`
   - <First `apollo-tools` related entry goes here>
 - `vscode-apollo`
   - <First `vscode-apollo` related entry goes here>
 
+## `apollo@2.12.3`, `apollo-language-server@1.8.4`
+
+- `apollo@2.12.3`
+  - Pin graphql to the ~14.2.x range (#1291)[https://github.com/apollographql/apollo-tooling/pull/1291]
+- `apollo-language-server@1.8.4`
+  - Pin graphql to the ~14.2.x range (#1291)[https://github.com/apollographql/apollo-tooling/pull/1291]
+
+## `apollo@2.12.1`, `apollo-language-server@1.8.3`
+
+- `apollo@2.12.1`
+  - Add debugging logs to `apollo client:push` and `apollo service:push` [# 1273](https://github.com/apollographql/apollo-tooling/pull/1273)
+  - remove `apollo service:info` command, since it's undocumented and unused [#1274](https://github.com/apollographql/apollo-tooling/pull/1274)
+- `apollo-language-server@1.8.3`
+  - Fix \_\_typename addition for InlineFragments [#1286](https://github.com/apollographql/apollo-tooling/pull/1286)
+
 ## `apollo-codegen-flow@0.33.10`, `apollo-codegen-typescript@0.34.0`, `vscode-apollo@1.6.10`
 
 - `apollo-codegen-flow@0.33.10`
diff --git a/apollo.config.js b/apollo.config.js
@@ -2,7 +2,8 @@ module.exports = {
   client: {
     name: "Apollo CLI",
     service: "engine@master",
-    includes: ["./packages/apollo-language-server/**/*.ts"]
+    includes: ["./packages/apollo-language-server/**/*.ts"],
+    excludes: ["**/*.test.ts", "**/__tests__/*"]
   },
   engine: {
     frontend: "https://engine-staging.apollographql.com",
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/apollo-codegen-core/package.json b/packages/apollo-codegen-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-codegen-core",
   "description": "Core generator APIs for Apollo Codegen",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
diff --git a/packages/apollo-codegen-flow/package.json b/packages/apollo-codegen-flow/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-codegen-flow",
   "description": "Flow generator module for Apollo Codegen",
-  "version": "0.33.10",
+  "version": "0.33.12",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
diff --git a/packages/apollo-codegen-scala/package.json b/packages/apollo-codegen-scala/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-codegen-scala",
   "description": "Scala generator module for Apollo Codegen",
-  "version": "0.34.10",
+  "version": "0.34.12",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
diff --git a/packages/apollo-codegen-swift/package.json b/packages/apollo-codegen-swift/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-codegen-swift",
   "description": "Swift generator module for Apollo Codegen",
-  "version": "0.33.10",
+  "version": "0.33.12",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
diff --git a/packages/apollo-codegen-typescript/package.json b/packages/apollo-codegen-typescript/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-codegen-typescript",
   "description": "TypeScript generator module for Apollo Codegen",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
diff --git a/packages/apollo-language-server/package.json b/packages/apollo-language-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-language-server",
   "description": "A language server for Apollo GraphQL projects",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
@@ -32,7 +32,7 @@
     "cosmiconfig": "^5.0.6",
     "dotenv": "^8.0.0",
     "glob": "^7.1.3",
-    "graphql": "^14.2.1",
+    "graphql": "~14.2.1",
     "graphql-tag": "^2.10.1",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.1",
diff --git a/packages/apollo-language-server/src/config/config.ts b/packages/apollo-language-server/src/config/config.ts
@@ -1,11 +1,6 @@
 import { dirname } from "path";
 import merge from "lodash.merge";
-import {
-  ServiceID,
-  ServiceSpecifier,
-  ClientID,
-  StatsWindowSize
-} from "../engine";
+import { ServiceID, ServiceSpecifier, ClientID } from "../engine";
 import URI from "vscode-uri";
 import { WithRequired } from "apollo-env";
 import { getServiceName, parseServiceSpecifier } from "./utils";
@@ -72,8 +67,7 @@ export interface ClientConfigFormat extends ConfigBase {
   addTypename?: boolean;
   tagName?: string;
   // stats window config
-  statsWindow?: StatsWindowSize;
-
+  statsWindow?: EngineStatsWindow;
   /**
    * Rules that will be applied when validating GraphQL documents.
    *
diff --git a/packages/apollo-language-server/src/engine/index.ts b/packages/apollo-language-server/src/engine/index.ts
@@ -37,7 +37,6 @@ export type ClientID = string;
 export type SchemaTag = string;
 export type ServiceIDAndTag = [ServiceID, SchemaTag?];
 export type ServiceSpecifier = string;
-export type StatsWindowSize = number;
 export type FieldStats = Map<string, Map<string, number | null>>;
 
 export function noServiceError(service: string | undefined, endpoint?: string) {
@@ -232,10 +231,12 @@ export class ApolloEngineClient extends GraphQLDataSource {
         );
       }
 
-      if (!(data && data.service)) {
+      if (
+        !(data && data.service && data.service.registerOperationsWithResponse)
+      ) {
         throw new Error("Error in request from Engine");
       }
-      return data.service.registerOperations;
+      return data.service.registerOperationsWithResponse;
     });
   }
 
diff --git a/packages/apollo-language-server/src/engine/operations/registerOperations.ts b/packages/apollo-language-server/src/engine/operations/registerOperations.ts
@@ -8,11 +8,22 @@ export const REGISTER_OPERATIONS = gql`
     $manifestVersion: Int!
   ) {
     service(id: $id) {
-      registerOperations(
+      registerOperationsWithResponse(
         clientIdentity: $clientIdentity
         operations: $operations
         manifestVersion: $manifestVersion
-      )
+      ) {
+        invalidOperations {
+          errors {
+            message
+          }
+          signature
+        }
+        newOperations {
+          signature
+        }
+        registrationSuccess
+      }
     }
   }
 `;
diff --git a/packages/apollo-language-server/src/graphqlTypes.ts b/packages/apollo-language-server/src/graphqlTypes.ts
@@ -211,9 +211,56 @@ export interface CheckSchemaVariables {
 // GraphQL mutation operation: RegisterOperations
 // ====================================================
 
+export interface RegisterOperations_service_registerOperationsWithResponse_invalidOperations_errors {
+  __typename: "OperationValidationError";
+  /**
+   * Reason for validation failure
+   */
+  message: string;
+}
+
+export interface RegisterOperations_service_registerOperationsWithResponse_invalidOperations {
+  __typename: "InvalidOperation";
+  /**
+   * Validation errors
+   */
+  errors: RegisterOperations_service_registerOperationsWithResponse_invalidOperations_errors[] | null;
+  /**
+   * Signature of operation sent by the client
+   */
+  signature: string;
+}
+
+export interface RegisterOperations_service_registerOperationsWithResponse_newOperations {
+  __typename: "RegisteredOperation";
+  /**
+   * Signature of operation sent by the client
+   */
+  signature: string;
+}
+
+export interface RegisterOperations_service_registerOperationsWithResponse {
+  __typename: "RegisterOperationsMutationResponse";
+  /**
+   * Operations that failed to validate against the schema
+   */
+  invalidOperations: RegisterOperations_service_registerOperationsWithResponse_invalidOperations[] | null;
+  /**
+   * New operations added to the registry(subset of input operations)
+   */
+  newOperations: RegisterOperations_service_registerOperationsWithResponse_newOperations[] | null;
+  /**
+   * True if operations were registered, false if not
+   */
+  registrationSuccess: boolean;
+}
+
 export interface RegisterOperations_service {
   __typename: "ServiceMutation";
-  registerOperations: any | null;
+  /**
+   * Register operations with diagnostic information about the result of the mutation
+   */
+  registerOperationsWithResponse: RegisterOperations_service_registerOperationsWithResponse | null;
 }
 
 export interface RegisterOperations {
diff --git a/packages/apollo-language-server/src/utilities/__tests__/graphql.test.ts b/packages/apollo-language-server/src/utilities/__tests__/graphql.test.ts
@@ -0,0 +1,75 @@
+import gql from "graphql-tag";
+import { print } from "graphql";
+import { withTypenameFieldAddedWhereNeeded } from "../graphql";
+
+describe("withTypenameFieldAddedWhereNeeded", () => {
+  it("properly adds __typename to each selectionSet", () => {
+    const query = gql`
+      query Product {
+        product {
+          sku
+          color {
+            id
+            value
+          }
+        }
+      }
+    `;
+
+    const withTypenames = withTypenameFieldAddedWhereNeeded(query);
+
+    expect(print(withTypenames)).toMatchInlineSnapshot(`
+      "query Product {
+        product {
+          __typename
+          sku
+          color {
+            __typename
+            id
+            value
+          }
+        }
+      }
+      "
+    `);
+  });
+
+  it("adds __typename to InlineFragment nodes (as ApolloClient does)", () => {
+    const query = gql`
+      query CartItems {
+        product {
+          items {
+            ... on Table {
+              material
+            }
+            ... on Paint {
+              color
+            }
+          }
+        }
+      }
+    `;
+
+    const withTypenames = withTypenameFieldAddedWhereNeeded(query);
+
+    expect(print(withTypenames)).toMatchInlineSnapshot(`
+      "query CartItems {
+        product {
+          __typename
+          items {
+            __typename
+            ... on Table {
+              __typename
+              material
+            }
+            ... on Paint {
+              __typename
+              color
+            }
+          }
+        }
+      }
+      "
+    `);
+  });
+});
diff --git a/packages/apollo-language-server/src/utilities/graphql.ts b/packages/apollo-language-server/src/utilities/graphql.ts
@@ -136,8 +136,15 @@ export function withTypenameFieldAddedWhereNeeded(ast: ASTNode) {
       }
     },
     leave(node: ASTNode) {
-      if (!(node.kind === "Field" || node.kind === "FragmentDefinition"))
+      if (
+        !(
+          node.kind === Kind.FIELD ||
+          node.kind === Kind.FRAGMENT_DEFINITION ||
+          node.kind === Kind.INLINE_FRAGMENT
+        )
+      ) {
         return undefined;
+      }
       if (!node.selectionSet) return undefined;
 
       if (true) {
diff --git a/packages/apollo/README.md b/packages/apollo/README.md
@@ -21,7 +21,7 @@ $ npm install -g apollo
 $ apollo COMMAND
 running command...
 $ apollo (-v|--version|version)
-apollo/2.12.0 darwin-x64 node-v11.14.0
+apollo/2.12.3 darwin-x64 node-v11.14.0
 $ apollo --help [COMMAND]
 USAGE
   $ apollo COMMAND
diff --git a/packages/apollo/package.json b/packages/apollo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo",
   "description": "Command line tool for Apollo GraphQL",
-  "version": "2.12.0",
+  "version": "2.12.3",
   "referenceID": "21ad0845-c235-422e-be7d-a998310df972",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "git-parse": "1.0.3",
     "git-rev-sync": "1.12.0",
     "glob": "7.1.4",
-    "graphql": "^14.2.1",
+    "graphql": "~14.2.1",
     "graphql-tag": "2.10.1",
     "heroku-cli-util": "8.0.11",
     "listr": "0.14.3",
diff --git a/packages/apollo/src/commands/client/push.ts b/packages/apollo/src/commands/client/push.ts
diff --git a/packages/apollo/src/commands/service/check.ts b/packages/apollo/src/commands/service/check.ts
diff --git a/packages/apollo/src/utils/index.ts b/packages/apollo/src/utils/index.ts
diff --git a/packages/apollo/src/utils/pluralize.ts b/packages/apollo/src/utils/pluralize.ts
diff --git a/packages/vscode-apollo/package.json b/packages/vscode-apollo/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "apollo-codegen-core",`
`3`	`3`	`"description": "Core generator APIs for Apollo Codegen",`
`4`		`- "version": "0.34.0",`
	`4`	`+ "version": "0.34.2",`
`5`	`5`	`"author": "Apollo GraphQL <opensource@apollographql.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "apollo-codegen-flow",`
`3`	`3`	`"description": "Flow generator module for Apollo Codegen",`
`4`		`- "version": "0.33.10",`
	`4`	`+ "version": "0.33.12",`
`5`	`5`	`"author": "Apollo GraphQL <opensource@apollographql.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "apollo-codegen-scala",`
`3`	`3`	`"description": "Scala generator module for Apollo Codegen",`
`4`		`- "version": "0.34.10",`
	`4`	`+ "version": "0.34.12",`
`5`	`5`	`"author": "Apollo GraphQL <opensource@apollographql.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "apollo-codegen-swift",`
`3`	`3`	`"description": "Swift generator module for Apollo Codegen",`
`4`		`- "version": "0.33.10",`
	`4`	`+ "version": "0.33.12",`
`5`	`5`	`"author": "Apollo GraphQL <opensource@apollographql.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "apollo-codegen-typescript",`
`3`	`3`	`"description": "TypeScript generator module for Apollo Codegen",`
`4`		`- "version": "0.34.0",`
	`4`	`+ "version": "0.34.2",`
`5`	`5`	`"author": "Apollo GraphQL <opensource@apollographql.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`