Add support for Apollo Connectors Mapping Syntax

.changeset/rare-frogs-melt.md

@@ -0,0 +1,5 @@
+---
+"vscode-apollo": minor
+---
+
+Add syntax highlighting for the Apollo Connectors Mapping language

.circleci/config.yml

@@ -8,6 +8,10 @@ executors:
     docker:
       - image: cimg/node:22.12.0
     working_directory: ~/vscode-graphql
+  node24:
+    docker:
+      - image: cimg/node:24.4.0
+    working_directory: ~/vscode-graphql
 
 commands:
   npm-install:
@@ -53,12 +57,25 @@ jobs:
           name: Test
           command: npm run test --  --runInBand
 
+  textmate:
+    executor: node24
+    steps:
+      - checkout
+      - npm-install
+      - run:
+          name: Build TextMate Grammar
+          command: npm run build:textmate
+      - run:
+          name: Test TextMate Grammar
+          command: npm run test:textmate
+
 workflows:
   build-test-deploy:
     jobs:
       - lint
       - typescript
       - test
+      - textmate
   security-scans:
     jobs:
       - secops/gitleaks:

.github/workflows/E2E.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
 jobs:
-  test:
+  e2e:
     name: Run E2E tests
     runs-on: "${{ matrix.os }}"
     strategy:
@@ -22,7 +22,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           cache: "npm"
-      - run: npm install
+          node-version: 24
+      - run: npm ci
       - run: echo 'APOLLO_KEY="service:bob-123:489fhseo4"' > ./sampleWorkspace/spotifyGraph/.env
         shell: bash
 

.github/workflows/build-prs.yml

@@ -10,7 +10,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           cache: "npm"
-      - run: npm install
+          node-version: 24
+      - run: npm ci
       - 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

.prettierignore

@@ -1,3 +1,6 @@
 src/language-server/graphqlTypes.ts
 src/language-server/__tests__/fixtures/documents/commentWithTemplate.ts
+schemas/*.json
+syntaxes/*.json
+src/__tests__/fixtures/textmate/*
 README.md

.semgrepignore

@@ -0,0 +1,2 @@
+sampleWorkspace/connectors-community/**
+syntaxes/build.ts

.vscode/settings.json

@@ -2,7 +2,9 @@
 {
   "editor.tabSize": 2,
   "editor.insertSpaces": true,
-  "editor.rulers": [110],
+  "editor.rulers": [
+    110
+  ],
   "editor.wordWrapColumn": 110,
   "files.trimTrailingWhitespace": true,
   "files.insertFinalNewline": true,
@@ -12,5 +14,8 @@
     "node_modules": false
   },
   "typescript.tsdk": "node_modules/typescript/lib",
-  "debug.node.autoAttach": "on"
+  "debug.node.autoAttach": "on",
+  "yaml.schemas": {
+    "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json": "/syntaxes/*.yaml"
+  }
 }

apollo.connectors.mapping.configuration.json

@@ -0,0 +1,10 @@
+{
+  "comments": {
+    "lineComment": "#"
+  },
+  "brackets": [
+    ["[", "]"],
+    ["{", "}"],
+    ["(", ")"]
+  ]
+}

package.json

@@ -16,11 +16,13 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "node ./src/build.js",
-    "build:full": "npm run typecheck && rimraf lib  && npm run build --",
+    "build:full": "npm run typecheck && rimraf lib  && npm run build -- && npm run build:textmate",
     "build:production": "npm run build:full -- --production",
+    "build:textmate": "node ./syntaxes/build.ts",
     "watch": "rimraf lib; npm-run-all -p watch:*",
     "watch:esbuild": "npm run build -- --watch",
     "watch:tsc": "npm run typecheck -- --watch",
+    "watch:textmate-yaml": "npm run build:textmate -- --debug --watch",
     "sampleWorkspace:run": "node src/__e2e__/mockServer.js",
     "changeset-version": "changeset version && npm i",
     "changeset-publish": "npm run build -- --production && changeset publish",
@@ -29,7 +31,11 @@
     "format": "prettier --write .",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "test:extension": "node src/__e2e__/runTests.js",
-    "test:textmate": "npx vscode-tmgrammar-snap -s source.ts -g src/language-server/__tests__/fixtures/TypeScript.tmLanguage.json src/language-server/__tests__/fixtures/documents/*.ts",
+    "test:textmate": "npm run test:textmate-ts && npm run test:textmate-connectors-mapping && npm run test:textmate-graphql-connectors-mapping",
+    "test:textmate-ts": "npx vscode-tmgrammar-snap -s source.ts -g src/language-server/__tests__/fixtures/TypeScript.tmLanguage.json src/language-server/__tests__/fixtures/documents/*.ts",
+    "test:textmate-connectors-mapping": "npm run build:textmate -- --snapshot connectors.mapping.yaml; npx vscode-tmgrammar-test src/__tests__/fixtures/textmate/*.connectors.mapping",
+    "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"
   },
@@ -93,6 +99,7 @@
     "jest-environment-node": "29.7.0",
     "memfs": "4.15.0",
     "npm-run-all": "4.1.5",
+    "oniguruma-parser": "^0.12.1",
     "prettier": "3.4.2",
     "rimraf": "6.0.1",
     "ts-jest": "29.2.5",
@@ -172,6 +179,16 @@
         ],
         "configuration": "./graphql.configuration.json"
       },
+      {
+        "id": "apollo.connectors.mapping",
+        "aliases": [
+          "[Apollo Connectors Mapping Syntax]"
+        ],
+        "filenames": [
+          "test.apollo.connectors.mapping"
+        ],
+        "configuration": "./apollo.connectors.mapping.configuration.json"
+      },
       {
         "id": "jsonc",
         "filenames": [
@@ -185,6 +202,23 @@
         "scopeName": "source.graphql",
         "path": "./syntaxes/graphql.json"
       },
+      {
+        "language": "apollo.connectors.mapping",
+        "scopeName": "source.apollo.connectors.mapping",
+        "path": "./syntaxes/connectors.mapping.json"
+      },
+      {
+        "injectTo": [
+          "source.graphql"
+        ],
+        "scopeName": "source.apollo.connectors.graphql",
+        "path": "./syntaxes/graphql.connectors.json",
+        "embeddedLanguages": {
+          "meta.embedded.block.connectors.mapping.graphql": "apollo.connectors.mapping",
+          "meta.embedded.line.connectors.mapping.graphql": "apollo.connectors.mapping",
+          "meta.embedded.string.connectors.mapping.selectionstring.graphql": "apollo.connectors.mapping"
+        }
+      },
       {
         "injectTo": [
           "source.js",

sampleWorkspace/connectors-community/.github/ISSUE_TEMPLATE/connector-bug-report.md

@@ -0,0 +1,36 @@
+---
+name: Connector Bug Report
+about: Create a report to help us fix a connector issue
+title: "[Connector Name] - Bug Title"
+labels: bug
+assignees: michael-watson
+
+---
+
+**Connector**:
+**Connector Module**: *if any*
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Start [Connector Name] name
+2. Execute this operation:
+
+```graphql
+query {
+
+}
+```
+
+3. Results:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context or recommended fixes**
+Add any other context about the problem here.

sampleWorkspace/connectors-community/.github/ISSUE_TEMPLATE/new-connector.md

@@ -0,0 +1,10 @@
+---
+name: New Connector
+about: To create a new connector that is available in the connectors-community
+title: "{NAME} Connector"
+labels: new
+assignees: ''
+
+---
+
+

sampleWorkspace/connectors-community/.github/renovate.json5

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

sampleWorkspace/connectors-community/.gitignore

@@ -0,0 +1,6 @@
+.env
+
+.DS_Store
+*/.DS_Store
+
+node_modules

sampleWorkspace/connectors-community/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+    "recommendations": ["apollographql.vscode-apollo","redhat.vscode-yaml"]
+}

sampleWorkspace/connectors-community/.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+  "terminal.integrated.profiles.osx": {
+    "graphos": {
+      "path": "zsh",
+      "args": ["-l"],
+      "env": {
+        "APOLLO_KEY": "",
+        "APOLLO_GRAPH_REF": "",
+      }
+    }
+  },
+  "terminal.integrated.defaultProfile.osx": "graphos"
+}

sampleWorkspace/connectors-community/.vscode/tasks.json

@@ -0,0 +1,10 @@
+{
+    "version": "2.0.0",
+    "tasks": [{
+        "label": "rover dev",
+        "command": "rover", // Could be any other shell command
+        "args": ["dev", "--supergraph-config","supergraph.yaml", "--router-config","router.yaml"],
+        "type": "shell",
+        "problemMatcher": [],
+    }]
+}