CR fixes for union type

indigotech · Oct 25, 2017 · eac7b48 · eac7b48
1 parent 2b50893
commit eac7b48
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/src/decorator.ts b/src/decorator.ts
@@ -8,6 +8,9 @@ import { OrderByTypeFactory } from './order-by.type-factory';
 import { PageInfo } from './page-info.type';
 import { PaginationResponse } from './pagination.type';
 
+export * from './decorator/';
+export * from './metadata/options';
+
 export const GQ_QUERY_KEY = 'gq_query';
 export const GQ_MUTATION_KEY = 'gq_mutation';
 export const GQ_SUBSCRIPTION_KEY = 'gq_subscription';
@@ -17,8 +20,6 @@ export const GQ_OBJECT_METADATA_KEY = 'gq_object_type';
 export const GQ_ENUM_METADATA_KEY = 'gq_enum_type';
 export const GQ_DESCRIPTION_KEY = 'gq_description';
 
-
-
 export interface TypeMetadata {
     name?: string;
     description?: string;

diff --git a/src/decorator/union-type.decorator.ts b/src/decorator/union-type.decorator.ts
@@ -1,11 +1,11 @@
 import { MetadataStorage } from '../metadata-storage';
-import { UnionOpton } from '../metadata';
+import { UnionOption } from '../metadata';
 
 /**
  * Union Type. ref: http://graphql.org/learn/schema/#union-types
  * @param option Options for a Union Type
  */
-export function UnionType<T>(option: UnionOpton<T>) {
+export function UnionType<T>(option: UnionOption<T>) {
   return function (target: any) {
       MetadataStorage.addUnionMetadata({
           name: target.name,

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,4 @@
 export * from './decorator';
-export * from './decorator/';
-export * from './metadata/options';
 export { schemaFactory } from './schema_factory';
 export * from './order-by-item';
 export * from './pagination.type';
diff --git a/src/metadata/options/union.option.ts b/src/metadata/options/union.option.ts
@@ -1,7 +1,7 @@
 /**
  * Arguments for a Union type on graphql schema
  */
-export interface UnionOpton<T> {
+export interface UnionOption<T> {
   /**
    * (Optional) Description
    */

diff --git a/src/schema_factory.spec.ts b/src/schema_factory.spec.ts
@@ -1,7 +1,6 @@
 import 'reflect-metadata';
 
 import * as D from './decorator';
-import * as DD from './decorator/';
 import * as graphql from 'graphql';
 
 import { SchemaFactoryError, SchemaFactoryErrorType, schemaFactory } from './schema_factory';
@@ -366,7 +365,7 @@ describe('schemaFactory', function() {
           class ObjB { @D.Field() fieldB: string; }
 
           type MyType = ObjA | ObjB;
-          @DD.UnionType<MyType>({
+          @D.UnionType<MyType>({
             types: [ObjA, ObjB],
             resolver: (obj: any): string | null => {
               if (obj.fieldA) { return ObjA.name; }

diff --git a/src/type-factory/union.type-factory.ts b/src/type-factory/union.type-factory.ts
@@ -3,7 +3,7 @@ import { MetadataStorage } from '../metadata-storage';
 import { UnionTypeMetadata } from '../metadata';
 import { objectTypeFactory } from '../object_type_factory';
 
-export function unionTypeFactory(name: string, isInput: boolean): graphql.GraphQLUnionType {
+export function unionTypeFactory(name: string, isInput: boolean): graphql.GraphQLUnionType | undefined {
   return MetadataStorage.getUnionMetadata()
     .filter(union => union.name === name)
     .map(union => {
@@ -16,5 +16,5 @@ export function unionTypeFactory(name: string, isInput: boolean): graphql.GraphQ
           .filter(_ => _), //filter null values
       });
     })
-    .find((_, index) => index === 0) || null;
+    .find((_, index) => index === 0);
 }