vscode-apollo 2.6.3 → 2.6.5

package/.github/workflows/release.yml

@@ -34,14 +34,6 @@ jobs:
         with:
           files: ".changeset/pre.json"
 
-      - name: Append NPM token to .npmrc
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       - name: Setup Node.js 24.x
         uses: actions/setup-node@v3
         with:
@@ -59,7 +51,7 @@ jobs:
           publish: npm run changeset-publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ""
 
       - name: Attach VSX to GitHub release
         if: steps.changesets.outcome == 'success' && steps.changesets.outputs.published == 'true'

package/.vscode/settings.json

@@ -8,6 +8,11 @@
   "editor.wordWrapColumn": 110,
   "files.trimTrailingWhitespace": true,
   "files.insertFinalNewline": true,
+  "[typescript]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "never"
+    }
+  },
   "files.exclude": {
     "**/.git": true,
     "**/.DS_Store": true,

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 2.6.5
+
+### Patch Changes
+
+- [#259](https://github.com/apollographql/vscode-graphql/pull/259) [`b55410d`](https://github.com/apollographql/vscode-graphql/commit/b55410d78910e9f16cddff00fd6d9b7f7cc0af39) Thanks [@Cellule](https://github.com/Cellule)! - Report project name in warning when no files are found. Allows to better pinpoint offending project when working with multiple projects.
+
+- [#306](https://github.com/apollographql/vscode-graphql/pull/306) [`9582690`](https://github.com/apollographql/vscode-graphql/commit/958269018a562f2eee880b68848407170a75af5f) Thanks [@phryneas](https://github.com/phryneas)! - report duplicate operations as diagnostic instead of throwing an error
+
+## 2.6.4
+
+### Patch Changes
+
+- [#303](https://github.com/apollographql/vscode-graphql/pull/303) [`1be1252`](https://github.com/apollographql/vscode-graphql/commit/1be1252f9ce5135a557ce884ada3f96ca82e643c) Thanks [@phryneas](https://github.com/phryneas)! - Update `graphql` and `graphql-language-service` packages.
+
+  This allows descriptions in executable documents to be parsed correctly.
+
 ## 2.6.3
 
 ### Patch Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -37,7 +37,8 @@
     "test:textmate-graphql-connectors-mapping": "npm run build:textmate -- --snapshot connectors.mapping.yaml; npx vscode-tmgrammar-test src/__tests__/fixtures/textmate/*.graphql",
     "update-connectors-community": "git subtree pull --prefix sampleWorkspace/connectors-community https://github.com/apollographql/connectors-community.git main --squash",
     "codegen": "graphql-codegen",
-    "vscode:prepublish": "npm run build:production"
+    "vscode:prepublish": "npm run build:production",
+    "postinstall": "patch-package"
   },
   "engines": {
     "vscode": "^1.90.0"
@@ -52,12 +53,11 @@
     "dotenv": "16.4.7",
     "fractional-indexing": "2.1.0",
     "glob": "11.0.0",
-    "graphql": "16.9.0",
-    "graphql-language-service": "5.2.2",
+    "graphql": "16.12.0",
+    "graphql-language-service": "5.5.0",
     "graphql-tag": "2.12.6",
     "jsonc-parser": "^3.3.1",
     "lodash.debounce": "4.0.8",
-    "lodash.throttle": "4.1.1",
     "lz-string": "1.5.0",
     "minimatch": "10.0.1",
     "moment": "2.30.1",
@@ -81,7 +81,6 @@
     "@types/jest": "29.5.14",
     "@types/lodash.debounce": "4.0.9",
     "@types/lodash.merge": "4.6.9",
-    "@types/lodash.throttle": "4.1.9",
     "@types/node": "20.14.10",
     "@types/vscode": "1.90.0",
     "@typescript-eslint/eslint-plugin": "6.9.1",
@@ -100,6 +99,7 @@
     "memfs": "4.15.0",
     "npm-run-all": "4.1.5",
     "oniguruma-parser": "^0.12.1",
+    "patch-package": "^8.0.1",
     "prettier": "3.4.2",
     "rimraf": "6.0.1",
     "ts-jest": "29.2.5",

package/patches/graphql+16.12.0.patch

@@ -0,0 +1,26 @@
+diff --git a/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.js b/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.js
+index d2247e0..4c61625 100644
+--- a/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.js
++++ b/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.js
+@@ -132,7 +132,7 @@ function ValuesOfCorrectTypeRule(context) {
+     EnumValue: (node) => isValidValueNode(context, node),
+     IntValue: (node) => isValidValueNode(context, node),
+     FloatValue: (node) => isValidValueNode(context, node),
+-    StringValue: (node) => isValidValueNode(context, node),
++    StringValue: (node, key) => key !== "description" && isValidValueNode(context, node),
+     BooleanValue: (node) => isValidValueNode(context, node),
+   };
+ }
+diff --git a/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.mjs b/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.mjs
+index fec0a51..55f4d56 100644
+--- a/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.mjs
++++ b/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.mjs
+@@ -117,7 +117,7 @@ export function ValuesOfCorrectTypeRule(context) {
+     EnumValue: (node) => isValidValueNode(context, node),
+     IntValue: (node) => isValidValueNode(context, node),
+     FloatValue: (node) => isValidValueNode(context, node),
+-    StringValue: (node) => isValidValueNode(context, node),
++    StringValue: (node, key) => key !== "description" && isValidValueNode(context, node),
+     BooleanValue: (node) => isValidValueNode(context, node),
+   };
+ }

package/sampleWorkspace/clientSchema/src/test.js

@@ -1,6 +1,15 @@
 import gql from "graphql-tag";
 gql`
-  query Test($defer: Boolean!) {
+  """
+  Query-Level Comment Test
+  """
+  query Test(
+    """
+    Argument-Level Comment Test
+    """
+    $defer: Boolean!
+  ) {
+
     featureFlagDefer @client(always: false) @export(as: "defer")
     droid(id: "2000") {
       name

package/src/language-server/project/__tests__/duplicateOperations.test.ts

@@ -0,0 +1,224 @@
+import { GraphQLClientProject } from "../client";
+import { basename } from "path";
+import { DiagnosticSeverity } from "vscode-languageserver/node";
+
+import { vol } from "memfs";
+import { ClientConfig, parseApolloConfig } from "../../config";
+import { URI } from "vscode-uri";
+
+const serviceSchema = /* GraphQL */ `
+  type Query {
+    me: User
+  }
+
+  type User {
+    name: String
+    friends: [User]
+  }
+`;
+
+// Operation with name "GetUser" in first file
+const fileA = /* GraphQL */ `
+  query GetUser {
+    me {
+      name
+    }
+  }
+`;
+
+// Operation with same name "GetUser" in second file
+const fileB = /* GraphQL */ `
+  query GetUser {
+    me {
+      friends {
+        name
+      }
+    }
+  }
+`;
+
+// File with two operations with duplicate names in the same file
+const fileWithDuplicates = /* GraphQL */ `
+  query DuplicateOp {
+    me {
+      name
+    }
+  }
+
+  query DuplicateOp {
+    me {
+      friends {
+        name
+      }
+    }
+  }
+`;
+
+const rootURI = URI.file(process.cwd());
+
+const config = parseApolloConfig({
+  client: {
+    service: {
+      name: "server",
+      localSchemaFile: "./schema.graphql",
+    },
+    includes: ["./src/**.graphql"],
+    excludes: ["./__tests__"],
+  },
+  engine: {},
+});
+
+jest.mock("fs");
+
+describe("Duplicate operation detection", () => {
+  beforeEach(() => {
+    vol.reset();
+  });
+
+  afterEach(async () => {
+    jest.restoreAllMocks();
+    // Wait for potentially throttled calls to complete (as suggested in code review)
+    // The 300ms timeout accounts for the setTimeout(0) used in invalidate()
+    await new Promise((resolve) => setTimeout(resolve, 300));
+  });
+
+  it("should report error diagnostics for duplicate operations across multiple files", async () => {
+    vol.fromJSON({
+      "apollo.config.js": `module.exports = {
+            client: {
+                service: {
+                    localSchemaFile: './schema.graphql'
+                }
+            }
+        }`,
+      "schema.graphql": serviceSchema,
+      "src/a.graphql": fileA,
+      "src/b.graphql": fileB,
+    });
+
+    const project = new GraphQLClientProject({
+      config: config as ClientConfig,
+      loadingHandler: {
+        handle: async (msg, val) => val,
+        handleSync: (msg, val) => val(),
+        showError: (msg) => {
+          // fail the test if this is ever called
+          expect(msg).toBeUndefined();
+        },
+      },
+      configFolderURI: rootURI,
+      clientIdentity: {
+        name: "",
+        version: "",
+        referenceID: "",
+      },
+    });
+
+    const diagnosticsByFile: Record<string, any[]> = Object.create(null);
+    project.onDiagnostics(({ diagnostics, uri }) => {
+      const path = basename(URI.parse(uri).path);
+      if (!diagnosticsByFile[path]) diagnosticsByFile[path] = [];
+      diagnosticsByFile[path].push(...diagnostics);
+    });
+
+    await project.whenReady;
+    await project.validate();
+
+    // Both files should have error diagnostics
+    expect(diagnosticsByFile["a.graphql"]).toBeDefined();
+    expect(diagnosticsByFile["b.graphql"]).toBeDefined();
+
+    // Check that both files have diagnostics with Error severity
+    const aGraphqlErrors = diagnosticsByFile["a.graphql"].filter(
+      (d) => d.severity === DiagnosticSeverity.Error,
+    );
+    const bGraphqlErrors = diagnosticsByFile["b.graphql"].filter(
+      (d) => d.severity === DiagnosticSeverity.Error,
+    );
+
+    expect(aGraphqlErrors.length).toBeGreaterThan(0);
+    expect(bGraphqlErrors.length).toBeGreaterThan(0);
+
+    // Check that the diagnostic messages mention duplicate operations
+    expect(aGraphqlErrors[0].message).toMatch(/multiple definitions.*GetUser/s);
+    expect(bGraphqlErrors[0].message).toMatch(/multiple definitions.*GetUser/s);
+
+    // Check that the source is correct
+    expect(aGraphqlErrors[0].source).toBe("GraphQL: Validation");
+    expect(bGraphqlErrors[0].source).toBe("GraphQL: Validation");
+  });
+
+  it("should report error diagnostics for duplicate operations in the same file", async () => {
+    vol.fromJSON({
+      "apollo.config.js": `module.exports = {
+            client: {
+                service: {
+                    localSchemaFile: './schema.graphql'
+                }
+            }
+        }`,
+      "schema.graphql": serviceSchema,
+      "src/duplicates.graphql": fileWithDuplicates,
+    });
+
+    const project = new GraphQLClientProject({
+      config: config as ClientConfig,
+      loadingHandler: {
+        handle: async (msg, val) => val,
+        handleSync: (msg, val) => val(),
+        showError: (msg) => {
+          // fail the test if this is ever called
+          expect(msg).toBeUndefined();
+        },
+      },
+      configFolderURI: rootURI,
+      clientIdentity: {
+        name: "",
+        version: "",
+        referenceID: "",
+      },
+    });
+
+    const diagnosticsByFile: Record<string, any[]> = Object.create(null);
+    project.onDiagnostics(({ diagnostics, uri }) => {
+      const path = basename(URI.parse(uri).path);
+      if (!diagnosticsByFile[path]) diagnosticsByFile[path] = [];
+      diagnosticsByFile[path].push(...diagnostics);
+    });
+
+    await project.whenReady;
+    await project.validate();
+
+    // File should have error diagnostics
+    expect(diagnosticsByFile["duplicates.graphql"]).toBeDefined();
+
+    // Check that the file has diagnostics with Error severity
+    const duplicatesErrors = diagnosticsByFile["duplicates.graphql"].filter(
+      (d) => d.severity === DiagnosticSeverity.Error,
+    );
+
+    // Should have at least 2 error diagnostics (one for each occurrence of DuplicateOp)
+    // Note: GraphQL's native validation may also report these, so we might have more
+    expect(duplicatesErrors.length).toBeGreaterThanOrEqual(2);
+
+    // Find diagnostics specifically from our duplicate detection (not native GraphQL validation)
+    const ourDuplicateErrors = duplicatesErrors.filter((d) =>
+      d.message.includes("multiple definitions"),
+    );
+
+    // We should have exactly 2 diagnostics from our duplicate detection
+    expect(ourDuplicateErrors.length).toBe(2);
+
+    // Check that both diagnostic messages mention duplicate operations
+    expect(ourDuplicateErrors[0].message).toMatch(
+      /multiple definitions.*DuplicateOp/s,
+    );
+    expect(ourDuplicateErrors[1].message).toMatch(
+      /multiple definitions.*DuplicateOp/s,
+    );
+
+    // Check that the source is correct
+    expect(ourDuplicateErrors[0].source).toBe("GraphQL: Validation");
+    expect(ourDuplicateErrors[1].source).toBe("GraphQL: Validation");
+  });
+});

package/src/language-server/project/client.ts

@@ -46,6 +46,7 @@ import {
   DiagnosticSeverity,
   CancellationToken,
   Position,
+  Range,
   Location,
   CodeLens,
   InsertTextFormat,
@@ -104,6 +105,7 @@ import type { CodeActionInfo } from "../errors/validation";
 import { GraphQLDiagnostic } from "../diagnostics";
 import { isInterfaceType } from "graphql";
 import { GraphQLInternalProject } from "./internal";
+import { intlConjunction } from "../utilities/intlConjunction";
 
 type Maybe<T> = null | undefined | T;
 
@@ -203,7 +205,7 @@ export class GraphQLClientProject extends GraphQLInternalProject {
 
     if (this.allIncludedFiles().length === 0) {
       console.warn(
-        "⚠️  It looks like there are 0 files associated with this Apollo Project. " +
+        `⚠️  It looks like there are 0 files associated with Apollo Project: "${this.displayName}". ` +
           "This may be because you don't have any files yet, or your includes/excludes " +
           "fields are configured incorrectly, and Apollo can't find your files. " +
           "For help configuring Apollo projects, see this guide: https://go.apollo.dev/t/config",
@@ -381,6 +383,11 @@ export class GraphQLClientProject extends GraphQLInternalProject {
 
     const fragments = this.fragments;
 
+    const operationNameToLocations: Map<
+      string,
+      Array<{ uri: DocumentUri; range: Range }>
+    > = new Map();
+
     for (const [uri, documentsForFile] of this.documentsByFile) {
       for (const document of documentsForFile) {
         diagnosticSet.addDiagnostics(
@@ -392,6 +399,48 @@ export class GraphQLClientProject extends GraphQLInternalProject {
             this._validationRules,
           ),
         );
+
+        // Collect operation names for duplicate detection
+        for (const definition of document.ast?.definitions || []) {
+          if (
+            definition.kind === Kind.OPERATION_DEFINITION &&
+            definition.name
+          ) {
+            const operationName = definition.name.value;
+
+            let locations = operationNameToLocations.get(operationName);
+            if (!locations) {
+              operationNameToLocations.set(operationName, (locations = []));
+            }
+            locations.push({ uri, range: rangeForASTNode(definition.name) });
+          }
+        }
+      }
+    }
+
+    // Add diagnostics for duplicate operation names
+    for (const [operationName, locations] of operationNameToLocations) {
+      if (locations.length > 1) {
+        const textualLocations = locations.map(({ uri, range }) => {
+          return `${URI.parse(uri).fsPath}:${range.start.line + 1},${range.start.character + 1}`;
+        });
+
+        const message = `
+There are multiple definitions for the \`${operationName}\` operation.
+Please fix all naming conflicts before continuing.
+Conflicting definitions found at ${intlConjunction.format(textualLocations)}.
+`.trim();
+
+        for (const { uri, range } of locations) {
+          diagnosticSet.addDiagnostics(uri, [
+            {
+              severity: DiagnosticSeverity.Error,
+              range,
+              message,
+              source: "GraphQL: Validation",
+            },
+          ]);
+        }
       }
     }
     for (const [uri, diagnostics] of diagnosticSet.entries()) {

package/src/language-server/project/internal.ts

@@ -9,7 +9,6 @@ import {
   isTypeSystemExtensionNode,
   DefinitionNode,
   GraphQLSchema,
-  Kind,
 } from "graphql";
 
 import {
@@ -29,7 +28,6 @@ import {
 } from "../providers/schema";
 import { ApolloEngineClient, ClientIdentity } from "../engine";
 import { GraphQLProject, DocumentUri, GraphQLProjectConfig } from "./base";
-import throttle from "lodash.throttle";
 import { FileSet } from "../fileSet";
 import { getSupportedExtensions } from "../utilities/languageIdForExtension";
 
@@ -161,7 +159,6 @@ export abstract class GraphQLInternalProject
 
   fileWasDeleted(uri: DocumentUri) {
     this.removeGraphQLDocumentsFor(uri);
-    this.checkForDuplicateOperations();
   }
 
   documentDidChange = (document: TextDocument) => {
@@ -175,42 +172,8 @@ export abstract class GraphQLInternalProject
     } else {
       this.removeGraphQLDocumentsFor(document.uri);
     }
-    this.checkForDuplicateOperations();
   };
 
-  checkForDuplicateOperations = throttle(
-    () => {
-      const filePathForOperationName: Record<string, string> = {};
-      for (const [
-        fileUri,
-        documentsForFile,
-      ] of this.documentsByFile.entries()) {
-        const filePath = URI.parse(fileUri).fsPath;
-        for (const document of documentsForFile) {
-          if (!document.ast) continue;
-          for (const definition of document.ast.definitions) {
-            if (
-              definition.kind === Kind.OPERATION_DEFINITION &&
-              definition.name
-            ) {
-              const operationName = definition.name.value;
-              if (operationName in filePathForOperationName) {
-                const conflictingFilePath =
-                  filePathForOperationName[operationName];
-                throw new Error(
-                  `️️There are multiple definitions for the \`${definition.name.value}\` operation. Please fix all naming conflicts before continuing.\nConflicting definitions found at ${filePath} and ${conflictingFilePath}.`,
-                );
-              }
-              filePathForOperationName[operationName] = filePath;
-            }
-          }
-        }
-      }
-    },
-    250,
-    { leading: true, trailing: true },
-  );
-
   private removeGraphQLDocumentsFor(uri: DocumentUri) {
     if (this.documentsByFile.has(uri)) {
       this.documentsByFile.delete(uri);

package/src/language-server/utilities/intlConjunction.ts

@@ -0,0 +1,4 @@
+export const intlConjunction = new Intl.ListFormat("en", {
+  style: "long",
+  type: "conjunction",
+});

package/tsconfig.json

@@ -18,7 +18,7 @@
     "noUnusedParameters": false,
     "noUnusedLocals": false,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es2020", "esnext.asynciterable"],
+    "lib": ["es2020", "esnext.asynciterable", "ES2021.Intl"],
     "types": ["node", "jest"],
     "baseUrl": "."
   },