vscode-apollo 2.1.0 → 2.2.1

package/.github/workflows/build-prs.yml

@@ -0,0 +1,55 @@
+name: Bundle Extension as Artifact Download
+on:
+  pull_request:
+jobs:
+  test:
+    name: Bundle Extension as Artifact Download
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          cache: "npm"
+      - run: npm install
+      - run: echo PKG_VERSION="$(git show --no-patch --format=0.0.0-build.%ct.pr.${{ github.event.pull_request.number }}.commit.%h)" >> $GITHUB_ENV
+      - run: npm pkg set "version=${{ env.PKG_VERSION }}"
+      - run: npx -y @vscode/vsce package --out vscode-apollo-${{ env.PKG_VERSION }}.vsix
+
+      - uses: actions/upload-artifact@v4
+        id: artifact-upload-step
+        with:
+          name: vscode-apollo-${{ env.PKG_VERSION }}
+          path: vscode-apollo-${{ env.PKG_VERSION }}.vsix
+          retention-days: 14
+
+      - name: Output artifact URL
+        run: echo 'Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}'
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: <!-- ARTIFACT-DOWNLOAD -->
+
+      - name: Create comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            <!-- ARTIFACT-DOWNLOAD -->
+            You can download the latest build of the extension for this PR here:
+            [vscode-apollo-${{ env.PKG_VERSION }}.zip](${{ steps.artifact-upload-step.outputs.artifact-url }}).
+
+            To install the extension, download the file, unzip it and install it in VS Code by selecting "Install from VSIX..." in the Extensions view.
+
+            Alternatively, run
+            ```sh
+            code --install-extension vscode-apollo-${{ env.PKG_VERSION }}.vsix --force
+            ```
+            from the command line.
+
+            For older builds, please see the edit history of this comment.

package/.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "A new version of `vscode-apollo` was released: <https://github.com/apollographql/vscode-apollo/releases/tag/v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}|v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}> :rocket:"
+                    "text": "A new version of `vscode-apollo` was released: <https://github.com/apollographql/vscode-graphql/releases/tag/v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}|v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}> :rocket:"
                   }
                 }
               ]

package/.gitleaks.toml

@@ -1,13 +1,13 @@
-# This file exists primarily to influence scheduled scans that Apollo runs of all repos in Apollo-managed orgs. 
+# This file exists primarily to influence scheduled scans that Apollo runs of all repos in Apollo-managed orgs.
 # This is an Apollo-Internal link, but more information about these scans is available here:
 # https://apollographql.atlassian.net/wiki/spaces/SecOps/pages/81330213/Everything+Static+Application+Security+Testing#Scheduled-Scans.1
-# 
+#
 # Apollo is using Gitleaks (https://github.com/gitleaks/gitleaks) to run these scans.
 # However, this file is not something that Gitleaks natively consumes. This file is an
 # Apollo-convention. Prior to scanning a repo, Apollo merges
 # our standard Gitleaks configuration (which is largely just the Gitleaks-default config) with
 # this file if it exists in a repo. The combined config is then used to scan a repo.
-# 
+#
 # We did this because the natively-supported allowlisting functionality in Gitleaks didn't do everything we wanted
 # or wasn't as robust as we needed. For example, one of the allowlisting options offered by Gitleaks depends on the line number
 # on which a false positive secret exists to allowlist it. (https://github.com/gitleaks/gitleaks#gitleaksignore).
@@ -24,3 +24,10 @@
             # See https://github.com/apollographql/vscode-graphql/blob/a905280c143991b3fd675f8b4c3a7da277ccf095/packages/apollo-language-server/src/engine/index.ts#L86
             "a905280c143991b3fd675f8b4c3a7da277ccf095"
         ]
+
+[[ rules ]]
+    id = "private-key"
+    [ rules.allowlist ]
+        paths = [
+            '''sampleWorkspace/httpSchema/self-signed.key$''',
+        ]

package/.vscode/launch.json

@@ -17,6 +17,7 @@
       "env": {
         "APOLLO_ENGINE_ENDPOINT": "http://localhost:7096/apollo",
         "APOLLO_FEATURE_FLAGS": "rover"
+        //"APOLLO_ROVER_LANGUAGE_IDS": "graphql,javascript"
       },
       "outFiles": ["${workspaceRoot}/lib/**/*.js"]
     },

package/.vscodeignore

@@ -10,7 +10,6 @@ src
 .prettierrc
 .gitattributes
 codegen.yml
-graphql.configuration.json
 jest.*.ts
 jest.*.js
 package-lock.json

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 2.2.1
+
+### Patch Changes
+
+- [#198](https://github.com/apollographql/vscode-graphql/pull/198) [`3bebbdc4`](https://github.com/apollographql/vscode-graphql/commit/3bebbdc40faf8f9d62d0709de3312d5cb629af15) Thanks [@phryneas](https://github.com/phryneas)! - Change syntax highlighting of graphql object fields from "string" to "variable".
+
+- [#199](https://github.com/apollographql/vscode-graphql/pull/199) [`7c1172be`](https://github.com/apollographql/vscode-graphql/commit/7c1172be690488dbf0510c2d412cba502acd1468) Thanks [@phryneas](https://github.com/phryneas)! - Fix "Toggle Line Comment"
+
+- [#190](https://github.com/apollographql/vscode-graphql/pull/190) [`ec1e9927`](https://github.com/apollographql/vscode-graphql/commit/ec1e9927a178e75cae21d795d47426f40bf9d27b) Thanks [@phryneas](https://github.com/phryneas)! - Fix a bug that prevented `skipSSLValidation` from working.
+
+## 2.2.0
+
+### Minor Changes
+
+- [#184](https://github.com/apollographql/vscode-graphql/pull/184) [`9c53a11e`](https://github.com/apollographql/vscode-graphql/commit/9c53a11e3006dd69675af976ef3857212d8f9f43) Thanks [@phryneas](https://github.com/phryneas)! - Derive extensions for supported languages and monitored files from other installed extensions.
+  Adjust default `includes` for client projects.
+
+  This changes the default `includes` similar to (depending on additional extensions you might have installed):
+
+  ```diff
+  -'src/**/*.{ts,tsx,js,jsx,graphql,gql}',
+  +'src/**/*{.gql,.graphql,.graphqls,.js,.mjs,.cjs,.es6,.pac,.ts,.mts,.cts,.jsx,.tsx,.vue,.svelte,.py,.rpy,.pyw,.cpy,.gyp,.gypi,.pyi,.ipy,.pyt,.rb,.rbx,.rjs,.gemspec,.rake,.ru,.erb,.podspec,.rbi,.dart,.re,.ex,.exs}'
+  ```
+
 ## 2.1.0
 
 ### Minor 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.1.0",
+  "version": "2.2.1",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -40,7 +40,6 @@
     "@apollo/client": "3.11.4",
     "@apollo/subgraph": "2.8.4",
     "@graphql-tools/schema": "10.0.5",
-    "@wry/context": "0.7.4",
     "@wry/equality": "0.5.7",
     "cosmiconfig": "9.0.0",
     "dotenv": "16.4.5",
@@ -55,6 +54,7 @@
     "lz-string": "1.5.0",
     "minimatch": "10.0.1",
     "moment": "2.30.1",
+    "undici": "6.19.8",
     "vscode-languageclient": "9.0.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-textdocument": "1.0.12",

package/sampleWorkspace/httpSchema/apollo.config.ts

@@ -3,6 +3,8 @@ export default {
     service: {
       name: "httpSchema",
       url: "http://localhost:7096/graphql",
+      // url: "https://localhost:7097/graphql",
+      // skipSSLValidation: true,
     },
   },
 };

package/sampleWorkspace/httpSchema/self-signed.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIUVNlDGdat5znvwWhOEFQLq7BWzNwwDQYJKoZIhvcNAQEL
+BQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MB4X
+DTI0MDkwMjA4MTgwNloXDTM0MDgzMTA4MTgwNlowWTELMAkGA1UEBhMCQVUxEzAR
+BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
+IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvHLw9Ey0WoRLxjVIajxVAT4za1pUQw3E9mtl57DPHDcdGWR56S9w
+KPjmND5lrtALZ5K+EKqslJdPf6Uxzxpf6phVnwpFwq5hPeY/Gpm77HxpPiJ61Q9r
+fsYnLtGXiZta0kbdrisALB+3QykEHOerDUF3wGiVYVcpDu7WF/WcLaF+zUlgf1gQ
+RTa5B3HpdCk34LiKPm9IZpWRpgLC90ro+HP+nBo7FoLYwu+WiPxg49qWEUY8fk+d
+TuJVdH7lf8GxcfM2oCzhBGpT5O/t6lqYBkgZvvY3YAERmAxg/OSeuUa6ChOMLK2T
++2MRLy7eLaaeTmPMFjjrzFODCA2/ekfGVwIDAQABo1MwUTAdBgNVHQ4EFgQUpEu/
+mbpTwcOGdPZ8NhTl1e16G84wHwYDVR0jBBgwFoAUpEu/mbpTwcOGdPZ8NhTl1e16
+G84wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAhfSAl9VFS+Fk
+Wkmsl1ndoXvLWVDy36YepbNfXUeB+iwebIgdyZhNu6VdpcHsPNBuUV4wr4mgZ7PK
+Ksp3kKdqTDTAfBzHNBiOK7QgGyrDQJa0/Nn8ifmS+TYYCOs4FnkOXCUFipXCCMaS
+KzFYc9Ls4jtAxiSN58NmwxW9fqRHqwHW4o2Z/aNx4EnCEat0x4QcAqq/qfEodmjH
+jI7/AKb4UE+yEcJnZSlUDdpM4zPM3FcjmY7JVyfd/CziywR7rHGbLz7XQcCkYyDv
+5xqz0Lvk0ZtOC73cFWS41qfh8lrt34CNPoG7EaPFf+tMwhvjNooDHMQCb8y1A0Y3
+2yaDZNbCbQ==
+-----END CERTIFICATE-----

package/sampleWorkspace/httpSchema/self-signed.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8cvD0TLRahEvG
+NUhqPFUBPjNrWlRDDcT2a2XnsM8cNx0ZZHnpL3Ao+OY0PmWu0Atnkr4QqqyUl09/
+pTHPGl/qmFWfCkXCrmE95j8ambvsfGk+InrVD2t+xicu0ZeJm1rSRt2uKwAsH7dD
+KQQc56sNQXfAaJVhVykO7tYX9ZwtoX7NSWB/WBBFNrkHcel0KTfguIo+b0hmlZGm
+AsL3Suj4c/6cGjsWgtjC75aI/GDj2pYRRjx+T51O4lV0fuV/wbFx8zagLOEEalPk
+7+3qWpgGSBm+9jdgARGYDGD85J65RroKE4wsrZP7YxEvLt4tpp5OY8wWOOvMU4MI
+Db96R8ZXAgMBAAECggEAGRrrnHLZi2jY2sDUyF5dlAr6zlWcKHYITtceSNWmXyO9
+Ky8BChPen9QPgFdDCZ0VX94jQaooeqqGa0K71ijf2ADPq0ky46LX4+dYHHhC762K
+rGiV2kDceROh5bFYvFAniHWWE8gOalJsAjT6eMqo4DJgEeXSPMO1UxQguSlofdrX
+9PIkRmsmQVmVh17V4RJhhW/qg8r75OwpM1uFTknikaXwd9Rw5/HZhW4hXP5EeM2x
+rcaYtXudhUyG/AWCrRPpHdGGNpHPmpwKUw3uADYAb2Hicjswx34kmWAbcwVJMs8d
+3QR/4hyrJnVSgYAB8/5oiNsnvaF/sO6/9KkDFpF03QKBgQDxrVJznfA0xgeVTGxt
+sLRhbsUyVn5tHteEdbvbTGLfl80Dayzlht9rTrjYXgQUevw40+chQW8LPEA8gmyM
+oCyAMouk+DJ5rl75jQnQh1/pob+ReyFi7Jl4D6Ro8J6gP6nds+wZ/BN5WLNtd/KI
+BMwi4fEyKjT7nKTVFNQlrZEG6wKBgQDHng2nFYbSEKv1lb5HabSxJ1bbTHld0lzI
+tn5zEmZ9PW6jBM0UJMEmkPRAvzhGGnzbRM0hYhiZR1FBR9T6BCJb+1N0HfT0Xo2X
+MTOuz8auLRtH73SCRbRoxVbz+TFmLVQuwAXdwIT+p4AgEqoJ+QyMKwuwr70AGZmm
+SkL08Bp7RQKBgQDYZfOgJtmAx5jerFGiXkkFvSPBkQUfPDCKIMmW8WzO/KPL3dmT
+pBLFiPWmd3h7xiu1zrf0ZRzDGK4EAFymBn4SRDAaBUtc/S95kDoriCvvjK912qTo
+aSZ6BLeYZ2wB3T+CjqpoEfh1/WCcMnzuIi2PRnSsEHLkoTxOt5nGKwXjBQKBgDve
+o6mhQzZt2aVmrBMvGQqpCdvsK9p/5WQtl+9bbXHSowQxxHBuNaAjiZ6Bu5cLCreZ
+Aw0oJsiSI0S5Dp+N7eA4mOcStQ017rGSCDY+CxDiZnRE1WTdEyb5SQMTkkVbAwyi
+ex/vRfQ6uKrl7infkGvZ3T+49a65/uNpEnv0J30hAoGBAJwhlCGf3BhMPrXjXGsp
+qxtCAbnaARErq0cI/nP6EKv8U0zOte09j/KKqFhckzsN3Df+P7dSuciIbFEDFY8Y
+aWVRMDF/owMo7qrb/Hyvt72gRtRAeypN1Zf7Uy7JtP7PMqdvMynK0xSdrGAl4UCV
+6AOSsKQotsgA2R1PKV89Rn2R
+-----END PRIVATE KEY-----

package/src/__e2e__/mockServer.js

@@ -1,19 +1,43 @@
 // @ts-check
-const http = require("http");
 const {
   parseRequestParams,
   createHandler,
 } = require("graphql-http/lib/use/http");
 const { buildSchema } = require("graphql");
 const { Trie } = require("@wry/trie");
+const { readFileSync } = require("fs");
+const { join } = require("path");
 
-function runMockServer(
+async function runMockServer(
   /** @type {number}  */ port,
-  onStart = (/** @type {number}  */ port) => {},
+  useSelfSignedCert = false,
+  onStart = (/** @type {string}  */ baseUri) => {},
 ) {
   const mocks = new Trie(false);
 
-  const server = http.createServer(async (req, res) => {
+  /**
+   *
+   * @param {import('node:http').RequestListener} listener
+   * @returns
+   */
+  function createServer(listener) {
+    if (useSelfSignedCert) {
+      return require("node:https").createServer(
+        {
+          key: readFileSync(
+            join(__dirname, "../../sampleWorkspace/httpSchema/self-signed.key"),
+          ),
+          cert: readFileSync(
+            join(__dirname, "../../sampleWorkspace/httpSchema/self-signed.crt"),
+          ),
+        },
+        listener,
+      );
+    }
+    return require("node:http").createServer(listener);
+  }
+
+  const server = createServer(async (req, res) => {
     if (req.url === "/apollo") {
       if (req.method === "POST") {
         await handleApolloPost(req, res);
@@ -33,8 +57,9 @@ function runMockServer(
 
   console.log("Starting server...");
   server.listen(port);
-  onStart(port);
-  console.log(`Server ready at: http://localhost:${port}`);
+  const baseUri = `${useSelfSignedCert ? "https" : "http"}://localhost:${port}`;
+  await onStart(baseUri);
+  console.log(`Server ready at: ${baseUri}`);
   return {
     [Symbol.dispose]() {
       console.log("Closing server...");
@@ -45,8 +70,8 @@ function runMockServer(
 
   /**
    * Mock GraphQL Endpoint Handler
-   * @param {http.IncomingMessage} req
-   * @param {http.ServerResponse} res
+   * @param {import('node:http').IncomingMessage} req
+   * @param {import('node:http').ServerResponse} res
    */
   async function handleApolloPost(req, res) {
     const { operationName, variables } =
@@ -79,8 +104,8 @@ function runMockServer(
 
   /**
    * Handler to accept new GraphQL Mocks
-   * @param {http.IncomingMessage} req
-   * @param {http.ServerResponse} res
+   * @param {import('node:http').IncomingMessage} req
+   * @param {import('node:http').ServerResponse} res
    */
   async function handleApolloPut(req, res) {
     const body = await new Promise((resolve) => {
@@ -111,7 +136,8 @@ const schemaHandler = createHandler({
 });
 
 if (require.main === module) {
-  runMockServer(7096, require("./mocks.js").loadDefaultMocks);
+  runMockServer(7096, false, require("./mocks.js").loadDefaultMocks);
+  runMockServer(7097, true, require("./mocks.js").loadDefaultMocks);
 }
 
 module.exports.runMockServer = runMockServer;

package/src/__e2e__/mocks.js

@@ -1,26 +1,30 @@
 // @ts-check
-
-async function loadDefaultMocks(/** @type {number} */ port) {
-  await sendMock(port, FrontendUrlRoot);
-  await sendMock(port, SchemaTagsAndFieldStats);
-  await sendMock(port, GetSchemaByTag);
+async function loadDefaultMocks(/** @type {string} */ baseUri) {
+  await sendMock(baseUri, FrontendUrlRoot);
+  await sendMock(baseUri, SchemaTagsAndFieldStats);
+  await sendMock(baseUri, GetSchemaByTag);
 }
 
 function sendMock(
-  /** @type {number} */ port,
+  /** @type {string} */ baseUri,
   /** @type { { operationName: string, variables: Record<string, string>, response: unknown }} */ {
     operationName,
     variables,
     response,
   },
 ) {
-  return fetch(`http://localhost:${port}/apollo`, {
+  return require("undici").fetch(`${baseUri}/apollo`, {
     method: "PUT",
     body: JSON.stringify({
       operationName,
       variables,
       response,
     }),
+    dispatcher: new (require("undici").Agent)({
+      connect: {
+        rejectUnauthorized: false,
+      },
+    }),
   });
 }
 

package/src/__e2e__/runTests.js

@@ -5,7 +5,7 @@ const { runMockServer } = require("./mockServer.js");
 const { loadDefaultMocks } = require("./mocks.js");
 
 async function main() {
-  let disposable;
+  const disposables = /**{@type Disposable[]}*/ [];
   try {
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
@@ -18,8 +18,12 @@ async function main() {
     const TEST_PORT = 7096;
     process.env.APOLLO_ENGINE_ENDPOINT = "http://localhost:7096/apollo";
     process.env.MOCK_SERVER_PORT = String(TEST_PORT);
-    disposable = runMockServer(TEST_PORT);
-    await loadDefaultMocks(TEST_PORT);
+    disposables.push(
+      ...(await Promise.all([
+        runMockServer(TEST_PORT, false, loadDefaultMocks),
+        runMockServer(TEST_PORT + 1, true, loadDefaultMocks),
+      ])),
+    );
     // Download VS Code, unzip it and run the integration test
     const exitCode = await runTests({
       extensionDevelopmentPath,
@@ -35,9 +39,7 @@ async function main() {
     console.error("Failed to run tests");
     process.exit(1);
   } finally {
-    if (disposable) {
-      disposable[Symbol.dispose]();
-    }
+    disposables.forEach((d) => d[Symbol.dispose]());
   }
 }
 

package/src/language-server/__e2e__/studioGraph.e2e.ts

@@ -37,9 +37,10 @@ Get detailed profile information about the current user (including the current u
 });
 
 test("wrong token", async () => {
+  const baseUri = `http://localhost:${mockPort}`;
   try {
-    await mocks.sendMock(mockPort, mocks.GetSchemaByTag_WRONG_TOKEN);
-    await mocks.sendMock(mockPort, mocks.SchemaTagsAndFieldStats_WRONG_TOKEN);
+    await mocks.sendMock(baseUri, mocks.GetSchemaByTag_WRONG_TOKEN);
+    await mocks.sendMock(baseUri, mocks.SchemaTagsAndFieldStats_WRONG_TOKEN);
 
     const ext = getExtension();
     ext.outputChannel.clear();
@@ -59,7 +60,7 @@ Invalid credentials provided
     at new ApolloError`.trim(),
     );
   } finally {
-    await mocks.loadDefaultMocks(mockPort);
+    await mocks.loadDefaultMocks(baseUri);
     await reloadService();
   }
 });

package/src/language-server/config/__tests__/loadConfig.ts

@@ -99,9 +99,6 @@ Object {
       "**/node_modules",
       "**/__tests__",
     ],
-    "includes": Array [
-      "src/**/*.{ts,tsx,js,jsx,graphql,gql}",
-    ],
     "service": "hello",
     "tagName": "gql",
   },
@@ -137,6 +134,7 @@ Object {
   },
   "rover": Object {
     "bin": "${dir}/bin/rover",
+    "extraArgs": Array [],
   },
 }
 `);
@@ -395,9 +393,14 @@ Object {
         configPath: dirPath,
       });
 
-      expect((config?.rawConfig as any).client.includes).toEqual([
-        "src/**/*.{ts,tsx,js,jsx,graphql,gql}",
-      ]);
+      expect((config?.rawConfig as any).client.includes).toEqual(
+        /**
+         * This will be calculated in the `GraphQLInternalProject` constructor by calling `getSupportedExtensions()`
+         * which will have information about all the extensions added by other VSCode extensions for the language ids
+         * that Apollo supports.
+         */
+        undefined,
+      );
     });
 
     it("merges engine config defaults", async () => {

package/src/language-server/config/config.ts

@@ -1,13 +1,14 @@
-import { dirname } from "path";
+import { dirname, join } from "path";
 import { URI } from "vscode-uri";
 import { getGraphIdFromConfig, parseServiceSpecifier } from "./utils";
 import { Debug } from "../utilities";
 import z, { ZodError } from "zod";
 import { ValidationRule } from "graphql/validation/ValidationContext";
-import { Slot } from "@wry/context";
 import { fromZodError } from "zod-validation-error";
 import which from "which";
 import { accessSync, constants as fsConstants, statSync } from "node:fs";
+import { AsyncLocalStorage } from "async_hooks";
+import { existsSync } from "fs";
 
 const ROVER_AVAILABLE = (process.env.APOLLO_FEATURE_FLAGS || "")
   .split(",")
@@ -29,8 +30,9 @@ function ignoredFieldWarning(
 export interface Context {
   apiKey?: string;
   serviceName?: string;
+  configPath?: string;
 }
-const context = new Slot<Context>();
+const contextStore = new AsyncLocalStorage<Context>();
 
 const studioServiceConfig = z.string();
 
@@ -49,7 +51,7 @@ const localServiceConfig = z.object({
 export type LocalServiceConfig = z.infer<typeof localServiceConfig>;
 
 const clientServiceConfig = z.preprocess(
-  (value) => value || context.getValue()?.serviceName,
+  (value) => value || contextStore.getStore()?.serviceName,
   z.union([studioServiceConfig, remoteServiceConfig, localServiceConfig]),
 );
 export type ClientServiceConfig = z.infer<typeof clientServiceConfig>;
@@ -63,9 +65,7 @@ const clientConfig = z.object({
     ])
     .optional(),
   // maybe shared with rover?
-  includes: z
-    .array(z.string())
-    .default(["src/**/*.{ts,tsx,js,jsx,graphql,gql}"]),
+  includes: z.array(z.string()).optional(),
   // maybe shared with rover?
   excludes: z.array(z.string()).default(["**/node_modules", "**/__tests__"]),
   // maybe shared with rover?
@@ -106,6 +106,21 @@ const roverConfig = z.object({
       },
     ),
   profile: z.string().optional(),
+  supergraphConfig: z
+    .preprocess((value) => {
+      if (value !== undefined) return value;
+      const configPath = contextStore.getStore()?.configPath!;
+      const supergraphConfig = join(configPath, "supergraph.yaml");
+      return existsSync(supergraphConfig) ? supergraphConfig : undefined;
+    }, z.string().nullable().optional())
+    .describe(
+      "The path to your `supergraph.yaml` file. \n" +
+        "Defaults to a `supergraph.yaml` in the folder of your `apollo.config.js`, if there is one.",
+    ),
+  extraArgs: z
+    .array(z.string())
+    .default([])
+    .describe("Extra arguments to pass to the Rover CLI."),
 });
 type RoverConfigFormat = z.infer<typeof roverConfig>;
 
@@ -117,7 +132,7 @@ const engineConfig = z.object({
         "https://graphql.api.apollographql.com/api/graphql",
     ),
   apiKey: z.preprocess(
-    (val) => val || context.getValue()?.apiKey,
+    (val) => val || contextStore.getStore()?.apiKey,
     z.string().optional(),
   ),
 });
@@ -202,9 +217,7 @@ export function parseApolloConfig(
   configURI?: URI,
   ctx: Context = {},
 ) {
-  const parsed = context.withValue(ctx, () =>
-    configSchema.safeParse(rawConfig),
-  );
+  const parsed = contextStore.run(ctx, () => configSchema.safeParse(rawConfig));
   if (!parsed.success) {
     // Remove "or Required at rover" errors when a client config is provided
     // Remove "or Required at client" errors when a rover config is provided

package/src/language-server/config/loadConfig.ts

@@ -1,5 +1,5 @@
 import { cosmiconfig, defaultLoaders } from "cosmiconfig";
-import { resolve } from "path";
+import { dirname, resolve } from "path";
 import { readFileSync, existsSync, lstatSync } from "fs";
 import {
   ApolloConfig,
@@ -103,5 +103,6 @@ export async function loadConfig({
   return parseApolloConfig(config, URI.file(resolve(filepath)), {
     apiKey,
     serviceName: nameFromKey,
+    configPath: dirname(filepath),
   });
 }

package/src/language-server/fileSet.ts

@@ -14,12 +14,10 @@ export class FileSet {
     rootURI,
     includes,
     excludes,
-    configURI,
   }: {
     rootURI: URI;
     includes: string[];
     excludes: string[];
-    configURI?: URI;
   }) {
     invariant(rootURI, `Must provide "rootURI".`);
     invariant(includes, `Must provide "includes".`);
@@ -30,13 +28,6 @@ export class FileSet {
     this.excludes = excludes;
   }
 
-  pushIncludes(files: string[]) {
-    this.includes.push(...files);
-  }
-  pushExcludes(files: string[]) {
-    this.excludes.push(...files);
-  }
-
   includesFile(filePath: string): boolean {
     const normalizedFilePath = normalizeURI(filePath);
 
@@ -57,10 +48,14 @@ export class FileSet {
   }
 
   allFiles(): string[] {
-    // since glob.sync takes a single pattern, but we allow an array of `includes`, we can join all the
-    // `includes` globs into a single pattern and pass to glob.sync. The `ignore` option does, however, allow
-    // an array of globs to ignore, so we can pass it in directly
-    const joinedIncludes = `{${this.includes.join(",")}}`;
+    const joinedIncludes =
+      this.includes.length == 1
+        ? this.includes[0]
+        : // since glob.sync takes a single pattern, but we allow an array of `includes`, we can join all the
+          // `includes` globs into a single pattern and pass to glob.sync. The `ignore` option does, however, allow
+          // an array of globs to ignore, so we can pass it in directly
+          `{${this.includes.join(",")}}`;
+
     return globSync(joinedIncludes, {
       cwd: this.rootURI.fsPath,
       absolute: true,