Core schema support and Typescript query planner redux

codegen.yml

@@ -1,7 +1,7 @@
 overwrite: true
 schema: "https://us-central1-mdg-services.cloudfunctions.net:443/cloudconfig-staging/"
 documents:
-  - gateway-js/src/loadCsdlFromStorage.ts
+  - gateway-js/src/loadSupergraphSdlFromStorage.ts
 generates:
   gateway-js/src/__generated__/graphqlTypes.ts:
     plugins:

federation-integration-testsuite-js/src/matchers/index.ts

@@ -2,3 +2,4 @@ import './toCallService';
 import './toHaveBeenCalledBefore';
 import './toHaveFetched';
 import './toMatchAST';
+import './toMatchQueryPlan';

federation-js/src/__tests__/joinSpec.test.ts

@@ -0,0 +1,45 @@
+import { fixtures } from 'apollo-federation-integration-testsuite';
+import { getJoins } from "../joinSpec";
+
+const questionableNamesRemap = {
+  accounts: 'ServiceA',
+  books: 'serviceA',
+  documents: 'servicea_2',
+  inventory: 'servicea_2_',
+  product: '9product*!',
+  reviews: 'reviews_9',
+};
+
+const fixturesWithQuestionableServiceNames = fixtures.map((service) => ({
+  ...service,
+  name: questionableNamesRemap[service.name],
+}));
+
+describe('join__Graph enum', () => {
+  it('correctly uniquifies and sanitizes service names', () => {
+    const { sanitizedServiceNames } = getJoins(
+      fixturesWithQuestionableServiceNames,
+    );
+
+    /**
+     * Expectations
+     * 1. Non-Alphanumeric characters are replaced with _ (9product*!)
+     * 2. Numeric first characters are prefixed with _ (9product*!)
+     * 3. Names ending in an underscore followed by numbers `_\d+` are suffixed with _ (reviews_9, servicea_2)
+     * 4. Names are uppercased (all)
+     * 5. After transformations 1-4, duplicates are suffixed with _{n} where {n} is number of times we've seen the dupe (ServiceA + serviceA, servicea_2 + servicea_2_)
+     *
+     * Miscellany
+     * (serviceA) tests the edge case of colliding with a name we generated
+     * (servicea_2_) tests a collision against (documents) post-transformation
+     */
+    expect(sanitizedServiceNames).toMatchObject({
+      '9product*!': '_9PRODUCT__',
+      ServiceA: 'SERVICEA',
+      reviews_9: 'REVIEWS_9_',
+      serviceA: 'SERVICEA_2',
+      servicea_2: 'SERVICEA_2_',
+      servicea_2_: 'SERVICEA_2__2',
+    });
+  })
+})

federation-js/src/composition/__tests__/composeAndValidate.test.ts

@@ -689,15 +689,15 @@ describe('composition of value types', () => {
     ]);
 
     assertCompositionSuccess(compositionResult);
-    const { schema, composedSdl } = compositionResult;
+    const { schema, supergraphSdl } = compositionResult;
     expect(
       (schema.getType('Product') as GraphQLObjectType).getInterfaces(),
     ).toHaveLength(2);
 
     expect(printSchema(schema)).toContain(
       'type Product implements Named & Node',
     );
-    expect(composedSdl).toContain('type Product implements Named & Node');
+    expect(supergraphSdl).toContain('type Product implements Named & Node');
   });
 });
 

federation-js/src/composition/compose.ts

@@ -45,7 +45,7 @@ import {
 } from './types';
 import { validateSDL } from 'graphql/validation/validate';
 import { compositionRules } from './rules';
-import { printComposedSdl } from '../service/printComposedSdl';
+import { printSupergraphSdl } from '../service/printSupergraphSdl';
 
 const EmptyQueryDefinition = {
   kind: Kind.OBJECT_TYPE_DEFINITION,
@@ -156,6 +156,7 @@ export function buildMapsFromServiceList(serviceList: ServiceDefinition[]) {
       if (
         definition.kind === Kind.OBJECT_TYPE_DEFINITION ||
         definition.kind === Kind.OBJECT_TYPE_EXTENSION
+        // || definition.kind === Kind.INTERFACE_TYPE_DEFINITION
       ) {
         const typeName = definition.name.value;
 
@@ -660,7 +661,7 @@ export function composeServices(services: ServiceDefinition[]): CompositionResul
   } else {
     return {
       schema,
-      composedSdl: printComposedSdl(schema, services),
+      supergraphSdl: printSupergraphSdl(schema, services),
     };
   }
 }

federation-js/src/composition/utils.ts

@@ -607,16 +607,16 @@ export type CompositionResult = CompositionFailure | CompositionSuccess;
 // Yes, it's a bit awkward that we still return a schema when errors occur.
 // This is old behavior that I'm choosing not to modify for now.
 export interface CompositionFailure {
-  /** @deprecated Use composedSdl instead */
+  /** @deprecated Use supergraphSdl instead */
   schema: GraphQLSchema;
   errors: GraphQLError[];
-  composedSdl?: undefined;
+  supergraphSdl?: undefined;
 }
 
 export interface CompositionSuccess {
-  /** @deprecated Use composedSdl instead */
+  /** @deprecated Use supergraphSdl instead */
   schema: GraphQLSchema;
-  composedSdl: string;
+  supergraphSdl: string;
   errors?: undefined;
 }
 

federation-js/src/coreSpec.ts

@@ -0,0 +1,17 @@
+import {
+  GraphQLDirective,
+  DirectiveLocation,
+  GraphQLNonNull,
+  GraphQLString,
+} from 'graphql';
+
+export const CoreDirective = new GraphQLDirective({
+  name: 'core',
+  locations: [DirectiveLocation.SCHEMA],
+  args: {
+    feature: {
+      type: new GraphQLNonNull(GraphQLString),
+    },
+  },
+  isRepeatable: true,
+});

federation-js/src/directives.ts

@@ -26,7 +26,7 @@ export const KeyDirective = new GraphQLDirective({
   locations: [DirectiveLocation.OBJECT, DirectiveLocation.INTERFACE],
   args: {
     fields: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
     },
   },
 });
@@ -46,7 +46,7 @@ export const RequiresDirective = new GraphQLDirective({
   locations: [DirectiveLocation.FIELD_DEFINITION],
   args: {
     fields: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
     },
   },
 });
@@ -56,7 +56,7 @@ export const ProvidesDirective = new GraphQLDirective({
   locations: [DirectiveLocation.FIELD_DEFINITION],
   args: {
     fields: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
     },
   },
 });