feat: generate list types as non-null (#8166)

* feat: generate list types as non-null * test: update more snapshots * fix: make corresponding change in v2 transformer * fix: non null lists in v2 transformer * chore: force cci rerun * test: update one more snapshot * test: who knew there were so many snapshots to update
aws-amplify · Oct 22, 2021 · 93786c1 · 93786c1
1 parent 26efb7a
commit 93786c1
Show file tree

Hide file tree

Showing 18 changed files with 1,254 additions and 1,209 deletions.
diff --git a/...ormer/src/__tests__/__snapshots__/amplify-grapphql-default-value-transformer.test.ts.snap b/...ormer/src/__tests__/__snapshots__/amplify-grapphql-default-value-transformer.test.ts.snap
@@ -120,7 +120,7 @@ enum ModelSortDirection {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 

diff --git a/packages/amplify-graphql-index-transformer/src/schema.ts b/packages/amplify-graphql-index-transformer/src/schema.ts
@@ -363,7 +363,7 @@ function generateModelXConnectionType(config: IndexDirectiveConfiguration, ctx:
   let connectionTypeExtension = blankObjectExtension(tableXConnectionName);
 
   connectionTypeExtension = extensionWithFields(connectionTypeExtension, [
-    makeField('items', [], makeListType(makeNamedType(tableXConnectionName))),
+    makeField('items', [], makeNonNullType(makeListType(makeNonNullType(makeNamedType(object.name.value))))),
   ]);
   connectionTypeExtension = extensionWithFields(connectionTypeExtension, [makeField('nextToken', [], makeNamedType('String'))]);
 

diff --git a/...lify-graphql-model-transformer/src/__tests__/__snapshots__/model-transformer.test.ts.snap b/...lify-graphql-model-transformer/src/__tests__/__snapshots__/model-transformer.test.ts.snap
@@ -107,7 +107,7 @@ enum ModelSortDirection {
 }
 
 type ModelTestConnection {
-  items: [Test]
+  items: [Test!]!
   nextToken: String
 }
 
@@ -162,7 +162,7 @@ type Subscription {
 }
 
 type ModelEmailConnection {
-  items: [Email]
+  items: [Email!]!
   nextToken: String
 }
 
@@ -356,7 +356,7 @@ input EntityMetadataInput {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 
@@ -463,7 +463,7 @@ type Subscription {
 }
 
 type ModelAuthorConnection {
-  items: [Author]
+  items: [Author!]!
   nextToken: String
 }
 
@@ -501,7 +501,7 @@ input DeleteAuthorInput {
 }
 
 type ModelRequireConnection {
-  items: [Require]
+  items: [Require!]!
   nextToken: String
 }
 
@@ -539,7 +539,7 @@ input DeleteRequireInput {
 }
 
 type ModelCommentConnection {
-  items: [Comment]
+  items: [Comment!]!
   nextToken: String
 }
 
@@ -12153,7 +12153,7 @@ enum ModelSortDirection {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 
@@ -12690,7 +12690,7 @@ enum ModelSortDirection {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 
@@ -13050,7 +13050,7 @@ enum ModelSortDirection {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 
@@ -13404,7 +13404,7 @@ enum ModelSortDirection {
 }
 
 type ModelPostConnection {
-  items: [Post]
+  items: [Post!]!
   nextToken: String
 }
 

diff --git a/packages/amplify-graphql-model-transformer/src/graphql-types/query.ts b/packages/amplify-graphql-model-transformer/src/graphql-types/query.ts
@@ -13,7 +13,7 @@ export const makeListQueryFilterInput = (
 export const makeListQueryModel = (type: ObjectTypeDefinitionNode, modelName: string, isSyncEnabled: boolean): ObjectTypeDefinitionNode => {
   const outputType = ObjectDefinitionWrapper.create(modelName);
 
-  outputType.addField(FieldWrapper.create('items', type.name.value, true, true));
+  outputType.addField(FieldWrapper.create('items', type.name.value, false, true));
   outputType.addField(FieldWrapper.create('nextToken', 'String', true, false));
 
   if (isSyncEnabled) {

diff --git a/packages/amplify-graphql-model-transformer/src/wrappers/object-definition-wrapper.ts b/packages/amplify-graphql-model-transformer/src/wrappers/object-definition-wrapper.ts
@@ -295,7 +295,7 @@ export class FieldWrapper extends GenericFieldWrapper {
       field.makeNonNullable();
     }
     if (isList) {
-      field.wrapListType();
+      field.wrapListType().makeNonNullable();
     }
     return field;
   };