@apollo/federation-internals 2.4.1 → 2.4.3

package/dist/tagSpec.js

@@ -31,11 +31,11 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
             name: 'tag',
             locations: this.tagLocations,
             repeatable: true,
-            argumentFct: (schema) => ({
-                args: [{ name: 'name', type: new definitions_1.NonNullType(schema.stringType()) }],
-                errors: [],
-            }),
+            args: [{ name: 'name', type: (schema) => new definitions_1.NonNullType(schema.stringType()) }],
+            composes: true,
+            supergraphSpecification: () => exports.TAG_VERSIONS.latest(),
         });
+        this.registerDirective(this.tagDirectiveSpec);
     }
     isV01() {
         return this.version.equals(new coreSpec_1.FeatureVersion(0, 1));
@@ -43,9 +43,6 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
     isV02() {
         return this.version.equals(new coreSpec_1.FeatureVersion(0, 2));
     }
-    addElementsToSchema(schema) {
-        return this.addDirectiveSpec(schema, this.tagDirectiveSpec);
-    }
     tagDirective(schema) {
         return this.directive(schema, 'tag');
     }
@@ -59,9 +56,6 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
         }
         return undefined;
     }
-    allElementNames() {
-        return ["@tag"];
-    }
 }
 exports.TagSpecDefinition = TagSpecDefinition;
 exports.TAG_VERSIONS = new coreSpec_1.FeatureDefinitions(exports.tagIdentity)

package/dist/tagSpec.js.map

@@ -1 +1 @@
-{"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/__tests__/directiveAndTypeSpecifications.test.ts

@@ -0,0 +1,41 @@
+import { DirectiveLocation } from "graphql";
+import "../definitions";
+import { createDirectiveSpecification } from "../directiveAndTypeSpecification";
+import { ARGUMENT_COMPOSITION_STRATEGIES } from "../argumentCompositionStrategies";
+import { TAG_VERSIONS } from "../tagSpec";
+
+const supergraphSpecification = () => TAG_VERSIONS.latest();
+
+test('must have supergraph link if composed', () => {
+  expect(() => createDirectiveSpecification({
+    name: 'foo',
+    locations: [DirectiveLocation.OBJECT],
+    composes: true,
+  })).toThrow('Should provide a @link specification to use in supergraph for directive @foo if it composes');
+});
+
+test('must have a merge strategy on all arguments if any', () => {
+  expect(() => createDirectiveSpecification({
+    name: 'foo',
+    locations: [DirectiveLocation.OBJECT],
+    composes: true,
+    supergraphSpecification,
+    args: [
+      { name: "v1", type: (schema) => schema.intType(), compositionStrategy: ARGUMENT_COMPOSITION_STRATEGIES.MAX },
+      { name: "v2", type: (schema) => schema.intType() }
+    ],
+  })).toThrow('Invalid directive specification for @foo: not all arguments define a composition strategy');
+});
+
+test('must be not be repeatable if it has a merge strategy', () => {
+  expect(() => createDirectiveSpecification({
+    name: 'foo',
+    locations: [DirectiveLocation.OBJECT],
+    composes: true,
+    repeatable: true,
+    supergraphSpecification,
+    args: [
+      { name: "v", type: (schema) => schema.intType(), compositionStrategy: ARGUMENT_COMPOSITION_STRATEGIES.MAX },
+    ],
+  })).toThrow('Invalid directive specification for @foo: @foo is repeatable and should not define composition strategy for its arguments');
+});

package/src/__tests__/operations.test.ts

@@ -154,8 +154,6 @@ describe('fragments optimization', () => {
     `);
 
     const optimized = withoutFragments.optimize(operation.selectionSet.fragments!);
-    // Note that while we didn't use `onU` for `t` in the query, it's technically ok to use
-    // it and it makes the query smaller, so it gets used.
     expect(optimized.toString()).toMatchString(`
       fragment OnT1 on T1 {
         a
@@ -171,17 +169,15 @@ describe('fragments optimization', () => {
         b
       }
 
-      fragment OnU on U {
-        ...OnI
-        ...OnT1
-        ...OnT2
-      }
-
       {
         t {
-          ...OnU
+          ...OnI
+          ...OnT1
+          ...OnT2
           u {
-            ...OnU
+            ...OnI
+            ...OnT1
+            ...OnT2
           }
         }
       }
@@ -579,6 +575,175 @@ describe('fragments optimization', () => {
     });
   });
 
+  test('handles fragment matching at the top level of another fragment', () => {
+    const schema = parseSchema(`
+      type Query {
+        t: T
+      }
+
+      type T {
+        a: String
+        u: U
+      }
+
+      type U {
+        x: String
+        y: String
+      }
+    `);
+
+    testFragmentsRoundtrip({
+      schema,
+      query: `
+        fragment Frag1 on T {
+          a
+        }
+
+        fragment Frag2 on T {
+          u {
+            x
+            y
+          }
+          ...Frag1
+        }
+
+        fragment Frag3 on Query {
+          t {
+            ...Frag2
+          }
+        }
+
+        {
+          ...Frag3
+        }
+      `,
+      expanded: `
+        {
+          t {
+            u {
+              x
+              y
+            }
+            a
+          }
+        }
+      `,
+    });
+  });
+
+  test('handles fragments used in a context where they get trimmed', () => {
+    const schema = parseSchema(`
+      type Query {
+        t1: T1
+      }
+
+      interface I {
+        x: Int
+      }
+
+      type T1 implements I {
+        x: Int
+        y: Int
+      }
+
+      type T2 implements I {
+        x: Int
+        z: Int
+      }
+    `);
+
+    testFragmentsRoundtrip({
+      schema,
+      query: `
+        fragment FragOnI on I {
+          ... on T1 {
+            y
+          }
+          ... on T2 {
+            z
+          }
+        }
+
+        {
+          t1 {
+            ...FragOnI
+          }
+        }
+      `,
+      expanded: `
+        {
+          t1 {
+            y
+          }
+        }
+      `,
+    });
+  });
+
+  test('handles fragments used in the context of non-intersecting abstract types', () => {
+    const schema = parseSchema(`
+      type Query {
+        i2: I2
+      }
+
+      interface I1 {
+        x: Int
+      }
+
+      interface I2 {
+        y: Int
+      }
+
+      interface I3 {
+        z: Int
+      }
+
+      type T1 implements I1 & I2 {
+        x: Int
+        y: Int
+      }
+
+      type T2 implements I1 & I3 {
+        x: Int
+        z: Int
+      }
+    `);
+
+    testFragmentsRoundtrip({
+      schema,
+      query: `
+        fragment FragOnI1 on I1 {
+          ... on I2 {
+            y
+          }
+          ... on I3 {
+            z
+          }
+        }
+
+        {
+          i2 {
+            ...FragOnI1
+          }
+        }
+      `,
+      expanded: `
+        {
+          i2 {
+            ... on I1 {
+              ... on I2 {
+                y
+              }
+              ... on I3 {
+                z
+              }
+            }
+          }
+        }
+      `,
+    });
+  });
+
   describe('applied directives', () => {
     test('reuse fragments with directives on the fragment, but only when there is those directives', () => {
       const schema = parseSchema(`

package/src/argumentCompositionStrategies.ts

@@ -0,0 +1,39 @@
+import { InputType, ListType, NonNullType, Schema } from "./definitions"
+
+export type ArgumentCompositionStrategy = {
+  name: string,
+  supportedTypes: (schema: Schema) => InputType[],
+  mergeValues: (values: any[]) => any,
+}
+
+export const ARGUMENT_COMPOSITION_STRATEGIES = {
+  MAX: {
+    name: 'MAX',
+    supportedTypes: (schema: Schema) => [new NonNullType(schema.intType())],
+    mergeValues: (values: any[]) => Math.max(...values),
+  },
+  MIN: {
+    name: 'MIN',
+    supportedTypes: (schema: Schema) => [new NonNullType(schema.intType())],
+    mergeValues: (values: any[]) => Math.min(...values),
+  },
+  SUM: {
+    name: 'SUM',
+    supportedTypes: (schema: Schema) => [new NonNullType(schema.intType())],
+    mergeValues: (values: any[]) => values.reduce((acc, val) => acc + val, 0),
+  },
+  INTERSECTION: {
+    name: 'INTERSECTION',
+    supportedTypes: (schema: Schema) => schema.builtInScalarTypes().map((t) => new NonNullType(new ListType(new NonNullType(t)))),
+    mergeValues: (values: any[]) => values.reduce((acc, val) => acc.filter((v: any) => val.includes(v)), values[0]),
+  },
+  UNION: {
+    name: 'UNION',
+    supportedTypes: (schema: Schema) => schema.builtInScalarTypes().map((t) => new NonNullType(new ListType(new NonNullType(t)))),
+    mergeValues: (values: any[]) =>
+      values.reduce((acc, val) => {
+        const newValues = val.filter((v: any) => !acc.includes(v));
+        return acc.concat(newValues);
+      }, []),
+  },
+}

package/src/coreSpec.ts

@@ -2,12 +2,12 @@ import { ASTNode, DirectiveLocation, GraphQLError, StringValueNode } from "graph
 import { URL } from "url";
 import { CoreFeature, Directive, DirectiveDefinition, EnumType, ErrGraphQLAPISchemaValidationFailed, ErrGraphQLValidationFailed, InputType, ListType, NamedType, NonNullType, ScalarType, Schema, SchemaDefinition, SchemaElement, sourceASTs } from "./definitions";
 import { sameType } from "./types";
-import { assert, firstOf } from './utils';
+import { assert, firstOf, MapWithCachedArrays } from './utils';
 import { aggregateError, ERRORS } from "./error";
 import { valueToString } from "./values";
 import { coreFeatureDefinitionIfKnown, registerKnownFeature } from "./knownCoreFeatures";
 import { didYouMean, suggestionList } from "./suggestions";
-import { ArgumentSpecification, createDirectiveSpecification, createEnumTypeSpecification, createScalarTypeSpecification, DirectiveSpecification, TypeSpecification } from "./directiveAndTypeSpecification";
+import { ArgumentSpecification, createDirectiveSpecification, createEnumTypeSpecification, createScalarTypeSpecification, DirectiveCompositionSpecification, DirectiveSpecification, TypeSpecification } from "./directiveAndTypeSpecification";
 
 export const coreIdentity = 'https://specs.apollo.dev/core';
 export const linkIdentity = 'https://specs.apollo.dev/link';
@@ -38,10 +38,37 @@ function purposesDescription(purpose: CorePurpose) {
 export abstract class FeatureDefinition {
   readonly url: FeatureUrl;
 
+  private readonly _directiveSpecs = new MapWithCachedArrays<string, DirectiveSpecification>();
+  private readonly _typeSpecs = new MapWithCachedArrays<string, TypeSpecification>();
+
   constructor(url: FeatureUrl | string) {
     this.url = typeof url === 'string' ? FeatureUrl.parse(url) : url;
   }
 
+  protected registerDirective(spec: DirectiveSpecification) {
+    this._directiveSpecs.set(spec.name, spec);
+  }
+
+  protected registerType(spec: TypeSpecification) {
+    this._typeSpecs.set(spec.name, spec);
+  }
+
+  directiveSpecs(): readonly DirectiveSpecification[] {
+    return this._directiveSpecs.values();
+  }
+
+  directiveSpec(name: string): DirectiveSpecification | undefined {
+    return this._directiveSpecs.get(name);
+  }
+
+  typeSpecs(): readonly TypeSpecification[] {
+    return this._typeSpecs.values();
+  }
+
+  typeSpec(name: string): TypeSpecification | undefined {
+    return this._typeSpecs.get(name);
+  }
+
   get identity(): string {
     return this.url.identity;
   }
@@ -60,9 +87,25 @@ export abstract class FeatureDefinition {
     return nameInSchema != undefined && (directive.name === nameInSchema || directive.name.startsWith(`${nameInSchema}__`));
   }
 
-  abstract addElementsToSchema(schema: Schema): GraphQLError[];
+  addElementsToSchema(schema: Schema): GraphQLError[] {
+    const feature = this.featureInSchema(schema);
+    assert(feature, 'The federation specification should have been added to the schema before this is called');
 
-  abstract allElementNames(): string[];
+    let errors: GraphQLError[] = [];
+    for (const type of this.typeSpecs()) {
+      errors = errors.concat(this.addTypeSpec(schema, type));
+    }
+
+    for (const directive of this.directiveSpecs()) {
+      errors = errors.concat(this.addDirectiveSpec(schema, directive));
+    }
+    return errors;
+  }
+
+  allElementNames(): string[] {
+    return this.directiveSpecs().map((spec) => `@${spec.name}`)
+      .concat(this.typeSpecs().map((spec) => spec.name));
+  }
 
   protected nameInSchema(schema: Schema): string | undefined {
     const feature = this.featureInSchema(schema);
@@ -79,12 +122,12 @@ export abstract class FeatureDefinition {
     return feature ? feature.typeNameInSchema(typeName) : undefined;
   }
 
-  protected rootDirective<TApplicationArgs extends {[key: string]: any}>(schema: Schema): DirectiveDefinition<TApplicationArgs> | undefined {
+  protected rootDirective<TApplicationArgs extends { [key: string]: any }>(schema: Schema): DirectiveDefinition<TApplicationArgs> | undefined {
     const name = this.nameInSchema(schema);
     return name ? schema.directive(name) as DirectiveDefinition<TApplicationArgs> | undefined : undefined;
   }
 
-  protected directive<TApplicationArgs extends {[key: string]: any}>(schema: Schema, elementName: string): DirectiveDefinition<TApplicationArgs> | undefined {
+  protected directive<TApplicationArgs extends { [key: string]: any }>(schema: Schema, elementName: string): DirectiveDefinition<TApplicationArgs> | undefined {
     const name = this.directiveNameInSchema(schema, elementName);
     return name ? schema.directive(name) as DirectiveDefinition<TApplicationArgs> | undefined : undefined;
   }
@@ -130,11 +173,17 @@ export abstract class FeatureDefinition {
     return undefined;
   }
 
+  compositionSpecification(directiveNameInFeature: string): DirectiveCompositionSpecification | undefined {
+    const spec = this._directiveSpecs.get(directiveNameInFeature);
+    return spec?.composition;
+  }
+
   toString(): string {
     return `${this.identity}/${this.version}`
   }
 }
 
+
 export type CoreDirectiveArgs = {
   url: undefined,
   feature: string,
@@ -289,7 +338,7 @@ export function isCoreSpecDirectiveApplication(directive: Directive<SchemaDefini
     if (url.identity === coreIdentity) {
       return directive.name === (args.as ?? 'core');
     } else {
-      return url.identity === linkIdentity &&  directive.name === (args.as ?? linkDirectiveDefaultName);
+      return url.identity === linkIdentity && directive.name === (args.as ?? linkDirectiveDefaultName);
     }
   } catch (err) {
     return false;
@@ -307,7 +356,7 @@ function isValidUrlArgumentType(type: InputType, schema: Schema): boolean {
 
 const linkPurposeTypeSpec = createEnumTypeSpecification({
   name: 'Purpose',
-  values: corePurposes.map((name) => ({ name, description: purposesDescription(name)}))
+  values: corePurposes.map((name) => ({ name, description: purposesDescription(name) }))
 });
 
 const linkImportTypeSpec = createScalarTypeSpecification({ name: 'Import' });
@@ -321,32 +370,43 @@ export class CoreSpecDefinition extends FeatureDefinition {
       name,
       locations: [DirectiveLocation.SCHEMA],
       repeatable: true,
-      argumentFct: (schema, nameInSchema) => this.createDefinitionArgumentSpecifications(schema, nameInSchema),
+      args: this.createDefinitionArgumentSpecifications(),
     });
+    this.registerDirective(this.directiveDefinitionSpec);
   }
 
-  private createDefinitionArgumentSpecifications(schema: Schema, nameInSchema?: string): { args: ArgumentSpecification[], errors: GraphQLError[] } {
+  private createDefinitionArgumentSpecifications(): ArgumentSpecification[] {
     const args: ArgumentSpecification[] = [
-      { name: this.urlArgName(), type: schema.stringType() },
-      { name: 'as', type: schema.stringType() },
+      { name: this.urlArgName(), type: (schema) => schema.stringType() },
+      { name: 'as', type: (schema) => schema.stringType() },
     ];
     if (this.supportPurposes()) {
-      const purposeName = `${nameInSchema ?? this.url.name}__${linkPurposeTypeSpec.name}`;
-      const errors = linkPurposeTypeSpec.checkOrAdd(schema, purposeName);
-      if (errors.length > 0) {
-        return { args, errors }
-      }
-      args.push({ name: 'for', type: schema.type(purposeName) as InputType });
+      args.push({
+        name: 'for',
+        type: (schema, nameInSchema) => {
+          const purposeName = `${nameInSchema ?? this.url.name}__${linkPurposeTypeSpec.name}`;
+          const errors = linkPurposeTypeSpec.checkOrAdd(schema, purposeName);
+          if (errors.length > 0) {
+            return errors;
+          }
+          return schema.type(purposeName) as InputType;
+        },
+      });
     }
     if (this.supportImport()) {
-      const importName = `${nameInSchema ?? this.url.name}__${linkImportTypeSpec.name}`;
-      const errors = linkImportTypeSpec.checkOrAdd(schema, importName);
-      if (errors.length > 0) {
-        return { args, errors }
-      }
-      args.push({ name: 'import', type: new ListType(schema.type(importName)!) });
+      args.push({
+        name: 'import',
+        type: (schema, nameInSchema) => {
+          const importName = `${nameInSchema ?? this.url.name}__${linkImportTypeSpec.name}`;
+          const errors = linkImportTypeSpec.checkOrAdd(schema, importName);
+          if (errors.length > 0) {
+            return errors;
+          }
+          return new ListType(schema.type(importName)!);
+        }
+      });
     }
-    return { args, errors: [] };
+    return args;
   }
 
   addElementsToSchema(_: Schema): GraphQLError[] {
@@ -394,7 +454,7 @@ export class CoreSpecDefinition extends FeatureDefinition {
     //
     // So instead, we put the directive on the schema definition unless some extensions exists but no
     // definition does (that is, no non-extension elements are populated).
-    const schemaDef =  schema.schemaDefinition;
+    const schemaDef = schema.schemaDefinition;
     // Side-note: this test must be done _before_ we call `applyDirective`, otherwise it would take it into
     // account.
     const hasDefinition = schemaDef.hasNonExtensionElements();
@@ -429,7 +489,7 @@ export class CoreSpecDefinition extends FeatureDefinition {
    * must start with a `@`.
    */
   allElementNames(): string[] {
-    const names = [ `@${this.url.name}` ];
+    const names = [`@${this.url.name}`];
     if (this.supportPurposes()) {
       names.push('Purpose');
     }
@@ -533,7 +593,7 @@ export class FeatureDefinitions<T extends FeatureDefinition = FeatureDefinition>
  * Versions are a (major, minor) number pair.
  */
 export class FeatureVersion {
-  constructor(public readonly major: number, public readonly minor: number) {}
+  constructor(public readonly major: number, public readonly minor: number) { }
 
   /**
    * Parse a version specifier of the form "v(major).(minor)" or throw
@@ -565,8 +625,8 @@ export class FeatureVersion {
    * ```
    **/
   public satisfies(required: FeatureVersion): boolean {
-    const {major, minor} = this
-    const {major: rMajor, minor: rMinor} = required
+    const { major, minor } = this
+    const { major: rMajor, minor: rMinor } = required
     return rMajor == major && (
       major == 0
         ? rMinor == minor
@@ -580,7 +640,7 @@ export class FeatureVersion {
    * of compatibility, so those will just return the same thing as `this.toString()`.
    */
   public get series() {
-    const {major} = this
+    const { major } = this
     return major > 0 ? `${major}.x` : String(this)
   }
 
@@ -650,7 +710,7 @@ export class FeatureUrl {
     public readonly name: string,
     public readonly version: FeatureVersion,
     public readonly element?: string,
-  ) {}
+  ) { }
 
   /// Parse a spec URL or throw
   public static parse(input: string, node?: ASTNode): FeatureUrl {
@@ -668,7 +728,7 @@ export class FeatureUrl {
     if (!name) {
       throw ERRORS.INVALID_LINK_IDENTIFIER.err(`Missing feature name component in feature url '${url}'`, { nodes: node })
     }
-    const element = url.hash ? url.hash.slice(1): undefined
+    const element = url.hash ? url.hash.slice(1) : undefined
     url.hash = ''
     url.search = ''
     url.password = ''
@@ -690,7 +750,7 @@ export class FeatureUrl {
    */
   public satisfies(requested: FeatureUrl): boolean {
     return requested.identity === this.identity &&
-           this.version.satisfies(requested.version)
+      this.version.satisfies(requested.version)
   }
 
   public equals(other: FeatureUrl) {