vscode-apollo 2.5.5 → 2.6.0

package/sampleWorkspace/sampleWorkspace.code-workspace

@@ -1,32 +1,53 @@
 {
   "folders": [
     {
-      "path": "localSchema",
+      "path": "localSchema"
     },
     {
-      "path": "clientSchema",
+      "path": "clientSchema"
     },
     {
-      "path": "spotifyGraph",
+      "path": "spotifyGraph"
     },
     {
-      "path": "httpSchema",
+      "path": "httpSchema"
     },
     {
-      "path": "localSchemaArray",
+      "path": "localSchemaArray"
     },
     {
-      "path": "rover",
+      "path": "rover"
     },
     {
-      "path": "configFileTypes",
+      "path": "configFileTypes"
     },
     {
-      "path": "../src/language-server/__tests__/fixtures/documents",
+      "path": "../src/language-server/__tests__/fixtures/documents"
     },
+    {
+      "path": "../src/__tests__/fixtures"
+    },
+    {
+      "path": "connectors-community/connectors"
+    }
   ],
   "settings": {
     "apollographql.devTools.showPanel": "detect",
     "apollographql.devTools.serverPort": 7095,
+    "editor.tokenColorCustomizations": {
+     "textMateRules": [
+        {
+          "scope": [ "meta.repository" ],
+          "settings": { "fontStyle": "underline" }
+        },
+        {
+          "scope": ["meta.repository.Comment.identifier"],
+          "settings": {
+            "foreground": "#ffffff17",
+            "fontStyle": ""
+          }
+        }
+      ]
+    },
   },
 }

package/src/__tests__/fixtures/textmate/test.apollo.connectors.mapping

@@ -0,0 +1,213 @@
+# SYNTAX TEST "source.apollo.connectors.mapping"
+
+
+foo
+#<---           repository.NamedFieldSelection
+foo bar
+#<---           repository.NamedFieldSelection
+#  ^            - repository.NamedFieldSelection
+#   ^^^         repository.NamedFieldSelection
+alias: field
+#<------------  repository.NamedFieldSelection
+
+$( foo )
+#<-------- repository.ExprPath
+$( foo ).bar
+#<------------ repository.ExprPath
+#       ^^^^ repository.PathStepDotAccess
+$( foo )->bar
+#<------------- repository.ExprPath
+#       ^^^^^ repository.PathStepArrowAccess
+$( foo )->bar("asd")
+#<-------------------- repository.ExprPath
+#       ^^^^^^^^^^^^ repository.PathStepArrowMethodArgs
+#             ^^^^^  repository.LitString
+
+
+$( foo )->ma("asd")    # not builtin function
+#         ^^          repository.PathStepArrowMethodArgs.beginCaptures.2
+#         ^^          - repository.PathStepArrowMethodArgs.beginCaptures.3
+$( foo )->map("asd")   # builtin function
+#         ^^^          repository.PathStepArrowMethodArgs.beginCaptures.2
+#         ^^^          repository.PathStepArrowMethodArgs.beginCaptures.3
+
+$foo
+#<-------- repository.VarPath
+$foo.bar
+#<-------- repository.VarPath
+#   ^^^^ repository.PathStepDotAccess
+$foo->bar
+#<--------- repository.VarPath
+#   ^^^^^ repository.PathStepArrowAccess
+$foo->bar("asd")
+#<---------------- repository.VarPath
+#   ^^^^^^^^^^^^ repository.PathStepArrowMethodArgs
+#         ^^^^^  repository.LitString
+
+
+asd.bar
+#<------- repository.KeyPath
+#  ^^^^ repository.PathStepDotAccess
+asd->bar
+#<-------- repository.KeyPath
+#  ^^^^^ repository.PathStepArrowAccess
+asd->bar("asd")
+#<--------------- repository.KeyPath
+#  ^^^^^^^^^^^^ repository.PathStepArrowMethodArgs
+#        ^^^^^  repository.LitString
+
+
+"asd".bar
+#<--------- repository.KeyPath
+#    ^^^^ repository.PathStepDotAccess
+"asd"->bar
+#<---------- repository.KeyPath
+#    ^^^^^ repository.PathStepArrowAccess
+"asd"->bar("asd")
+#<----------------- repository.KeyPath
+#    ^^^^^^^^^^^^ repository.PathStepArrowMethodArgs
+#          ^^^^^  repository.LitString
+
+## AtPath
+@
+#<~ repository.AtPath
+@.bar
+#<----- repository.AtPath
+#^^^^ repository.PathStepDotAccess
+@->bar
+#<------ repository.AtPath
+#^^^^^ repository.PathStepArrowAccess
+@->bar("asd")
+#<------------- repository.AtPath
+#^^^^^^^^^^^^ repository.PathStepArrowMethodArgs
+#      ^^^^^  repository.LitString
+
+
+@->a("asd")
+#    ^^^^^  repository.LitString
+#^^^^     ^ - repository.LitString
+@->a("a'd")
+#    ^^^^^  repository.LitString
+#^^^^     ^ - repository.LitString
+@->a("asd\\")
+#    ^^^^^^^  repository.LitString
+#^^^^       ^ - repository.LitString
+@->a("asd\"")
+#    ^^^^^^^  repository.LitString
+#^^^^       ^ - repository.LitString
+@->a("asd\\\"")
+#    ^^^^^^^^^  repository.LitString
+#^^^^         ^ - repository.LitString
+@->a("asd\\\\")
+#    ^^^^^^^^^  repository.LitString
+#^^^^         ^ - repository.LitString
+@->a("as\"d
+#    ^^^^^^ repository.LitString
+#^^^^       - repository.LitString
+as\\d")
+#<----- repository.LitString
+#     ^ - repository.LitString
+@->a('asd')
+#    ^^^^^  repository.LitString
+#^^^^     ^ - repository.LitString
+@->a('a"d')
+#    ^^^^^  repository.LitString
+#^^^^     ^ - repository.LitString
+@->a('asd\\')
+#    ^^^^^^^  repository.LitString
+#^^^^       ^ - repository.LitString
+@->a('asd\'')
+#    ^^^^^^^  repository.LitString
+#^^^^       ^ - repository.LitString
+@->a('asd\\\'')
+#    ^^^^^^^^^  repository.LitString
+#^^^^         ^ - repository.LitString
+@->a('asd\\\\')
+#    ^^^^^^^^^  repository.LitString
+#^^^^         ^ - repository.LitString
+@->a('as\'d
+#    ^^^^^^ repository.LitString
+#^^^^       - repository.LitString
+as\\d')
+#<----- repository.LitString
+#     ^ - repository.LitString
+
+
+@->a(1)
+#    ^  repository.LitNumber
+@->a(-1)
+#    ^^  repository.LitNumber
+@->a(1.0)
+#    ^^^  repository.LitNumber
+@->a(-1.0)
+#    ^^^^  repository.LitNumber
+@->a(1.)
+#    ^^  repository.LitNumber
+@->a(-1.)
+#    ^^^  repository.LitNumber
+@->a(.0)
+#    ^^  repository.LitNumber
+@->a(-.0)
+#    ^^^  repository.LitNumber
+
+@->a(true)
+#    ^^^^  repository.LitPrimitive.patterns.2
+@->a(false)
+#    ^^^^^  repository.LitPrimitive.patterns.2
+@->a(null)
+#    ^^^^  repository.LitPrimitive.patterns.2
+
+
+@->a({ foo: 1, bar: "baz" })
+#    ^^^^^^^^^^^^^^^^^^^^^^  repository.LitObject
+#      ^^^^^^  ^^^^^^^^^^    repository.LitProperty
+#    ^^      ^^          ^^  - repository.LitProperty
+
+@->a({
+#    ^                      repository.LitObject
+  a: 1,
+#<--------------------------- repository.LitObject
+#    ^                      repository.LitNumber
+# ^^^^                      repository.LitProperty
+#     ^                     - repository.LitProperty
+  b: "asd",
+#<--------------------------- repository.LitObject
+#    ^^^^^                  repository.LitString
+# ^^^^^^^^                  repository.LitProperty
+#         ^                 - repository.LitProperty
+  c: { foo: 1, bar: "baz" }
+#<--------------------------- repository.LitObject
+})
+#<~                         repository.LitObject
+
+
+@->a([ 1, "a", { foo: 1 } ])
+#    ^^^^^^^^^^^^^^^^^^^^^^  repository.LitArray
+#      ^                     repository.LitNumber
+#         ^^^                repository.LitString
+#              ^^^^^^^^^^    repository.LitObject
+#                ^^^^^^      repository.LitProperty
+#                     ^      repository.LitNumber
+
+@->a([
+#    ^      repository.LitArray
+  1,
+#<---------   repository.LitArray
+# ^                     repository.LitNumber
+  "a",
+#<---------   repository.LitArray
+# ^^^                repository.LitString
+  {foo:1}
+#<---------   repository.LitArray
+# ^^^^^^^   repository.LitObject
+#  ^^^^^    repository.LitProperty
+#      ^    repository.LitNumber
+])
+#<~         repository.LitArray
+
+
+@->a("y"->foo)
+#       ^^^^^ repository.LitPathTail
+
+@->a("y" || "foo" + $asd)
+#        ^^       ^        repository.LitOpChainCenter

package/src/__tests__/fixtures/textmate/test.connect.graphql

@@ -0,0 +1,104 @@
+# SYNTAX TEST "source.graphql"
+
+type Query {
+  post(id: ID!): Post
+    @connect(
+      source: "jsonPlaceholder"
+#             ^^^^^^^^^^^^^^^^^^       - repository.JSONSelectionString
+      http: {
+        GET:    "/posts/{ $args.id }"
+#               ^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                       ^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded
+#               ^^^^^^^^            ^  - repository.JSONSelectionString.patterns.embedded
+#                         ^^^^^^^^     repository.VarPath
+#               ^^^^^^^^^^        ^^^  - repository.VarPath
+        POST:   "/posts/{ $args.id }"
+#               ^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                       ^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded
+#               ^^^^^^^^            ^  - repository.JSONSelectionString.patterns.embedded
+#                         ^^^^^^^^     repository.VarPath
+#               ^^^^^^^^^^        ^^^  - repository.VarPath
+        PATCH:  "/posts/{ $args.id }"
+#               ^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                       ^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded
+#               ^^^^^^^^            ^  - repository.JSONSelectionString.patterns.embedded
+#                         ^^^^^^^^     repository.VarPath
+#               ^^^^^^^^^^        ^^^  - repository.VarPath
+        DELETE: "/posts/{ $args.id }"
+#               ^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                       ^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded
+#               ^^^^^^^^            ^  - repository.JSONSelectionString.patterns.embedded
+#                         ^^^^^^^^     repository.VarPath
+#               ^^^^^^^^^^        ^^^  - repository.VarPath
+        PUT:    "/posts/{ $args.id }"
+#               ^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                       ^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded
+#               ^^^^^^^^            ^  - repository.JSONSelectionString.patterns.embedded
+#                         ^^^^^^^^     repository.VarPath
+#               ^^^^^^^^^^        ^^^  - repository.VarPath
+        headers: [{ name: "Authorization", value: "Bearer {$config.apiKey}" }]
+#                         ^^^^^^^^^^^^^^^         ^^^^^^^^^^^^^^^^^^^^^^^^    repository.JSONSelectionString
+#                                                         ^^^^^^^^^^^^^^^^    repository.JSONSelectionString.patterns.embedded
+#                                                          ^^^^^^^^^^^^^^     repository.VarPath
+        headers: [
+          { name: "Authorization", value: "Bearer {$config.apiKey}" }
+#                 ^^^^^^^^^^^^^^^         ^^^^^^^^^^^^^^^^^^^^^^^^            repository.JSONSelectionString
+#                                                 ^^^^^^^^^^^^^^^^            repository.JSONSelectionString.patterns.embedded
+#                                                  ^^^^^^^^^^^^^^             repository.VarPath
+        ]
+        headers: [
+          {
+            name: "Authorization",
+#                 ^^^^^^^^^^^^^^^            repository.JSONSelectionString
+            value: "Bearer {$config.apiKey}"
+#                  ^^^^^^^^^^^^^^^^^^^^^^^^  repository.JSONSelectionString
+#                           ^^^^^^^^^^^^^^   repository.JSONSelectionString.patterns.embedded repository.VarPath
+          }
+        ]
+        body: """  
+# ^^^^^^^^^^^^^^^                      - meta.embedded.block.connectors.mapping.graphql
+#                ^^^^^^^^^^^^^^^^^^^^^ meta.embedded.block.connectors.mapping.graphql
+        listing: {
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+#       ^^^^^^^                        repository.NamedSelection.patterns.3.beginCaptures.1
+#                ^                     repository.SubSelection
+          title: $args.input.title
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+#<------------------------------------ repository.SubSelection
+#         ^^^^^                        repository.NamedSelection.patterns.0.beginCaptures.1
+#                ^^^^^^^^^^^^^^^^^     repository.VarPath
+        }
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+#<--------                             repository.SubSelection
+        """
+#^^^^^^^                               meta.embedded.block.connectors.mapping.graphql
+#       ^^^^^^^^^^^^^^^^^^^^^^^^^      - meta.embedded.block.connectors.mapping.graphql
+      body: "foo: bar $.root { a }"
+#            ^^^^^^^^^^^^^^^^^^^^^     meta.embedded.line.connectors.mapping.graphql
+#^^^^^^^^^^^^                     ^    - meta.embedded.line.connectors.mapping.graphql
+#            ^^^^^^^^          ^       repository.NamedFieldSelection
+#                     ^^^^^^           repository.VarPath
+      }
+      selection: """  
+# ^^^^^^^^^^^^^^^^^^                   - meta.embedded.block.connectors.mapping.graphql
+#                   ^^^^^^^^^^^^^^^^^^ meta.embedded.block.connectors.mapping.graphql
+      foo: bar
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+#     ^^^^^^^^                         repository.NamedFieldSelection
+      $.root {
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+#     ^^^^^^                           repository.VarPath
+        a
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+      }
+#<------------------------------------ meta.embedded.block.connectors.mapping.graphql
+      """
+#^^^^^                                 meta.embedded.block.connectors.mapping.graphql
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.embedded.block.connectors.mapping.graphql
+      selection: "foo: bar $.root { a }"
+#                 ^^^^^^^^^^^^^^^^^^^^^    meta.embedded.line.connectors.mapping.graphql
+#^^^^^^^^^^^^^^^^^                     ^ - meta.embedded.line.connectors.mapping.graphql
+#                 ^^^^^^^^          ^    repository.NamedFieldSelection
+#                          ^^^^^^        repository.VarPath
+    )
+}

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

@@ -21,14 +21,14 @@ test.each([
 ] as const)("%s with `type: '%s'`", async (project, moduleType) => {
   await writeFile(
     resolveRelativeToSampleWorkspace(`configFileTypes/${project}/package.json`),
-    JSON.stringify(
+    `${JSON.stringify(
       {
         name: "test",
         type: moduleType,
       },
       undefined,
       2,
-    ),
+    )}\n`,
     "utf-8",
   );
   await reloadService();

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

@@ -1,9 +1,3 @@
-import { test as origTest } from "@jest/globals";
-import { load } from "js-yaml";
-import { readFileSync } from "node:fs";
-import { execFileSync } from "node:child_process";
-import { join } from "node:path";
-import { ParsedApolloConfigFormat } from "../config";
 import { TextEditor } from "vscode";
 import {
   closeAllEditors,
@@ -16,36 +10,6 @@ import {
   getDefinitions,
 } from "./utils";
 
-// we want to skip these tests unless the user running them has a rover config profile named "VSCode-E2E"
-let test = origTest.skip;
-try {
-  const roverProjectDir = join(__dirname, "../../../sampleWorkspace/rover");
-  const config = load(
-    readFileSync(join(roverProjectDir, "apollo.config.yaml"), "utf-8"),
-  ) as ParsedApolloConfigFormat;
-  const roverBin = join(roverProjectDir, config.rover!.bin);
-  const result = execFileSync(roverBin, [
-    "config",
-    "list",
-    "--format=json",
-  ]).toString("utf8");
-  const parsed = JSON.parse(result);
-  if (parsed.data.profiles.includes("VSCode-E2E")) {
-    test = origTest;
-  }
-} catch (e) {}
-if (test === origTest.skip) {
-  console.info(
-    "Skipping rover E2E tests: no profile with the name 'VSCode-E2E'\n" +
-      "You can create one by running `rover config auth --profile VSCode-E2E`",
-  );
-}
-
-if (process.platform === "win32") {
-  console.info("Skipping rover E2E tests in Windows");
-  test = origTest.skip;
-}
-
 let editor: TextEditor;
 let getPosition: GetPositionFn;
 beforeAll(async () => {
@@ -73,47 +37,71 @@ test("completion", async () => {
 [
   {
     "detail": undefined,
+    "label": "@authenticated",
+  },
+  {
+    "detail": "",
     "label": "@deprecated",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@external",
   },
   {
     "detail": undefined,
-    "label": "@federation__authenticated",
+    "label": "@inaccessible",
   },
   {
-    "detail": undefined,
-    "label": "@federation__inaccessible",
+    "detail": "",
+    "label": "@override(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__policy(…)",
+    "label": "@policy(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__provides(…)",
+    "label": "@provides(…)",
   },
   {
-    "detail": undefined,
-    "label": "@federation__requiresScopes(…)",
+    "detail": "",
+    "label": "@requires(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__tag(…)",
+    "label": "@requiresScopes(…)",
   },
   {
-    "detail": undefined,
-    "label": "@override(…)",
+    "detail": "",
+    "label": "@shareable",
   },
   {
     "detail": undefined,
-    "label": "@requires(…)",
+    "label": "@tag(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__authenticated",
+  },
+  {
+    "detail": "",
+    "label": "@federation__inaccessible",
+  },
+  {
+    "detail": "",
+    "label": "@federation__policy(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__provides(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__requiresScopes(…)",
   },
   {
     "detail": undefined,
-    "label": "@shareable",
+    "label": "@federation__tag(…)",
   },
 ]
 `);

package/src/language-server/__tests__/fixtures/documents/functionCall.ts.snap

@@ -413,11 +413,11 @@
 #^^^ source.ts variable.other.readwrite.ts
 >(
 #^ source.ts meta.brace.round.ts
->  `query { test }`
+>  `query Q11 { test }`
 #^^ source.ts
 #  ^ source.ts string.template.ts punctuation.definition.string.template.begin.ts
-#   ^^^^^^^^^^^^^^ source.ts string.template.ts
-#                 ^ source.ts string.template.ts punctuation.definition.string.template.end.ts
+#   ^^^^^^^^^^^^^^^^^^ source.ts string.template.ts
+#                     ^ source.ts string.template.ts punctuation.definition.string.template.end.ts
 >  )
 #^^ source.ts
 #  ^ source.ts meta.brace.round.ts

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

@@ -322,8 +322,10 @@ export abstract class ApolloConfig {
   get configDirURI() {
     // if the filepath has a _file_ in it, then we get its dir
     return this.configURI &&
-      this.configURI.fsPath.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
-      ? URI.parse(dirname(this.configURI.fsPath))
+      this.configURI.path.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
+      ? URI.from(this.configURI).with({
+          path: dirname(this.configURI.path),
+        })
       : this.configURI;
   }