vscode-apollo 2.3.5 → 2.4.0

package/.github/workflows/E2E.yml

@@ -7,26 +7,63 @@ on:
 jobs:
   test:
     name: Run E2E tests
-    runs-on: ubuntu-latest
+    runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
         version: ["1.90.0", "stable", "insiders"]
+        os: [ubuntu-latest]
+        include:
+          - version: "stable"
+            os: "windows-latest"
     steps:
-      - run: sudo apt update && sudo apt install -y libasound2t64 libgbm1 libgtk-3-0 libnss3 xvfb expect
+      - run: sudo apt update && sudo apt install -y libasound2 libgbm1 libgtk-3-0 libnss3 xvfb expect
+        if: runner.os == 'Linux'
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           cache: "npm"
       - run: npm install
-      - run: npm run build:production
       - run: echo 'APOLLO_KEY="service:bob-123:489fhseo4"' > ./sampleWorkspace/spotifyGraph/.env
-      - run: |
+        shell: bash
+      - name: Install & Configure Rover (Linux)
+        run: |
           expect <<EOF
           spawn ./node_modules/.bin/rover config auth --profile VSCode-E2E
           expect "Copy the key and paste it into the prompt below."
           send -- "test\n"
           expect eof
           EOF
-      - run: xvfb-run -a npm run test:extension
+        if: runner.os == 'Linux'
+      - name: Install Rover (Windows)
+        run: ./node_modules/.bin/rover.cmd --version
+        if: runner.os == 'Windows'
+      - name: Configure Rover (Windows)
+        run: |
+          [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")
+          Start-Process -FilePath ./node_modules/.bin/rover.cmd -ArgumentList "config","auth","--profile","VSCode-E2E"
+
+          Start-Sleep -m 1000
+
+          [System.Windows.Forms.SendKeys]::SendWait("test")
+          [System.Windows.Forms.SendKeys]::SendWait("{ENTER}")
+        if: runner.os == 'Windows'
+        shell: powershell
+      - name: Adjust configuration (Windows)
+        run: |
+          sed -i -e 's/\(bin:.*\)/\1.exe/' sampleWorkspace/rover/apollo.config.yaml
+          cat sampleWorkspace/rover/apollo.config.yaml
+          # for some reason, windows seems to ignore the jest.e2e.config.js file
+          echo "module.exports = require('./jest.e2e.config')" > jest.config.ts
+        shell: bash
+        if: runner.os == 'Windows'
+      - run: npm run build:production
+      - name: "Run Extension E2E tests (Linux)"
+        run: xvfb-run -a npm run test:extension
+        env:
+          VSCODE_VERSION: "${{ matrix.version }}"
+        if: runner.os == 'Linux'
+      - name: "Run Extension E2E tests (Windows)"
+        run: npm run test:extension
         env:
           VSCODE_VERSION: "${{ matrix.version }}"
+        if: runner.os == 'Windows'

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 2.4.0
+
+### Minor Changes
+
+- [#236](https://github.com/apollographql/vscode-graphql/pull/236) [`9a4403db`](https://github.com/apollographql/vscode-graphql/commit/9a4403db7b8f9cb03638d83a7e3c29dd3c3077b7) Thanks [@pubmodmatt](https://github.com/pubmodmatt)! - Add support for GraphQL in Notebook cells
+
+### Patch Changes
+
+- [#240](https://github.com/apollographql/vscode-graphql/pull/240) [`3dfd9ac0`](https://github.com/apollographql/vscode-graphql/commit/3dfd9ac08a20ff92cafb398f1a8c71e5f7d03519) Thanks [@phryneas](https://github.com/phryneas)! - Fix a bug handling windows path separators in `FileSet` instances.
+
+## 2.3.6
+
+### Patch Changes
+
+- [#216](https://github.com/apollographql/vscode-graphql/pull/216) [`1add31e0`](https://github.com/apollographql/vscode-graphql/commit/1add31e0e9bc2da92ea7c3a1c65206cc5d95bb68) Thanks [@phryneas](https://github.com/phryneas)! - Add JSON schema for `supergraph.yaml`.
+
 ## 2.3.5
 
 ### 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.3.5",
+  "version": "2.4.0",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -258,6 +258,10 @@
       {
         "fileMatch": "apollo.config.yaml",
         "url": "./schemas/apollo.config.schema.json"
+      },
+      {
+        "fileMatch": "supergraph.yaml",
+        "url": "./schemas/supergraph_config_schema.json"
       }
     ],
     "commands": [

package/schemas/supergraph_config_schema.json

@@ -0,0 +1,119 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "SupergraphConfig",
+  "description": "The configuration for a single supergraph composed of multiple subgraphs.",
+  "type": "object",
+  "required": [
+    "subgraphs"
+  ],
+  "properties": {
+    "federation_version": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/FederationVersion"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "subgraphs": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/SubgraphConfig"
+      }
+    }
+  },
+  "definitions": {
+    "FederationVersion": {
+      "pattern": "^(1|2|=2\\.\\d+\\.\\d+.*)$"
+    },
+    "SchemaSource": {
+      "description": "Options for getting SDL: the graph registry, a file, or an introspection URL.\n\nNOTE: Introspection strips all comments and directives from the SDL.",
+      "anyOf": [
+        {
+          "type": "object",
+          "required": [
+            "file"
+          ],
+          "properties": {
+            "file": {
+              "type": "string"
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "subgraph_url"
+          ],
+          "properties": {
+            "introspection_headers": {
+              "type": [
+                "object",
+                "null"
+              ],
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            "subgraph_url": {
+              "type": "string",
+              "format": "uri"
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "graphref",
+            "subgraph"
+          ],
+          "properties": {
+            "graphref": {
+              "type": "string"
+            },
+            "subgraph": {
+              "type": "string"
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "sdl"
+          ],
+          "properties": {
+            "sdl": {
+              "type": "string"
+            }
+          }
+        }
+      ]
+    },
+    "SubgraphConfig": {
+      "description": "Config for a single [subgraph](https://www.apollographql.com/docs/federation/subgraphs/)",
+      "type": "object",
+      "required": [
+        "schema"
+      ],
+      "properties": {
+        "routing_url": {
+          "description": "The routing URL for the subgraph. This will appear in supergraph SDL and instructs the graph router to send all requests for this subgraph to this URL.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "schema": {
+          "description": "The location of the subgraph's SDL",
+          "allOf": [
+            {
+              "$ref": "#/definitions/SchemaSource"
+            }
+          ]
+        }
+      }
+    }
+  }
+}

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

@@ -41,6 +41,11 @@ if (test === origTest.skip) {
   );
 }
 
+if (process.platform === "win32") {
+  console.info("Skipping rover E2E tests in Windows");
+  test = origTest.skip;
+}
+
 let editor: TextEditor;
 let getPosition: GetPositionFn;
 beforeAll(async () => {

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

@@ -63,13 +63,13 @@ test("wrong token", async () => {
 
     // currently, this logs twice, along with a full stracktrace, but no indication of where it came from
     // this should be improved on.
-    expect(output).toContain(
+    expect(output.replace(/\s/g, "")).toContain(
       `
 [GraphQL error]: HTTP fetch failed from 'kotlin': 406: Not Acceptable
 [GraphQL error]: Invalid credentials provided
 ApolloError: HTTP fetch failed from 'kotlin': 406: Not Acceptable
 Invalid credentials provided
-    at new ApolloError`.trim(),
+    at new ApolloError`.replace(/\s/g, ""),
     );
   } finally {
     await mocks.loadDefaultMocks(baseUri);

package/src/language-server/fileSet.ts

@@ -2,7 +2,7 @@ import { minimatch } from "minimatch";
 import { globSync } from "glob";
 import { invariant } from "../tools";
 import { URI } from "vscode-uri";
-import { normalizeURI } from "./utilities";
+import { normalizeURI, withUnixSeparator } from "./utilities";
 import { resolve } from "path";
 
 export class FileSet {
@@ -35,13 +35,13 @@ export class FileSet {
       this.includes.some((include) => {
         return minimatch(
           normalizedFilePath,
-          resolve(this.rootURI.fsPath, include),
+          withUnixSeparator(resolve(this.rootURI.fsPath, include)),
         );
       }) &&
       !this.excludes.some((exclude) => {
         return minimatch(
           normalizedFilePath,
-          resolve(this.rootURI.fsPath, exclude),
+          withUnixSeparator(resolve(this.rootURI.fsPath, exclude)),
         );
       })
     );

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

@@ -48,6 +48,7 @@ const fileAssociations: { [extension: string]: string } = {
   ".re": "reason",
   ".ex": "elixir",
   ".exs": "elixir",
+  ".ipynb": "python",
 };
 
 export interface GraphQLInternalProjectConfig extends GraphQLProjectConfig {

package/src/language-server/server.ts

@@ -157,13 +157,14 @@ connection.onInitialized(async () => {
 });
 
 const documents = new TextDocuments(TextDocument);
+const schemes = ["file", "vscode-notebook-cell"];
 
 // Make the text document manager listen on the connection
 // for open, change and close text document events
 documents.listen(connection);
 
-function isFile(uri: string) {
-  return URI.parse(uri).scheme === "file";
+function isEnabledDocument(uri: string) {
+  return schemes.includes(URI.parse(uri).scheme);
 }
 
 documents.onDidChangeContent((params) => {
@@ -173,8 +174,7 @@ documents.onDidChangeContent((params) => {
   );
   if (!project) return;
 
-  // Only watch changes to files
-  if (!isFile(params.document.uri)) {
+  if (!isEnabledDocument(params.document.uri)) {
     return;
   }
 
@@ -213,8 +213,7 @@ connection.onDidChangeWatchedFiles((params) => {
       continue;
     }
 
-    // Only watch changes to files
-    if (!isFile(uri)) {
+    if (!isEnabledDocument(uri)) {
       continue;
     }
 

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

@@ -1,6 +1,6 @@
 import { URI } from "vscode-uri";
 
-const withUnixSeparator = (uriString: string) =>
+export const withUnixSeparator = (uriString: string) =>
   uriString.split(/[\/\\]/).join("/");
 
 export const normalizeURI = (uriString: string) => {

package/src/tools/utilities/languageInformation.ts

@@ -30,7 +30,7 @@ export const minimumKnownExtensions: Record<
   typescriptreact: [".tsx"],
   vue: [".vue"],
   svelte: [".svelte"],
-  python: [".py"],
+  python: [".py", ".ipynb"],
   ruby: [".rb"],
   dart: [".dart"],
   reason: [".re"],