fix(graphql-types-generator): correct scalar and enum type in angular (#257)

* fix(graphql-types-generator): correct scalar and enum type in angular

* test: add unit test

* fix: rm unused schema

Author: AaronZyLee

packages/graphql-types-generator/src/angular/index.ts

@@ -1,4 +1,4 @@
-import { GraphQLNonNull, GraphQLType, isScalarType } from 'graphql';
+import { GraphQLNonNull, GraphQLType, isScalarType, isEnumType, isListType } from 'graphql';
 import * as prettier from 'prettier';
 import { LegacyCompilerContext, LegacyOperation, LegacyInlineFragment, LegacyField } from '../compiler/legacyIR';
 
@@ -128,9 +128,19 @@ function getOperationResultField(operation: LegacyOperation): LegacyField | void
 function getReturnTypeName(generator: CodeGenerator, op: LegacyOperation): String {
   const { operationName, operationType } = op;
   const { type } = op.fields[0];
-  if (isScalarType(type)) {
+  //List of scalar or enum type
+  if (isListType(type)) {
+    const { ofType } = type;
+    if (isScalarType(ofType) || isEnumType(ofType)) {
+      return `Array<${typeNameFromGraphQLType(generator.context, ofType)}>`;
+    }
+  }
+  //Scalar and enum type
+  if (isScalarType(type) || isEnumType(type)) {
     return typeNameFromGraphQLType(generator.context, type);
-  } else {
+  }
+  //Non scalar type
+  else {
     let returnType = interfaceNameFromOperation({ operationName, operationType });
     if (op.operationType === 'subscription' && op.fields.length) {
       returnType = `Pick<__SubscriptionContainer, "${op.fields[0].responseName}">`;

packages/graphql-types-generator/test/angular/__snapshots__/index.js.snap

@@ -838,6 +838,60 @@ export class APIService {
 "
 `;
 
+exports[`Angular code generation #generateSource() should generate simple query operation with scalar/enum field and scalar/enum return type w & w/o list 1`] = `
+"/* tslint:disable */
+/* eslint-disable */
+//  This file was automatically generated and should not be edited.
+import { Injectable } from \\"@angular/core\\";
+import API, { graphqlOperation, GraphQLResult } from \\"@aws-amplify/api-graphql\\";
+import { Observable } from \\"zen-observable-ts\\";
+
+export interface SubscriptionResponse<T> {
+  value: GraphQLResult<T>;
+}
+
+export enum Status {
+  APPROVED = \\"APPROVED\\",
+  PENDING = \\"PENDING\\",
+  REJECTED = \\"REJECTED\\"
+}
+
+@Injectable({
+  providedIn: \\"root\\"
+})
+export class APIService {
+  async GetScalars(): Promise<Array<string | null>> {
+    const statement = \`query GetScalars {
+        getScalars
+      }\`;
+    const response = (await API.graphql(graphqlOperation(statement))) as any;
+    return <Array<string | null>>response.data.getScalars;
+  }
+  async GetScalar(): Promise<string | null> {
+    const statement = \`query GetScalar {
+        getScalar
+      }\`;
+    const response = (await API.graphql(graphqlOperation(statement))) as any;
+    return <string | null>response.data.getScalar;
+  }
+  async GetEnums(): Promise<Array<Status | null>> {
+    const statement = \`query GetEnums {
+        getEnums
+      }\`;
+    const response = (await API.graphql(graphqlOperation(statement))) as any;
+    return <Array<Status | null>>response.data.getEnums;
+  }
+  async GetEnum(): Promise<Status | null> {
+    const statement = \`query GetEnum {
+        getEnum
+      }\`;
+    const response = (await API.graphql(graphqlOperation(statement))) as any;
+    return <Status | null>response.data.getEnum;
+  }
+}
+"
+`;
+
 exports[`Angular code generation #generateSource() should generate simple query operations 1`] = `
 "/* tslint:disable */
 /* eslint-disable */

packages/graphql-types-generator/test/angular/index.js

@@ -391,5 +391,25 @@ describe('Angular code generation', function() {
       const source = generateSource(context);
       expect(source).toMatchSnapshot();
     });
+
+    test(`should generate simple query operation with scalar/enum field and scalar/enum return type w & w/o list`, function() {
+      const { compileFromSource } = setup(loadSchema(require.resolve('../fixtures/misc/queryWithScalarAndEnumType.graphql')));
+      const context = compileFromSource(`
+      query GetScalars {
+        getScalars
+      }
+      query GetScalar {
+        getScalar
+      }
+      query GetEnums {
+        getEnums
+      }
+      query GetEnum {
+        getEnum
+      }
+      `);
+      const source = generateSource(context);
+      expect(source).toMatchSnapshot();
+    });
   });
 });

packages/graphql-types-generator/test/fixtures/misc/queryWithScalarAndEnumType.graphql

@@ -0,0 +1,161 @@
+type Person {
+  id: ID!
+  name: String!
+  items: [String!]
+  createdAt: AWSDateTime!
+  updatedAt: AWSDateTime!
+}
+
+type Query {
+  getScalars: [String]
+  getScalar: String
+  getEnums: [Status]
+  getEnum: Status
+  getPerson(id: ID!): Person
+  listPersons(filter: ModelPersonFilterInput, limit: Int, nextToken: String): ModelPersonConnection
+}
+
+enum Status {
+  APPROVED
+  PENDING
+  REJECTED
+}
+
+enum ModelSortDirection {
+  ASC
+  DESC
+}
+
+type ModelPersonConnection {
+  items: [Person]
+  nextToken: String
+}
+
+input ModelStringInput {
+  ne: String
+  eq: String
+  le: String
+  lt: String
+  ge: String
+  gt: String
+  contains: String
+  notContains: String
+  between: [String]
+  beginsWith: String
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelIDInput {
+  ne: ID
+  eq: ID
+  le: ID
+  lt: ID
+  ge: ID
+  gt: ID
+  contains: ID
+  notContains: ID
+  between: [ID]
+  beginsWith: ID
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelIntInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelFloatInput {
+  ne: Float
+  eq: Float
+  le: Float
+  lt: Float
+  ge: Float
+  gt: Float
+  between: [Float]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelBooleanInput {
+  ne: Boolean
+  eq: Boolean
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelSizeInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+}
+
+input ModelPersonFilterInput {
+  name: ModelStringInput
+  items: ModelStringInput
+  and: [ModelPersonFilterInput]
+  or: [ModelPersonFilterInput]
+  not: ModelPersonFilterInput
+}
+
+enum ModelAttributeTypes {
+  binary
+  binarySet
+  bool
+  list
+  map
+  number
+  numberSet
+  string
+  stringSet
+  _null
+}
+
+input CreatePersonInput {
+  id: ID
+  name: String!
+  items: [String!]
+}
+
+input UpdatePersonInput {
+  name: String
+  items: [String!]
+}
+
+input DeletePersonInput {
+  id: ID!
+}
+
+type Mutation {
+  createPerson(input: CreatePersonInput!, condition: ModelPersonConditionInput): Person
+  updatePerson(input: UpdatePersonInput!, condition: ModelPersonConditionInput): Person
+  deletePerson(input: DeletePersonInput!, condition: ModelPersonConditionInput): Person
+}
+
+input ModelPersonConditionInput {
+  name: ModelStringInput
+  items: ModelStringInput
+  and: [ModelPersonConditionInput]
+  or: [ModelPersonConditionInput]
+  not: ModelPersonConditionInput
+}
+
+type Subscription {
+  onCreatePerson: Person @aws_subscribe(mutations: ["createPerson"])
+  onUpdatePerson: Person @aws_subscribe(mutations: ["updatePerson"])
+  onDeletePerson: Person @aws_subscribe(mutations: ["deletePerson"])
+}