Future proof - entries not capabilities

Author: benjie

src/language/__tests__/service-test.ts

@@ -19,11 +19,11 @@ describe('Service Definition Parsing and Printing', () => {
       expect(serviceDef.kind).to.equal(Kind.SERVICE_DEFINITION);
 
       if (serviceDef.kind === Kind.SERVICE_DEFINITION) {
-        expect(serviceDef.capabilities).to.have.length(1);
-        expect(serviceDef.capabilities?.[0].identifier.value).to.equal(
+        expect(serviceDef.entries).to.have.length(1);
+        expect(serviceDef.entries?.[0].identifier.value).to.equal(
           'example.capability',
         );
-        expect(serviceDef.capabilities?.[0].value).to.equal(undefined);
+        expect(serviceDef.entries?.[0].value).to.equal(undefined);
       }
     });
 
@@ -36,10 +36,10 @@ describe('Service Definition Parsing and Printing', () => {
 
       const serviceDef = doc.definitions[0];
       if (serviceDef.kind === Kind.SERVICE_DEFINITION) {
-        expect(serviceDef.capabilities?.[0].identifier.value).to.equal(
+        expect(serviceDef.entries?.[0].identifier.value).to.equal(
           'example.capability',
         );
-        expect(serviceDef.capabilities?.[0].value?.value).to.equal(
+        expect(serviceDef.entries?.[0].value?.value).to.equal(
           'Example value',
         );
       }
@@ -69,7 +69,7 @@ describe('Service Definition Parsing and Printing', () => {
 
       const serviceDef = doc.definitions[0];
       if (serviceDef.kind === Kind.SERVICE_DEFINITION) {
-        expect(serviceDef.capabilities?.[0].description?.value).to.equal(
+        expect(serviceDef.entries?.[0].description?.value).to.equal(
           'Example capability description',
         );
       }
@@ -86,19 +86,19 @@ describe('Service Definition Parsing and Printing', () => {
 
       const serviceDef = doc.definitions[0];
       if (serviceDef.kind === Kind.SERVICE_DEFINITION) {
-        expect(serviceDef.capabilities).to.have.length(3);
-        expect(serviceDef.capabilities?.[0].identifier.value).to.equal(
+        expect(serviceDef.entries).to.have.length(3);
+        expect(serviceDef.entries?.[0].identifier.value).to.equal(
           'example.capability',
         );
-        expect(serviceDef.capabilities?.[0].value).to.equal(undefined);
-        expect(serviceDef.capabilities?.[1].identifier.value).to.equal(
+        expect(serviceDef.entries?.[0].value).to.equal(undefined);
+        expect(serviceDef.entries?.[1].identifier.value).to.equal(
           'graphql.someFutureCapability',
         );
-        expect(serviceDef.capabilities?.[1].value).to.equal(undefined);
-        expect(serviceDef.capabilities?.[2].identifier.value).to.equal(
+        expect(serviceDef.entries?.[1].value).to.equal(undefined);
+        expect(serviceDef.entries?.[2].identifier.value).to.equal(
           'org.example.customFeature',
         );
-        expect(serviceDef.capabilities?.[2].value?.value).to.equal('v2');
+        expect(serviceDef.entries?.[2].value?.value).to.equal('v2');
       }
     });
 
@@ -142,8 +142,8 @@ describe('Service Definition Parsing and Printing', () => {
       expect(serviceExt.kind).to.equal(Kind.SERVICE_EXTENSION);
 
       if (serviceExt.kind === Kind.SERVICE_EXTENSION) {
-        expect(serviceExt.capabilities).to.have.length(1);
-        expect(serviceExt.capabilities?.[0].identifier.value).to.equal(
+        expect(serviceExt.entries).to.have.length(1);
+        expect(serviceExt.entries?.[0].identifier.value).to.equal(
           'graphql.additionalFeature',
         );
       }

src/language/ast.ts

@@ -341,7 +341,7 @@ export const QueryDocumentKeys: {
     'locations',
   ],
 
-  ServiceDefinition: ['description', 'directives', 'capabilities'],
+  ServiceDefinition: ['description', 'directives', 'entries'],
   ServiceCapability: ['description', 'identifier', 'value'],
 
   SchemaExtension: ['directives', 'operationTypes'],
@@ -355,7 +355,7 @@ export const QueryDocumentKeys: {
   EnumTypeExtension: ['name', 'directives', 'values'],
   InputObjectTypeExtension: ['name', 'directives', 'fields'],
 
-  ServiceExtension: ['directives', 'capabilities'],
+  ServiceExtension: ['directives', 'entries'],
 
   TypeCoordinate: ['name'],
   MemberCoordinate: ['name', 'memberName'],
@@ -1018,9 +1018,11 @@ export interface ServiceDefinitionNode {
   readonly loc?: Location;
   readonly description?: StringValueNode;
   readonly directives?: ReadonlyArray<ConstDirectiveNode>;
-  readonly capabilities?: ReadonlyArray<ServiceCapabilityNode>;
+  readonly entries?: ReadonlyArray<ServiceEntryNode>;
 }
 
+export type ServiceEntryNode = ServiceCapabilityNode;
+
 export interface ServiceCapabilityNode {
   readonly kind: Kind.SERVICE_CAPABILITY;
   readonly loc?: Location;
@@ -1158,7 +1160,7 @@ export interface ServiceExtensionNode {
   readonly kind: Kind.SERVICE_EXTENSION;
   readonly loc?: Location;
   readonly directives?: ReadonlyArray<ConstDirectiveNode>;
-  readonly capabilities?: ReadonlyArray<ServiceCapabilityNode>;
+  readonly entries?: ReadonlyArray<ServiceEntryNode>;
 }
 
 // Schema Coordinates

src/language/index.ts

@@ -95,6 +95,7 @@ export type {
   InputObjectTypeDefinitionNode,
   DirectiveDefinitionNode,
   ServiceDefinitionNode,
+  ServiceEntryNode,
   ServiceCapabilityNode,
   TypeSystemExtensionNode,
   SchemaExtensionNode,

src/language/parser.ts

@@ -1707,7 +1707,7 @@ export class Parser {
     const description = this.parseDescription();
     this.expectKeyword('service');
     const directives = this.parseConstDirectives();
-    const capabilities = this.optionalMany(
+    const entries = this.optionalMany(
       TokenKind.BRACE_L,
       this.parseServiceCapability,
       TokenKind.BRACE_R,
@@ -1716,7 +1716,7 @@ export class Parser {
       kind: Kind.SERVICE_DEFINITION,
       description,
       directives,
-      capabilities,
+      entries,
     });
   }
 
@@ -1783,18 +1783,18 @@ export class Parser {
     this.expectKeyword('extend');
     this.expectKeyword('service');
     const directives = this.parseConstDirectives();
-    const capabilities = this.optionalMany(
+    const entries = this.optionalMany(
       TokenKind.BRACE_L,
       this.parseServiceCapability,
       TokenKind.BRACE_R,
     );
-    if (directives.length === 0 && capabilities.length === 0) {
+    if (directives.length === 0 && entries.length === 0) {
       throw this.unexpected();
     }
     return this.node<ServiceExtensionNode>(start, {
       kind: Kind.SERVICE_EXTENSION,
       directives,
-      capabilities,
+      entries,
     });
   }
 

src/language/printer.ts

@@ -269,9 +269,9 @@ const printDocASTReducer: ASTReducer<string> = {
   },
 
   ServiceDefinition: {
-    leave: ({ description, directives, capabilities }) =>
+    leave: ({ description, directives, entries }) =>
       wrap('', description, '\n') +
-      join(['service', join(directives, ' '), block(capabilities)], ' '),
+      join(['service', join(directives, ' '), block(entries)], ' '),
   },
 
   ServiceCapability: {
@@ -364,8 +364,8 @@ const printDocASTReducer: ASTReducer<string> = {
   },
 
   ServiceExtension: {
-    leave: ({ directives, capabilities }) =>
-      join(['extend service', join(directives, ' '), block(capabilities)], ' '),
+    leave: ({ directives, entries }) =>
+      join(['extend service', join(directives, ' '), block(entries)], ' '),
   },
 
   // Schema Coordinates

src/utilities/extendSchema.ts

@@ -337,8 +337,8 @@ export function extendSchemaImpl(
     }
 
     // Add capabilities from new service definition
-    if (astNode?.capabilities) {
-      for (const cap of astNode.capabilities) {
+    if (astNode?.entries) {
+      for (const cap of astNode.entries) {
         allCapabilities.push({
           identifier: cap.identifier.value,
           description: cap.description?.value,
@@ -350,8 +350,8 @@ export function extendSchemaImpl(
 
     // Add capabilities from extensions
     for (const ext of extensionNodes) {
-      if (ext.capabilities) {
-        for (const cap of ext.capabilities) {
+      if (ext.entries) {
+        for (const cap of ext.entries) {
           allCapabilities.push({
             identifier: cap.identifier.value,
             description: cap.description?.value,