Fix and Export Extension and Playground Types (#1360)

* export playground types * make playground configuration recursively partial
apollographql · Jul 16, 2018 · fa6c973 · fa6c973
1 parent 8a58892
commit fa6c973
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 15 deletions.
diff --git a/packages/apollo-server-cloudflare/src/index.ts b/packages/apollo-server-cloudflare/src/index.ts
@@ -1,2 +1,23 @@
+export * from 'graphql-tools';
+
 export { ApolloServer } from './ApolloServer';
-export { gql } from 'apollo-server-core';
+
+export {
+ GraphQLUpload,
+ GraphQLOptions,
+ GraphQLExtension,
+ Config,
+ gql,
+ // Errors
+ ApolloError,
+ toApolloError,
+ SyntaxError,
+ ValidationError,
+ AuthenticationError,
+ ForbiddenError,
+ UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
+} from 'apollo-server-core';
diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts
@@ -22,7 +22,12 @@ export {
 
 export { convertNodeHttpToRequest } from './nodeHttpToRequest';
 
-export { createPlaygroundOptions } from './playground';
+export {
+ createPlaygroundOptions,
+ PlaygroundConfig,
+ defaultPlaygroundOptions,
+ PlaygroundRenderPageOptions,
+} from './playground';
 
 // ApolloServer Base class
 export { ApolloServerBase } from './ApolloServer';

diff --git a/packages/apollo-server-core/src/playground.ts b/packages/apollo-server-core/src/playground.ts
@@ -11,7 +11,16 @@ export {
 // by the integration subclasses
 const playgroundVersion = '1.7.2';
 
-export type PlaygroundConfig = Partial<PlaygroundRenderPageOptions> | boolean;
+// https://stackoverflow.com/a/51365037
+type RecursivePartial<T> = {
+ [P in keyof T]?: T[P] extends (infer U)[]
+ ? RecursivePartial<U>[]
+ : T[P] extends object ? RecursivePartial<T[P]> : T[P]
+};
+
+export type PlaygroundConfig =
+ | RecursivePartial<PlaygroundRenderPageOptions>
+ | boolean;
 
 export const defaultPlaygroundOptions = {
  version: playgroundVersion,

diff --git a/packages/apollo-server-express/src/index.ts b/packages/apollo-server-express/src/index.ts
@@ -1,6 +1,8 @@
 export {
  GraphQLUpload,
  GraphQLOptions,
+ GraphQLExtension,
+ Config,
  gql,
  // Errors
  ApolloError,
@@ -10,6 +12,10 @@ export {
  AuthenticationError,
  ForbiddenError,
  UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';

diff --git a/packages/apollo-server-hapi/src/index.ts b/packages/apollo-server-hapi/src/index.ts
@@ -1,6 +1,8 @@
 export {
  GraphQLUpload,
  GraphQLOptions,
+ GraphQLExtension,
+ Config,
  gql,
  // Errors
  ApolloError,
@@ -10,6 +12,10 @@ export {
  AuthenticationError,
  ForbiddenError,
  UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';

diff --git a/packages/apollo-server-koa/src/index.ts b/packages/apollo-server-koa/src/index.ts
@@ -1,6 +1,8 @@
 export {
  GraphQLUpload,
  GraphQLOptions,
+ GraphQLExtension,
+ Config,
  gql,
  // Errors
  ApolloError,
@@ -10,6 +12,10 @@ export {
  AuthenticationError,
  ForbiddenError,
  UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';

diff --git a/packages/apollo-server-lambda/src/ApolloServer.ts b/packages/apollo-server-lambda/src/ApolloServer.ts
@@ -1,6 +1,5 @@
 import * as lambda from 'aws-lambda';
 import { ApolloServerBase } from 'apollo-server-core';
-export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core';
 import { GraphQLOptions, Config } from 'apollo-server-core';
 import {
  renderPlaygroundPage,

diff --git a/packages/apollo-server-lambda/src/index.ts b/packages/apollo-server-lambda/src/index.ts
@@ -1,6 +1,8 @@
 export {
  GraphQLUpload,
  GraphQLOptions,
+ GraphQLExtension,
+ Config,
  gql,
  // Errors
  ApolloError,
@@ -10,6 +12,10 @@ export {
  AuthenticationError,
  ForbiddenError,
  UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';

diff --git a/packages/apollo-server-micro/src/index.ts b/packages/apollo-server-micro/src/index.ts
@@ -1,6 +1,8 @@
 export {
  GraphQLUpload,
  GraphQLOptions,
+ GraphQLExtension,
+ Config,
  gql,
  // Errors
  ApolloError,
@@ -10,6 +12,10 @@ export {
  AuthenticationError,
  ForbiddenError,
  UserInputError,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';

diff --git a/packages/apollo-server/src/exports.ts b/packages/apollo-server/src/exports.ts
@@ -2,12 +2,23 @@ export * from 'graphql-tools';
 export * from 'graphql-subscriptions';
 
 export {
+ gql,
+ GraphQLUpload,
+ GraphQLOptions,
+ GraphQLExtension,
+ Config,
+ // Errors
  ApolloError,
  toApolloError,
  SyntaxError,
  ValidationError,
  AuthenticationError,
  ForbiddenError,
  UserInputError,
- gql,
+ // playground
+ defaultPlaygroundOptions,
+ PlaygroundConfig,
+ PlaygroundRenderPageOptions,
 } from 'apollo-server-core';
+
+export { CorsOptions } from 'apollo-server-express';
diff --git a/packages/apollo-server/src/index.ts b/packages/apollo-server/src/index.ts
@@ -11,16 +11,6 @@ import {
 } from 'apollo-server-express';
 import { Config } from 'apollo-server-core';
 
-export {
- GraphQLUpload,
- GraphQLOptions,
- GraphQLExtension,
- gql,
- Config,
-} from 'apollo-server-core';
-
-export { CorsOptions } from 'apollo-server-express';
-
 export * from './exports';
 
 export interface ServerInfo {