Extract TypeScript utility types into apollo-env and add DeepPartial

apollographql · Nov 9, 2018 · 384172b · 384172b
1 parent 09c7b94
commit 384172b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/apollo-env/src/index.d.ts b/packages/apollo-env/src/index.d.ts
@@ -1,5 +1,6 @@
 import "./polyfills";
 import "./global-fetch";
+import "./typescript-utility-types";
 
 export * from "./fetch";
 export * from "./url";
diff --git a/packages/apollo-env/src/typescript-utility-types.d.ts b/packages/apollo-env/src/typescript-utility-types.d.ts
@@ -0,0 +1,2 @@
+type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]> };
diff --git a/packages/apollo-language-server/src/config.ts b/packages/apollo-language-server/src/config.ts
@@ -13,9 +13,6 @@ import {
   ServiceIDAndTag
 } from "./engine";
 
-// TypeScript util requiring an optional field
-export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
-
 export interface EngineStatsWindow {
   to: number;
   from: number;

diff --git a/packages/apollo/src/Command.ts b/packages/apollo/src/Command.ts
@@ -67,7 +67,7 @@ export abstract class ProjectCommand extends Command {
   public tasks: ListrTask[] = [];
 
   protected type: "service" | "client" = "service";
-  protected configMap?: (flags: any) => any;
+  protected configMap?: (flags: any) => DeepPartial<ApolloConfig>;
   private ctx!: ProjectContext;
 
   async init() {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
		type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]> };