chore: address PR feedback and fix tests

Author: Aenimus

composition-go/index.global.js

@@ -1632,7 +1632,10 @@ export function semanticNonNullLevelsIndexOutOfBoundsErrorMessage({
   typeString,
   value,
 }: SemanticNonNullLevelsIndexOutOfBoundsErrorParams) {
-  return `Index "${value}" is out of bounds for type ${typeString}; valid indices are 0–${maxIndex} inclusive.`;
+  return (
+    `Index "${value}" is out of bounds for type ${typeString}; ` +
+    (maxIndex > 0 ? `valid indices are 0-${maxIndex} inclusive.` : `the only valid index is 0.`)
+  );
 }
 
 export function semanticNonNullLevelsNonNullErrorMessage({

composition/src/errors/errors.ts

@@ -2190,16 +2190,34 @@ export class FederationFactory {
   }
 
   pushVersionTwoDirectiveDefinitionsToDocumentDefinitions() {
+    if (!this.isVersionTwo) {
+      if (this.referencedPersistedDirectiveNames.has(SEMANTIC_NON_NULL)) {
+        this.clientDefinitions.push(SEMANTIC_NON_NULL_DEFINITION);
+        this.routerDefinitions = [DEPRECATED_DEFINITION, SEMANTIC_NON_NULL_DEFINITION, TAG_DEFINITION];
+      }
+      return;
+    }
     if (this.referencedPersistedDirectiveNames.has(SEMANTIC_NON_NULL)) {
-      this.routerDefinitions.push(SEMANTIC_NON_NULL_DEFINITION);
       this.clientDefinitions.push(SEMANTIC_NON_NULL_DEFINITION);
-    }
-    if (!this.isVersionTwo) {
+      this.routerDefinitions = [
+        AUTHENTICATED_DEFINITION,
+        DEPRECATED_DEFINITION,
+        INACCESSIBLE_DEFINITION,
+        REQUIRES_SCOPES_DEFINITION,
+        SEMANTIC_NON_NULL_DEFINITION,
+        SCOPE_SCALAR_DEFINITION,
+        TAG_DEFINITION,
+      ];
       return;
     }
-    this.routerDefinitions.push(
-      ...[AUTHENTICATED_DEFINITION, INACCESSIBLE_DEFINITION, REQUIRES_SCOPES_DEFINITION, SCOPE_SCALAR_DEFINITION],
-    );
+    this.routerDefinitions = [
+      AUTHENTICATED_DEFINITION,
+      DEPRECATED_DEFINITION,
+      INACCESSIBLE_DEFINITION,
+      REQUIRES_SCOPES_DEFINITION,
+      SCOPE_SCALAR_DEFINITION,
+      TAG_DEFINITION,
+    ];
   }
 
   validatePathSegmentInaccessibility(path: string): boolean {

composition/src/v1/federation/federation-factory.ts

@@ -446,6 +446,8 @@ export function isObjectDefinitionData(data?: ParentDefinitionData): data is Obj
 
 export function getNodeCoords(data: NodeData): string {
   switch (data.kind) {
+    case Kind.ARGUMENT:
+    // Intentional fallthrough
     case Kind.FIELD_DEFINITION:
     // Intentional fallthrough
     case Kind.INPUT_VALUE_DEFINITION: