Fix parser and update tests

graphql · Sep 30, 2024 · 6938c31 · 6938c31
1 parent 36afde3
commit 6938c31
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/packages/graphql-language-service/src/parser/Rules.ts b/packages/graphql-language-service/src/parser/Rules.ts
@@ -239,14 +239,8 @@ export const ParseRules: { [name: string]: ParseRule } = {
   Implements: [word('implements'), list('NamedType', p('&'))],
   DirectiveLocation: [name('string-2')],
   // GraphQL schema language
-  SchemaDef: [
-    word('schema'),
-    list('Directive'),
-    p('{'),
-    list('OperationTypeDef'),
-    p('}'),
-  ],
-
+  SchemaDef: [word('schema'), list('Directive'), 'OperationTypeDefs'],
+  OperationTypeDefs: [p('{'), list('OperationTypeDef'), p('}')],
   OperationTypeDef: [name('keyword'), p(':'), name('atom')],
   ScalarDef: [word('scalar'), name('atom'), list('Directive')],
   ObjectTypeDef: [
@@ -322,7 +316,11 @@ export const ParseRules: { [name: string]: ParseRule } = {
         return Kind.INPUT_OBJECT_TYPE_EXTENSION;
     }
   },
-  [Kind.SCHEMA_EXTENSION]: ['SchemaDef'],
+  [Kind.SCHEMA_EXTENSION]: [
+    word('schema'),
+    list('Directive'),
+    opt('OperationTypeDefs'),
+  ],
   [Kind.SCALAR_TYPE_EXTENSION]: ['ScalarDef'],
   [Kind.OBJECT_TYPE_EXTENSION]: ['ObjectTypeDef'],
   [Kind.INTERFACE_TYPE_EXTENSION]: ['InterfaceDef'],

diff --git a/packages/graphql-language-service/src/parser/__tests__/OnlineParser-test.ts b/packages/graphql-language-service/src/parser/__tests__/OnlineParser-test.ts
@@ -56,7 +56,7 @@ describe('onlineParser', () => {
       `);
 
       t.keyword('schema', { kind: 'SchemaDef' });
-      t.punctuation('{');
+      t.punctuation('{', { kind: 'OperationTypeDefs' });
 
       t.keyword('query', { kind: 'OperationTypeDef' });
       t.punctuation(':');
@@ -73,7 +73,7 @@ describe('onlineParser', () => {
       `);
 
       t.keyword('extend', { kind: 'ExtendDef' });
-      t.keyword('schema', { kind: 'SchemaDef' });
+      t.keyword('schema', { kind: 'SchemaExtension' });
 
       t.eol();
     });
@@ -86,8 +86,8 @@ describe('onlineParser', () => {
       `);
 
       t.keyword('extend', { kind: 'ExtendDef' });
-      t.keyword('schema', { kind: 'SchemaDef' });
-      t.punctuation('{');
+      t.keyword('schema', { kind: 'SchemaExtension' });
+      t.punctuation('{', { kind: 'OperationTypeDefs' });
 
       t.keyword('query', { kind: 'OperationTypeDef' });
       t.punctuation(':');
@@ -104,7 +104,7 @@ describe('onlineParser', () => {
       `);
 
       t.keyword('extend', { kind: 'ExtendDef' });
-      t.keyword('schema', { kind: 'SchemaDef' });
+      t.keyword('schema', { kind: 'SchemaExtension' });
       expectDirective({ t }, { name: 'someDirective' });
 
       t.eol();
@@ -118,7 +118,7 @@ describe('onlineParser', () => {
       `);
 
       t.keyword('extend', { kind: 'ExtendDef' });
-      t.keyword('schema', { kind: 'SchemaDef' });
+      t.keyword('schema', { kind: 'SchemaExtension' });
       expectDirective({ t }, { name: 'someDirective' });
 
       t.keyword('type', { kind: 'ObjectTypeDef' });
@@ -127,7 +127,7 @@ describe('onlineParser', () => {
       t.property('field', { kind: 'FieldDef' });
       t.punctuation(':');
       t.name('String', { kind: 'NamedType' });
-      t.punctuation('}');
+      t.punctuation('}', { kind: 'Document' });
 
       t.eol();
     });