Merge remote-tracking branch 'origin/main' into fd-gql-multiple-schema

graphql · Jan 25, 2024 · d09f46d · d09f46d
2 parents b956407 + 70d25ab
commit d09f46d
Show file tree

Hide file tree

Showing 67 changed files with 2,327 additions and 1,056 deletions.
diff --git a/.changeset/plenty-bees-fry.md b/.changeset/plenty-bees-fry.md
diff --git a/.changeset/slimy-fireants-dream.md b/.changeset/slimy-fireants-dream.md
diff --git a/.eslintignore b/.eslintignore
@@ -5,3 +5,4 @@ working-group/
 packages/codemirror-graphql/src/__tests__/schema-kitchen-sink.graphql
 CHANGELOG.md
 **/CHANGELOG.md
+packages/vscode-graphql-syntax/tests/__fixtures__/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,6 +30,7 @@ module.exports = {
     'changesets/**/*.md',
     '**/CHANGELOG.md',
     'functions/*',
+    'packages/vscode-graphql-syntax/tests/__fixtures__/*',
   ],
   overrides: [
     {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,15 @@
 {
   "npm.packageManager": "yarn",
   "editor.formatOnSave": true,
-  "files.insertFinalNewline": true
+  "files.insertFinalNewline": true,
+  "editor.trimAutoWhitespace": false,
+  "coverage-gutters.showLineCoverage": true,
+  "coverage-gutters.coverageBaseDir": "coverage",
+  "coverage-gutters.coverageFileNames": [
+    "lcov.info",
+    "cov.xml",
+    "coverage.xml",
+    "jacoco.xml",
+    "coverage.cobertura.xml"
+  ]
 }
diff --git a/custom-words.txt b/custom-words.txt
@@ -65,6 +65,8 @@ yoshiakis
 
 // packages and tools
 argparse
+astro
+astrojs
 changesets
 clsx
 codemirror
@@ -81,6 +83,8 @@ intellij
 jsdelivr
 lezer
 manypkg
+modulemap
+mockfs
 meros
 nullthrows
 onig
@@ -94,6 +98,7 @@ typedoc
 vite
 vitest
 vitejs
+vsix
 wonka
 urql
 tsup
@@ -128,7 +133,6 @@ listvalues
 marko
 matchingbracket
 middlewares
-modulemap
 newhope
 nextjs
 nocheck
@@ -228,3 +232,4 @@ unparsable
 randomthing
 codicon
 edcore
+tokenizes
diff --git a/examples/monaco-graphql-nextjs/package.json b/examples/monaco-graphql-nextjs/package.json
@@ -16,7 +16,7 @@
     "marked": "^4.2.12",
     "monaco-editor": "^0.39.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
-    "monaco-graphql": "^1.4.0",
+    "monaco-graphql": "^1.5.0",
     "next": "13.4.7",
     "prettier": "3.0.0-alpha.12",
     "react": "^18.2.0",

diff --git a/examples/monaco-graphql-react-vite/package.json b/examples/monaco-graphql-react-vite/package.json
@@ -8,7 +8,7 @@
     "graphql-language-service": "^5.2.0",
     "jsonc-parser": "^3.2.0",
     "monaco-editor": "^0.39.0",
-    "monaco-graphql": "^1.4.0",
+    "monaco-graphql": "^1.5.0",
     "prettier": "3.0.0-alpha.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/examples/monaco-graphql-webpack/package.json b/examples/monaco-graphql-webpack/package.json
@@ -14,7 +14,7 @@
     "json-schema": "^0.4.0",
     "jsonc-parser": "^3.2.0",
     "monaco-editor": "^0.39.0",
-    "monaco-graphql": "^1.4.0",
+    "monaco-graphql": "^1.5.0",
     "prettier": "3.0.0-alpha.12"
   },
   "devDependencies": {

diff --git a/packages/cm6-graphql/CHANGELOG.md b/packages/cm6-graphql/CHANGELOG.md
@@ -1,5 +1,11 @@
 # cm6-graphql
 
+## 0.0.13
+
+### Patch Changes
+
+- [#3505](https://github.com/graphql/graphiql/pull/3505) [`a562c96f`](https://github.com/graphql/graphiql/commit/a562c96fa3953d0301ad7b610028fa6c4a779bf6) Thanks [@Gasser-Aly](https://github.com/Gasser-Aly)! - fix: block strings syntax highlighting
+
 ## 0.0.12
 
 ### Patch Changes

diff --git a/packages/cm6-graphql/__tests__/cases.txt b/packages/cm6-graphql/__tests__/cases.txt
@@ -113,3 +113,35 @@ Document(
 Document(
   OperationDefinition(SelectionSet("{",Selection(Field(FieldName)),Selection(Field(FieldName,SelectionSet("{",Selection(Field(FieldName)),"}"))),"}"))
 )
+
+
+
+# Test case for blockStringCharacter in a Description
+
+"""
+This is a block string description
+with multiple lines.
+It can contain any character except for \""".
+"""
+type Example {
+  id: ID
+}
+
+==>
+
+Document(
+  TypeSystemDefinition(
+    TypeDefinition(
+      ObjectTypeDefinition(
+        Description(StringValue),
+        TypeKeyword(type),
+        Name,
+        FieldsDefinition(
+          "{",
+          FieldDefinition(Name, NamedType(Name)),
+          "}"
+        )
+      )
+    )
+  )
+)
diff --git a/packages/cm6-graphql/package.json b/packages/cm6-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cm6-graphql",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "GraphQL language support for CodeMirror 6",
   "scripts": {
     "build": "cm-buildhelper src/index.ts",

diff --git a/packages/cm6-graphql/src/language.ts b/packages/cm6-graphql/src/language.ts
@@ -20,6 +20,7 @@ export const graphqlLanguage = LRLanguage.define({
       styleTags({
         Variable: t.variableName,
         BooleanValue: t.bool,
+        Description: t.string,
         StringValue: t.string,
         Comment: t.lineComment,
         IntValue: t.integer,

diff --git a/packages/cm6-graphql/src/syntax.grammar b/packages/cm6-graphql/src/syntax.grammar
@@ -393,7 +393,10 @@ Name { name }
   // https://spec.graphql.org/October2021/#BlockStringCharacter
   blockStringCharacter {
     '\\"""' |
-    '"' '"'? !["]
+    '"' '"'? !["] |
+    stringCharacter |
+    '\n' |
+    '\r\n'
   }
 
   // https://spec.graphql.org/October2021/#EscapedUnicode

diff --git a/packages/graphql-language-service-cli/CHANGELOG.md b/packages/graphql-language-service-cli/CHANGELOG.md
@@ -1,5 +1,44 @@
 # graphql-language-service-cli
 
+## 3.3.33
+
+### Patch Changes
+
+- Updated dependencies [[`98af5307`](https://github.com/graphql/graphiql/commit/98af53071bb27afc0afc82d66f539c1ac08315b3), [`36c7f25c`](https://github.com/graphql/graphiql/commit/36c7f25c9388827d3a6a279eb090d61dc2600b56)]:
+  - graphql-language-service-server@2.12.0
+
+## 3.3.32
+
+### Patch Changes
+
+- Updated dependencies [[`6c7adf85`](https://github.com/graphql/graphiql/commit/6c7adf85c10d92cd3708a6dab44cb5b0f965fb84)]:
+  - graphql-language-service-server@2.11.10
+
+## 3.3.31
+
+### Patch Changes
+
+- Updated dependencies [[`34d0a976`](https://github.com/graphql/graphiql/commit/34d0a97688d7b83949f34bb4b2effebe4bafae79)]:
+  - graphql-language-service-server@2.11.9
+
+## 3.3.30
+
+### Patch Changes
+
+- Updated dependencies [[`3bfb2877`](https://github.com/graphql/graphiql/commit/3bfb28777457f783852dfe5c9af739470194d33b)]:
+  - graphql-language-service-server@2.11.8
+
+## 3.3.29
+
+### Patch Changes
+
+- [#3488](https://github.com/graphql/graphiql/pull/3488) [`d5028be2`](https://github.com/graphql/graphiql/commit/d5028be252ed385af972e090dda22788835da71e) Thanks [@acao](https://github.com/acao)! - Bump graphql & graphql-tools version to fix potential runtime security bugs
+
+- [`22771f35`](https://github.com/graphql/graphiql/commit/22771f35d00e4f80cb851e2a1f93db074e238e18) Thanks [@acao](https://github.com/acao)! - Fixes to svelte parsing, tag parsing refactor
+
+- Updated dependencies [[`d5028be2`](https://github.com/graphql/graphiql/commit/d5028be252ed385af972e090dda22788835da71e), [`22771f35`](https://github.com/graphql/graphiql/commit/22771f35d00e4f80cb851e2a1f93db074e238e18)]:
+  - graphql-language-service-server@2.11.7
+
 ## 3.3.28
 
 ### Patch Changes

diff --git a/packages/graphql-language-service-cli/package.json b/packages/graphql-language-service-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-language-service-cli",
-  "version": "3.3.28",
+  "version": "3.3.33",
   "description": "An interface for building GraphQL language services for IDEs",
   "contributors": [
     "Hyohyeon Jeong <asiandrummer@fb.com>",
@@ -38,7 +38,7 @@
     "@babel/polyfill": "^7.12.1",
     "@types/yargs": "16.0.5",
     "graphql-language-service": "^5.2.0",
-    "graphql-language-service-server": "^2.11.6",
+    "graphql-language-service-server": "^2.12.0",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

diff --git a/packages/graphql-language-service-server/CHANGELOG.md b/packages/graphql-language-service-server/CHANGELOG.md
@@ -1,5 +1,45 @@
 # graphql-language-service-server
 
+## 2.12.0
+
+### Minor Changes
+
+- [#3475](https://github.com/graphql/graphiql/pull/3475) [`98af5307`](https://github.com/graphql/graphiql/commit/98af53071bb27afc0afc82d66f539c1ac08315b3) Thanks [@XiNiHa](https://github.com/XiNiHa)! - Add Astro file support
+
+### Patch Changes
+
+- [#3514](https://github.com/graphql/graphiql/pull/3514) [`36c7f25c`](https://github.com/graphql/graphiql/commit/36c7f25c9388827d3a6a279eb090d61dc2600b56) Thanks [@acao](https://github.com/acao)! - fix svelte parsing, re-load config only on config changes
+
+  - fix esbuild bundling of `typescript` for `svelte2tsx`!
+  - confirm with manual testing of the vsix extension bundle ✅
+  - ensure that the server only attemps to parse opened/saved files when the server is activated or the file is a config file
+
+## 2.11.10
+
+### Patch Changes
+
+- [#3503](https://github.com/graphql/graphiql/pull/3503) [`6c7adf85`](https://github.com/graphql/graphiql/commit/6c7adf85c10d92cd3708a6dab44cb5b0f965fb84) Thanks [@acao](https://github.com/acao)! - Temporarily revert svelte parsing until we can fix bundling issues with svelte2tsx. For now we return to using the vue parser to parse svelte files which will invariably cause some issues, such as being off by several characters
+
+## 2.11.9
+
+### Patch Changes
+
+- [#3500](https://github.com/graphql/graphiql/pull/3500) [`34d0a976`](https://github.com/graphql/graphiql/commit/34d0a97688d7b83949f34bb4b2effebe4bafae79) Thanks [@acao](https://github.com/acao)! - Add typescript as a dependency for `svelte2tsx`
+
+## 2.11.8
+
+### Patch Changes
+
+- [#3498](https://github.com/graphql/graphiql/pull/3498) [`3bfb2877`](https://github.com/graphql/graphiql/commit/3bfb28777457f783852dfe5c9af739470194d33b) Thanks [@acao](https://github.com/acao)! - Add typescript as a dependency for `svelte2tsx`
+
+## 2.11.7
+
+### Patch Changes
+
+- [#3488](https://github.com/graphql/graphiql/pull/3488) [`d5028be2`](https://github.com/graphql/graphiql/commit/d5028be252ed385af972e090dda22788835da71e) Thanks [@acao](https://github.com/acao)! - Bump graphql & graphql-tools version to fix potential runtime security bugs
+
+- [`22771f35`](https://github.com/graphql/graphiql/commit/22771f35d00e4f80cb851e2a1f93db074e238e18) Thanks [@acao](https://github.com/acao)! - Fixes to svelte parsing, tag parsing refactor
+
 ## 2.11.6
 
 ### Patch Changes

diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-language-service-server",
-  "version": "2.11.6",
+  "version": "2.12.0",
   "description": "Server process backing the GraphQL Language Service",
   "contributors": [
     "Greg Hurrell <greg@hurrell.net> (https://greg.hurrell.net/)",
@@ -36,11 +36,14 @@
   "peerDependencies": {
     "graphql": "^15.5.0 || ^16.0.0"
   },
+  "COMMENT": "please do not remove depenencies without thorough testing. many dependencies are not imported directly, as they are peer dependencies",
   "dependencies": {
+    "@astrojs/compiler": "^2.5.0",
     "@babel/parser": "^7.23.6",
     "@babel/types": "^7.23.5",
     "@graphql-tools/code-file-loader": "8.0.3",
     "@vue/compiler-sfc": "^3.4.5",
+    "astrojs-compiler-sync": "^0.3.5",
     "cosmiconfig-toml-loader": "^1.0.0",
     "dotenv": "10.0.0",
     "fast-glob": "^3.2.7",
@@ -50,18 +53,20 @@
     "mkdirp": "^1.0.4",
     "node-abort-controller": "^3.0.1",
     "nullthrows": "^1.0.0",
+    "source-map-js": "1.0.2",
+    "svelte": "^4.1.1",
+    "svelte2tsx": "^0.7.0",
     "vscode-jsonrpc": "^8.0.1",
     "vscode-languageserver": "^8.0.1",
     "vscode-languageserver-types": "^3.17.2",
     "vscode-uri": "^3.0.2",
-    "svelte2tsx": "^0.6.27",
-    "svelte": "^4.1.1",
-    "source-map-js": "1.0.2"
+    "typescript": "^5.3.3"
   },
   "devDependencies": {
     "@types/glob": "^8.1.0",
     "@types/mkdirp": "^1.0.1",
     "cross-env": "^7.0.2",
-    "graphql": "^16.8.1"
+    "graphql": "^16.8.1",
+    "mock-fs": "^5.2.0"
   }
 }