Export Typedefs, Cleanup Types

src/index.ts

@@ -1,4 +1,4 @@
 export { server } from "./server"
-export { schema } from "./schema"
+export { typeDefs, schema } from "./schema"
 export { dataSources } from "./sources"
 export { playground } from "./playground"

src/schema.ts

@@ -9,7 +9,7 @@ import {
   URLScalar,
   URL
 } from "@saeris/graphql-scalars";
-import { types, enums, inputs, interfaces, unions } from "./types";
+import { types } from "./types";
 import { resolvers } from "./resolvers";
 
 // TODO: Re-Write Schema Definition to remove makeExecutableSchema entirely
@@ -36,19 +36,17 @@ const directives = Object.values(schemaDirectives).map(directive =>
   directive.declaration()
 );
 
+export const typeDefs = [
+  ...types,
+  DateTimeScalar,
+  EmailAddressScalar,
+  URLScalar,
+  cacheControlTypes,
+  ...directives
+];
+
 export const schema = makeExecutableSchema({
-  typeDefs: [
-    ...Object.values(types),
-    ...Object.values(enums),
-    ...Object.values(inputs),
-    ...Object.values(interfaces),
-    ...Object.values(unions),
-    DateTimeScalar,
-    EmailAddressScalar,
-    URLScalar,
-    cacheControlTypes,
-    ...directives
-  ],
+  typeDefs,
   schemaDirectives,
   resolvers: {
     DateTime,

src/types/cast.gql

@@ -1,5 +1,3 @@
-# import * from "./photo.gql"
-
 type Cast {
   id: ID!
   castId: ID!

src/types/company.gql

@@ -1,5 +1,3 @@
-# import * from "./logo.gql"
-
 type Company {
   id: ID!
   name: String!

src/types/crew.gql

@@ -1,5 +1,3 @@
-# import * from "./photo.gql"
-
 type Crew {
   id: ID!
   creditId: ID!

src/types/episode.gql

@@ -1,10 +1,3 @@
-# import * from "./still.gql"
-# import * from "./tv.gql"
-# import * from "./season.gql"
-# import * from "./cast.gql"
-# import * from "./crew.gql"
-# import * from "./guest.gql"
-
 type Episode {
   id: ID!
   name: String!

src/types/guest.gql

@@ -1,5 +1,3 @@
-# import * from "./photo.gql"
-
 type Guest {
   id: ID!
   castID: ID!

src/types/index.ts

@@ -1,3 +1,7 @@
+import { enums } from "./enums"
+import { inputs } from "./inputs"
+import { interfaces } from "./interfaces"
+import { unions } from "./unions"
 import { default as Backdrop } from "./backdrop.gql"
 import { default as Cast } from "./cast.gql"
 import { default as Company } from "./company.gql"
@@ -20,12 +24,11 @@ import { default as Still } from "./still.gql"
 import { default as TV } from "./tv.gql"
 import { default as Video } from "./video.gql"
 
-export { enums } from "./enums"
-export { inputs } from "./inputs"
-export { interfaces } from "./interfaces"
-export { unions } from "./unions"
-
 export const types = [
+	...enums,
+	...inputs,
+	...interfaces,
+	...unions,
 	Backdrop,
 	Cast,
 	Company,

src/types/inputs/videoFilter.gql

@@ -1,5 +1,3 @@
-# import * from "../enums/videoType.gql"
-
 input VideoFilter {
   site: [String!]
   type: [VideoType!]

src/types/movie.gql

@@ -1,12 +1,3 @@
-# import * from "./enums/releaseStatus.gql"
-# import * from "./poster.gql"
-# import * from "./backdrop.gql"
-# import * from "./genre.gql"
-# import * from "./language.gql"
-# import * from "./cast.gql"
-# import * from "./crew.gql"
-# import * from "./video.gql"
-
 type Movie @cacheControl(maxAge: 60) {
   id: ID!
   title: String! @cacheControl(maxAge: 3600)

src/types/person.gql

@@ -1,6 +1,3 @@
-# import * from "./photo.gql"
-# import * from "./movie.gql"
-
 type Person {
   id: ID!
   name: String!

src/types/query.gql

@@ -1,8 +1,3 @@
-# import * from "./movie.gql"
-# import * from "./person.gql"
-# import * from "./tv.gql"
-# import * from "./unions/searchResult.gql"
-
 type Query {
   movie(id: ID!): Movie!
   person(id: ID!): Person!

src/types/schema.gql

@@ -1,5 +1,3 @@
-# import * from "./query.gql"
-
 schema {
   query: Query
 }

src/types/season.gql

@@ -1,7 +1,3 @@
-# import * from "./poster.gql"
-# import * from "./tv.gql"
-# import * from "./episode.gql"
-
 type Season {
   id: ID!
   name: String!

src/types/tv.gql

@@ -1,17 +1,3 @@
-# import * from "./enums/tvType.gql"
-# import * from "./enums/tvStatus.gql"
-# import * from "./genre.gql"
-# import * from "./person.gql"
-# import * from "./cast.gql"
-# import * from "./crew.gql"
-# import * from "./network.gql"
-# import * from "./company.gql"
-# import * from "./poster.gql"
-# import * from "./backdrop.gql"
-# import * from "./video.gql"
-# import * from "./season.gql"
-# import * from "./episode.gql"
-
 type TV {
   id: ID!
 

src/types/unions/media.gql

@@ -1,4 +1 @@
-# import * from "../movie.gql"
-# import * from "../tv.gql"
-
 union Media = Movie | TV

src/types/unions/searchResult.gql

@@ -1,5 +1 @@
-# import * from "../movie.gql"
-# import * from "../person.gql"
-# import * from "../tv.gql"
-
 union SearchResult = Movie | Person | TV

src/types/video.gql

@@ -1,5 +1,3 @@
-# import * from "./enums/videoType.gql"
-
 type Video {
   id: ID!
   key: String!