Skip to content

fix(amplify-codegen-appsync-model-plugin): fixed nullable lists #5449

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

Closed
seang96 wants to merge 4 commits into from
Closed

fix(amplify-codegen-appsync-model-plugin): fixed nullable lists #5449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25c795f
fix(amplify-codegen-appsync-model-plugin): fix DataStore Array Support
Sep 14, 2020
650f06d
test(amplify-codegen-appsync-model-plugin): fixed Tests
Sep 14, 2020
f4e8e25
style(amplify-codegen-appsync-model-plugin): rename attribute
Sep 25, 2020
45233fc
fix(amplify-codegen-appsync-model-plugin): fix metadata
Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...amplify-codegen-appsync-model-plugin/src/__tests__/visitors/appsync-swift-visitor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ describe('AppSyncSwiftVisitor', () => {
Class: Class
nonNullClass: Class!
classes: [Class]
nonNullClasses: [Class]!
nonNullClasses: [Class!]!
}
`;
const visitor = getVisitor(schema, 'Class');
Expand Down
7 changes: 6 additions & 1 deletion packages/amplify-codegen-appsync-model-plugin/src/utils/get-type-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ export function getTypeInfo(typeNode: TypeNode, schema: GraphQLSchema): TypeInfo
isList: false,
baseType: schema.getType(typeNode.name.value),
};
} else if (typeNode.kind === 'NonNullType' && typeNode.type.kind === 'ListType') {
return {
...getTypeInfo(typeNode.type.type, schema),
isList: true,
isListNullable: false,
};
} else if (typeNode.kind === 'NonNullType') {
return {
...getTypeInfo(typeNode.type, schema),
Expand All @@ -17,7 +23,6 @@ export function getTypeInfo(typeNode: TypeNode, schema: GraphQLSchema): TypeInfo
return {
...getTypeInfo(typeNode.type, schema),
isList: true,
isNullable: true,
};
}
return {
Expand Down
6 changes: 6 additions & 0 deletions packages/amplify-codegen-appsync-model-plugin/src/visitors/appsync-json-metadata-visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ type JSONModelField = {
type: JSONModelFieldType;
isArray: boolean;
isRequired?: boolean;
isArrayNullable?: boolean;
attributes?: JSONModelFieldAttributes;
association?: AssociationType;
};
Expand Down Expand Up @@ -202,6 +203,11 @@ export class AppSyncJSONVisitor<
isRequired: !field.isNullable,
attributes: [],
};

if (field.isListNullable !== undefined) {
fieldMeta.isArrayNullable = field.isListNullable;
}

const association: AssociationType | void = this.getFieldAssociation(field);
if (association) {
fieldMeta.association = association;
Expand Down
1 change: 1 addition & 0 deletions packages/amplify-codegen-appsync-model-plugin/src/visitors/appsync-visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export type TypeInfo = {
type: string;
isList: boolean;
isNullable: boolean;
isListNullable?: boolean;
baseType?: GraphQLNamedType | null;
};
export type CodeGenModel = {
Expand Down