Merge pull request #44 from indigotech/bugfix/multiple-queries

Bugfix - Just one @query was added to resulting schema

Author: felipesabino

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Added contributing guidelines - #30 - [@askmon](https://github.com/askmon)
 - Fixed @Field arguments handling - #42 - [@felipesabino](https://github.com/felipesabino)
 - Fixed @UnionType usage with abstract classes - #43 - [@felipesabino](https://github.com/felipesabino)
+- Fixed error that just one @Query was added to resulting schema - #44 - [@felipesabino](https://github.com/felipesabino)
 
 ### Breaking changes
 

src/specs/functional.spec.ts

@@ -272,6 +272,36 @@ describe('Functional', function () {
       });
 
     });
+
+    describe('Multiple Queries', function () {
+
+      @D.ObjectType()
+      class QueryAType {
+        @D.Field()
+        greetingA(): string { return `Hello, world`; }
+      }
+
+      @D.ObjectType()
+      class QueryBType {
+        @D.Field()
+        greetingB(): string { return `Hello, world`; }
+      }
+
+      @D.Schema()
+      class SchemaType {
+        @D.Query() queryA: QueryAType;
+        @D.Query() queryB: QueryBType;
+      }
+
+      it('resolves multiple queries with @Schema and @Query', async function () {
+        const schema = schemaFactory(SchemaType);
+        const result = await graphql.graphql(schema, `query { greetingA, greetingB } `);
+        assert(result.data.greetingA === 'Hello, world');
+        assert(result.data.greetingB === 'Hello, world');
+      });
+
+    });
+
   });
 
   describe('Mutation', function () {

src/type-factory/schema.type-factory.ts

@@ -39,16 +39,17 @@ function getEntryObject(
     throw new SchemaFactoryError(`Target should have @${type} field`, SchemaFactoryErrorType.NO_QUERY_FIELD);
   }
 
-  return metadatas.map(metadata => {
+  const fieldMap = metadatas.map(metadata => {
     const fieldTarget = Reflect.getMetadata('design:type', metadata.target, metadata.property) as Function;
     const fieldMetadatas = getMetadataBuilder().buildFieldMetadata(fieldTarget.prototype);
     return fieldMetadatas.reduce((fields, fieldMetadata) => {
       fields[fieldMetadata.name] = fieldTypeFactory(fieldTarget, fieldMetadata, undefined, metadata.isSubscription);
       return fields;
     }, {} as { [key: string]: any });
   })
-    .map(fields => objectTypeFactory(fields))
-    .find((value, index) => index === 0);
+  .reduce((map, fields) => ({ ...map, ...fields }), {});
+
+  return Object.keys(fieldMap).length > 0 ? objectTypeFactory(fieldMap) : undefined;
 
 }