Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Has many connected field #8700

Merged
merged 1 commit into from
Nov 6, 2021
Merged

Has many connected field #8700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...graphql-relational-transformer/src/__tests__/amplify-graphql-has-many-transformer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,19 +513,14 @@ test('has many with implicit index and fields and a user-defined primary key', (
const commentType = schema.definitions.find((def: any) => def.name && def.name.value === 'Comment') as any;
expect(commentType).toBeDefined();

const postCommentsField = commentType.fields.find((f: any) => f.name.value === 'postCommentsId');
expect(postCommentsField).toBeDefined();

const commentFilterInput = schema.definitions.find((def: any) => def.name && def.name.value === 'ModelCommentFilterInput') as any;
expect(commentFilterInput).toBeDefined();
expect(commentFilterInput.fields.find((f: any) => f.name.value === 'id')).toBeDefined();
expect(commentFilterInput.fields.find((f: any) => f.name.value === 'content')).toBeDefined();
expect(commentFilterInput.fields.find((f: any) => f.name.value === 'postCommentsId')).toBeDefined();

const commentConditionInput = schema.definitions.find((def: any) => def.name && def.name.value === 'ModelCommentConditionInput') as any;
expect(commentConditionInput).toBeDefined();
expect(commentConditionInput.fields.find((f: any) => f.name.value === 'content')).toBeDefined();
expect(commentConditionInput.fields.find((f: any) => f.name.value === 'postCommentsId')).toBeDefined();
});

test('the limit of 100 is used by default', () => {
Expand Down
42 changes: 8 additions & 34 deletions packages/amplify-graphql-relational-transformer/src/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,14 @@ export function ensureHasOneConnectionField(
const createInput = ctx.output.getType(createInputName) as InputObjectTypeDefinitionNode;

if (createInput) {
ctx.output.putType(updateCreateInputWithConnectionField(createInput, connectionAttributeName, isNonNullType(field.type)));
ctx.output.putType(updateInputWithConnectionField(createInput, connectionAttributeName, isNonNullType(field.type)));
}

const updateInputName = ModelResourceIDs.ModelUpdateInputObjectName(object.name.value);
const updateInput = ctx.output.getType(updateInputName) as InputObjectTypeDefinitionNode;

if (updateInput) {
ctx.output.putType(updateUpdateInputWithConnectionField(updateInput, connectionAttributeName));
ctx.output.putType(updateInputWithConnectionField(updateInput, connectionAttributeName));
}

const filterInputName = toPascalCase(['Model', object.name.value, 'FilterInput']);
Expand Down Expand Up @@ -185,40 +185,33 @@ export function ensureHasManyConnectionField(

const relatedTypeObject = ctx.output.getType(relatedType.name.value) as ObjectTypeDefinitionNode;
if (relatedTypeObject) {
const updated = updateTypeWithConnectionField(relatedTypeObject, connectionAttributeName, isNonNullType(field.type));
ctx.output.putType(updated);
ctx.output.putType(updateTypeWithConnectionField(relatedTypeObject, connectionAttributeName, isNonNullType(field.type)));
}

const createInputName = ModelResourceIDs.ModelCreateInputObjectName(relatedType.name.value);
const createInput = ctx.output.getType(createInputName) as InputObjectTypeDefinitionNode;

if (createInput) {
const updated = updateCreateInputWithConnectionField(createInput, connectionAttributeName, isNonNullType(field.type));

ctx.output.putType(updated);
ctx.output.putType(updateInputWithConnectionField(createInput, connectionAttributeName, isNonNullType(field.type)));
}

const updateInputName = ModelResourceIDs.ModelUpdateInputObjectName(relatedType.name.value);
const updateInput = ctx.output.getType(updateInputName) as InputObjectTypeDefinitionNode;

if (updateInput) {
const updated = updateUpdateInputWithConnectionField(updateInput, connectionAttributeName);

ctx.output.putType(updated);
ctx.output.putType(updateInputWithConnectionField(updateInput, connectionAttributeName));
}

const filterInputName = toPascalCase(['Model', relatedType.name.value, 'FilterInput']);
const filterInput = ctx.output.getType(filterInputName) as InputObjectTypeDefinitionNode;
if (filterInput) {
const updated = updateFilterConnectionInputWithConnectionField(filterInput, connectionAttributeName);
ctx.output.putType(updated);
ctx.output.putType(updateFilterConnectionInputWithConnectionField(filterInput, connectionAttributeName));
}

const conditionInputName = toPascalCase(['Model', relatedType.name.value, 'ConditionInput']);
const conditionInput = ctx.output.getType(conditionInputName) as InputObjectTypeDefinitionNode;
if (conditionInput) {
const updated = updateFilterConnectionInputWithConnectionField(conditionInput, connectionAttributeName);
ctx.output.putType(updated);
ctx.output.putType(updateFilterConnectionInputWithConnectionField(conditionInput, connectionAttributeName));
}

let connectionFieldName = 'id';
Expand Down Expand Up @@ -258,7 +251,7 @@ function updateTypeWithConnectionField(
};
}

function updateCreateInputWithConnectionField(
function updateInputWithConnectionField(
input: InputObjectTypeDefinitionNode,
connectionFieldName: string,
nonNull: boolean = false,
Expand All @@ -281,25 +274,6 @@ function updateCreateInputWithConnectionField(
};
}

function updateUpdateInputWithConnectionField(
input: InputObjectTypeDefinitionNode,
connectionFieldName: string,
): InputObjectTypeDefinitionNode {
const keyFieldExists = input.fields!.some(f => f.name.value === connectionFieldName);

// If the key field already exists then do not change the input.
if (keyFieldExists) {
return input;
}

const updatedFields = [...input.fields!, makeInputValueDefinition(connectionFieldName, makeNamedType('ID'))];

return {
...input,
fields: updatedFields,
};
}

function updateFilterConnectionInputWithConnectionField(
input: InputObjectTypeDefinitionNode,
connectionFieldName: string,
Expand Down
14 changes: 7 additions & 7 deletions packages/graphql-connection-transformer/src/ModelConnectionTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
makeNamedType,
} from 'graphql-transformer-common';
import { ResolverResourceIDs, ModelResourceIDs } from 'graphql-transformer-common';
import { updateCreateInputWithConnectionField, updateUpdateInputWithConnectionField } from './definitions';
import { updateInputWithConnectionField } from './definitions';
import Table, { KeySchema, GlobalSecondaryIndex, LocalSecondaryIndex } from 'cloudform-types/types/dynamoDb/table';

const CONNECTION_STACK_NAME = 'ConnectionStack';
Expand Down Expand Up @@ -368,13 +368,13 @@ export class ModelConnectionTransformer extends Transformer {
const createInputName = ModelResourceIDs.ModelCreateInputObjectName(parentTypeName);
const createInput = ctx.getType(createInputName) as InputObjectTypeDefinitionNode;
if (createInput) {
const updated = updateCreateInputWithConnectionField(createInput, connectionAttributeName, leftConnectionIsNonNull);
const updated = updateInputWithConnectionField(createInput, connectionAttributeName, leftConnectionIsNonNull);
ctx.putType(updated);
}
const updateInputName = ModelResourceIDs.ModelUpdateInputObjectName(parentTypeName);
const updateInput = ctx.getType(updateInputName) as InputObjectTypeDefinitionNode;
if (updateInput) {
const updated = updateUpdateInputWithConnectionField(updateInput, connectionAttributeName);
const updated = updateInputWithConnectionField(updateInput, connectionAttributeName);
ctx.putType(updated);
}
} else if (leftConnectionIsList) {
Expand Down Expand Up @@ -415,13 +415,13 @@ export class ModelConnectionTransformer extends Transformer {
const createInputName = ModelResourceIDs.ModelCreateInputObjectName(relatedTypeName);
const createInput = ctx.getType(createInputName) as InputObjectTypeDefinitionNode;
if (createInput) {
const updated = updateCreateInputWithConnectionField(createInput, connectionAttributeName);
const updated = updateInputWithConnectionField(createInput, connectionAttributeName);
ctx.putType(updated);
}
const updateInputName = ModelResourceIDs.ModelUpdateInputObjectName(relatedTypeName);
const updateInput = ctx.getType(updateInputName) as InputObjectTypeDefinitionNode;
if (updateInput) {
const updated = updateUpdateInputWithConnectionField(updateInput, connectionAttributeName);
const updated = updateInputWithConnectionField(updateInput, connectionAttributeName);
ctx.putType(updated);
}
} else {
Expand Down Expand Up @@ -502,13 +502,13 @@ export class ModelConnectionTransformer extends Transformer {
const createInputName = ModelResourceIDs.ModelCreateInputObjectName(parentTypeName);
const createInput = ctx.getType(createInputName) as InputObjectTypeDefinitionNode;
if (createInput) {
const updated = updateCreateInputWithConnectionField(createInput, connectionAttributeName, leftConnectionIsNonNull);
const updated = updateInputWithConnectionField(createInput, connectionAttributeName, leftConnectionIsNonNull);
ctx.putType(updated);
}
const updateInputName = ModelResourceIDs.ModelUpdateInputObjectName(parentTypeName);
const updateInput = ctx.getType(updateInputName) as InputObjectTypeDefinitionNode;
if (updateInput) {
const updated = updateUpdateInputWithConnectionField(updateInput, connectionAttributeName);
const updated = updateInputWithConnectionField(updateInput, connectionAttributeName);
ctx.putType(updated);
}
}
Expand Down
21 changes: 2 additions & 19 deletions packages/graphql-connection-transformer/src/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { InputObjectTypeDefinitionNode } from 'graphql';
import { makeInputValueDefinition, makeNonNullType, makeNamedType } from 'graphql-transformer-common';

export function updateCreateInputWithConnectionField(
export function updateInputWithConnectionField(
input: InputObjectTypeDefinitionNode,
connectionFieldName: string,
nonNull: boolean = false
nonNull: boolean = false,
): InputObjectTypeDefinitionNode {
const keyFieldExists = Boolean(input.fields.find(f => f.name.value === connectionFieldName));
// If the key field already exists then do not change the input.
Expand All @@ -21,20 +21,3 @@ export function updateCreateInputWithConnectionField(
fields: updatedFields,
};
}

export function updateUpdateInputWithConnectionField(
input: InputObjectTypeDefinitionNode,
connectionFieldName: string
): InputObjectTypeDefinitionNode {
const keyFieldExists = Boolean(input.fields.find(f => f.name.value === connectionFieldName));
// If the key field already exists then do not change the input.
// The @connection field will validate that the key field is valid.
if (keyFieldExists) {
return input;
}
const updatedFields = [...input.fields, makeInputValueDefinition(connectionFieldName, makeNamedType('ID'))];
return {
...input,
fields: updatedFields,
};
}