Fix for relationship types using federated entities (#441)

* handles external entities * handles external entities on relationship types * adds helpers for type extension definitions * adds and uses isExternalTypeExtension * adds more tests for relationship fields between entities * adds relationship property data * adds and uses isExternalTypeExtension * adds helpers for type extension definitions * handles external entities on relationship types * handles external entities * adds relationship types

Author: michaeldgraham

example/apollo-federation/seed-data.js

@@ -4,6 +4,7 @@ export const seedData = {
  {
  id: '1',
  body: 'Love it!',
+ rating: 9.9,
  product: {
  upc: '1',
  name: 'Table',
@@ -28,7 +29,8 @@ export const seedData = {
  metric: 1,
  data: 2
  }
- ]
+ ],
+ value: 1
  },
  authorID: '1',
  author: {
@@ -41,6 +43,7 @@ export const seedData = {
  {
  id: '2',
  body: 'Too expensive.',
+ rating: 5.5,
  product: {
  upc: '2',
  name: 'Couch',
@@ -49,7 +52,8 @@ export const seedData = {
  inStock: false,
  metrics: [],
  objectCompoundKey: null,
- listCompoundKey: []
+ listCompoundKey: [],
+ value: 2
  },
  authorID: '1',
  author: {
@@ -62,6 +66,7 @@ export const seedData = {
  {
  id: '3',
  body: 'Could be better.',
+ rating: 3.8,
  product: {
  upc: '3',
  name: 'Chair',
@@ -70,7 +75,8 @@ export const seedData = {
  inStock: true,
  metrics: [],
  objectCompoundKey: null,
- listCompoundKey: []
+ listCompoundKey: [],
+ value: 3
  },
  authorID: '2',
  author: {
@@ -83,6 +89,7 @@ export const seedData = {
  {
  id: '4',
  body: 'Prefer something else.',
+ rating: 5.0,
  product: {
  upc: '1',
  name: 'Table',
@@ -107,7 +114,8 @@ export const seedData = {
  metric: 1,
  data: 2
  }
- ]
+ ],
+ value: 4
  },
  authorID: '2',
  author: {

example/apollo-federation/services/reviews/index.js

@@ -19,6 +19,7 @@ export const reviewsSchema = buildFederatedSchema([
  # Normal use of @relation field directive
  product: Product
  @relation(name: "REVIEW_OF", direction: OUT)
+ ratings: [Rating]
  }
 
  extend type Account @key(fields: "id") {
@@ -32,12 +33,33 @@ export const reviewsSchema = buildFederatedSchema([
  MATCH (this)-[:AUTHOR_OF]->(review:Review)
  RETURN count(review)
  `})
+ product: [Product] @relation(name: "PRODUCT_ACCOUNT", direction: IN)
+ entityRelationship: [EntityRelationship]
  }
 
  extend type Product @key(fields: "upc") {
  upc: String! @external
  reviews(body: String): [Review]
  @relation(name: "REVIEW_OF", direction: IN)
+ ratings: [Rating]
+ account(filter: LocalAccountFilter): [Account] @relation(name: "PRODUCT_ACCOUNT", direction: OUT)
+ entityRelationship: [EntityRelationship]
+ }
+
+ input LocalAccountFilter {
+ id_not: ID
+ }
+
+ type Rating @relation(name: "REVIEW_OF") {
+ from: Review
+ rating: Float
+ to: Product
+ }
+
+ type EntityRelationship @relation(name: "PRODUCT_ACCOUNT") {
+ from: Product
+ value: Int
+ to: Account
  }
 
  # Used in testing and for example of nested merge import
@@ -111,9 +133,18 @@ export const reviewsSchema = buildFederatedSchema([
  weight: product.weight,
  inStock: product.inStock
  }
- MERGE (p)<-[:REVIEW_OF]-(r)
+ MERGE (p)<-[:REVIEW_OF {
+ rating: review.rating
+ }]-(r)
+ WITH *
+ UNWIND review.author AS account
+ MATCH (a:Account {
+ id: account.id
+ })
+ MERGE (p)-[:PRODUCT_ACCOUNT {
+ value: product.value
+ }]->(a)
  WITH *
-
  // Merge Review.product.metrics / .objectCompoundKey / .listCompoundKey
  UNWIND product.metrics AS metric
  MERGE (m:Metric {

src/augment/types/node/node.js

@@ -1,4 +1,3 @@
-import { Kind } from 'graphql';
 import {
  augmentNodeQueryAPI,
  augmentNodeQueryArgumentTypes,
@@ -37,7 +36,9 @@ import {
  isNodeType,
  isRelationshipType,
  isQueryTypeDefinition,
- isUnionTypeDefinition
+ isUnionTypeDefinition,
+ isObjectTypeExtensionDefinition,
+ isInterfaceTypeExtensionDefinition
 } from '../../types/types';
 import { getPrimaryKey } from '../../../utils';
 
@@ -69,9 +70,12 @@ export const augmentNodeType = ({
  if (typeExtensions.length) {
  typeExtensionDefinitionMap[typeName] = typeExtensions.map(extension => {
  let isIgnoredType = false;
- const isObjectExtension = extension.kind === Kind.OBJECT_TYPE_EXTENSION;
- const isInterfaceExtension =
- extension.kind === Kind.INTERFACE_TYPE_EXTENSION;
+ const isObjectExtension = isObjectTypeExtensionDefinition({
+ definition: extension
+ });
+ const isInterfaceExtension = isInterfaceTypeExtensionDefinition({
+ definition: extension
+ });
  if (isObjectExtension || isInterfaceExtension) {
  [
  extensionNodeInputTypeMap,
@@ -82,6 +86,7 @@ export const augmentNodeType = ({
  typeName,
  definition: extension,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
  nodeInputTypeMap: extensionNodeInputTypeMap,
@@ -110,6 +115,7 @@ export const augmentNodeType = ({
  isUnionType,
  isQueryType,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
  nodeInputTypeMap,
@@ -178,6 +184,7 @@ export const augmentNodeTypeFields = ({
  isUnionType,
  isQueryType,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
  nodeInputTypeMap = {},
@@ -206,10 +213,6 @@ export const augmentNodeTypeFields = ({
  };
  }
  }
- if (fields === undefined) {
- console.log('\ndefinition: ', definition);
- console.log('fields: ', fields);
- }
  propertyOutputFields = fields.reduce((outputFields, field) => {
  let fieldType = field.type;
  let fieldArguments = field.arguments;
@@ -264,13 +267,14 @@ export const augmentNodeTypeFields = ({
  outputType,
  nodeInputTypeMap,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
- config,
  relationshipDirective,
  outputTypeWrappers,
  isObjectExtension,
- isInterfaceExtension
+ isInterfaceExtension,
+ config
  });
  } else if (isRelationshipType({ definition: outputDefinition })) {
  [
@@ -292,8 +296,11 @@ export const augmentNodeTypeFields = ({
  outputDefinition,
  nodeInputTypeMap,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
+ isObjectExtension,
+ isInterfaceExtension,
  config
  });
  }
@@ -305,21 +312,22 @@ export const augmentNodeTypeFields = ({
  });
  return outputFields;
  }, []);
-
- if (!isQueryType && extensionNodeInputTypeMap) {
- if (extensionNodeInputTypeMap[FilteringArgument.FILTER]) {
- const extendedFilteringFields =
- extensionNodeInputTypeMap[FilteringArgument.FILTER].fields;
- nodeInputTypeMap[FilteringArgument.FILTER].fields.push(
- ...extendedFilteringFields
- );
- }
- if (extensionNodeInputTypeMap[OrderingArgument.ORDER_BY]) {
- const extendedOrderingValues =
- extensionNodeInputTypeMap[OrderingArgument.ORDER_BY].values;
- nodeInputTypeMap[OrderingArgument.ORDER_BY].values.push(
- ...extendedOrderingValues
- );
+ if (!isObjectExtension && !isInterfaceExtension) {
+ if (!isQueryType && extensionNodeInputTypeMap) {
+ if (extensionNodeInputTypeMap[FilteringArgument.FILTER]) {
+ const extendedFilteringFields =
+ extensionNodeInputTypeMap[FilteringArgument.FILTER].fields;
+ nodeInputTypeMap[FilteringArgument.FILTER].fields.push(
+ ...extendedFilteringFields
+ );
+ }
+ if (extensionNodeInputTypeMap[OrderingArgument.ORDER_BY]) {
+ const extendedOrderingValues =
+ extensionNodeInputTypeMap[OrderingArgument.ORDER_BY].values;
+ nodeInputTypeMap[OrderingArgument.ORDER_BY].values.push(
+ ...extendedOrderingValues
+ );
+ }
  }
  }
  } else {
@@ -347,13 +355,12 @@ const augmentNodeTypeField = ({
  outputType,
  nodeInputTypeMap,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
  config,
  relationshipDirective,
- outputTypeWrappers,
- isObjectExtension,
- isInterfaceExtension
+ outputTypeWrappers
 }) => {
  const isUnionType = isUnionTypeDefinition({ definition: outputDefinition });
  fieldArguments = augmentNodeTypeFieldArguments({
@@ -365,19 +372,11 @@ const augmentNodeTypeField = ({
  typeDefinitionMap,
  config
  });
- if (!isUnionType && !isObjectExtension && !isInterfaceExtension) {
+ if (!isUnionType) {
  if (
  relationshipDirective &&
  !isQueryTypeDefinition({ definition, operationTypeMap })
  ) {
- nodeInputTypeMap = augmentNodeQueryArgumentTypes({
- typeName,
- fieldName,
- outputType,
- outputTypeWrappers,
- nodeInputTypeMap,
- config
- });
  const relationshipName = getRelationName(relationshipDirective);
  const relationshipDirection = getRelationDirection(relationshipDirective);
  // Assume direction OUT
@@ -388,6 +387,14 @@ const augmentNodeTypeField = ({
  fromType = outputType;
  toType = temp;
  }
+ nodeInputTypeMap = augmentNodeQueryArgumentTypes({
+ typeName,
+ fieldName,
+ outputType,
+ outputTypeWrappers,
+ nodeInputTypeMap,
+ config
+ });
  [
  typeDefinitionMap,
  generatedTypeMap,
@@ -400,6 +407,7 @@ const augmentNodeTypeField = ({
  toType,
  relationshipName,
  typeDefinitionMap,
+ typeExtensionDefinitionMap,
  generatedTypeMap,
  operationTypeMap,
  config