feat: make fields optional for ObjectType

aws-amplify · Jan 20, 2021 · 5d6922b · 5d6922b
1 parent b8c82fd
commit 5d6922b
Show file tree

Hide file tree

Showing 4 changed files with 486 additions and 470 deletions.
diff --git a/packages/amplify-graphql-types-generator/src/typescript/codeGeneration.ts b/packages/amplify-graphql-types-generator/src/typescript/codeGeneration.ts
@@ -114,7 +114,7 @@ function structDeclarationForInputObjectType(generator: CodeGenerator, type: Gra
     },
     () => {
       const properties = propertiesFromFields(generator.context, Object.values(type.getFields()));
-      properties.forEach(property => propertyDeclaration(generator, { ...property, isOptional: true }));
+      properties.forEach(property => propertyDeclaration(generator, { ...property }));
     },
   );
 }

diff --git a/packages/amplify-graphql-types-generator/src/typescript/language.ts b/packages/amplify-graphql-types-generator/src/typescript/language.ts
@@ -58,7 +58,7 @@ export function propertyDeclaration(
   if (closure) {
     generator.printOnNewline(name);
 
-    if (isNullable && isOptional) {
+    if (isNullable || isOptional) {
       generator.print('?');
     }
     generator.print(': ');
@@ -84,10 +84,26 @@ export function propertyDeclaration(
     }
   } else {
     generator.printOnNewline(name);
-    if (isOptional && isNullable) {
+    if (isOptional || isNullable) {
       generator.print('?');
     }
-    generator.print(`: ${typeName || (type && typeNameFromGraphQLType(generator.context, type))}`);
+    generator.print(': ');
+
+    if (isArray) {
+      generator.print(' Array<');
+    }
+    generator.print(`${typeName || (type && typeNameFromGraphQLType(generator.context, type))}`);
+    if (isArray) {
+      if (isArrayElementNullable) {
+        generator.print(' | null');
+      }
+      generator.print(' >');
+    }
+
+    // When typeName is passed as string it includes <typename> | null for nullable types.
+    if (isNullable && (!typeName || isArray)) {
+      generator.print(' | null');
+    }
   }
   generator.print(',');
 }