fix: assume engine is always on config

oclif · Jan 30, 2018 · 8d02f30 · 8d02f30
1 parent b4afd87
commit 8d02f30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -140,7 +140,7 @@ export interface IConfig {
   /**
    * active @dxcli/engine
    */
-  engine?: IEngine
+  engine: IEngine
   /**
    * npm registry to use for installing plugins
    */
@@ -157,10 +157,6 @@ export interface IConfig {
   topics: ITopic[]
 }
 
-export interface ICLIConfig extends IConfig {
-  engine: IEngine
-}
-
 export interface TSConfig {
   compilerOptions: {
     rootDirs?: string[]
@@ -206,7 +202,7 @@ export class Config implements IConfig {
   debug: number = 0
   hooks: {[k: string]: string[]}
   hooksTS?: {[k: string]: string[]}
-  engine?: IEngine
+  engine: IEngine
   npmRegistry: string
   legacy = false
   topics: ITopic[]

diff --git a/src/engine.ts b/src/engine.ts
@@ -1,10 +1,10 @@
 import {ICachedCommand} from './command'
-import {ICLIConfig, IConfig} from './config'
+import {IConfig} from './config'
 import {IPlugin} from './plugin'
 import {ITopic} from './topic'
 
 export interface IEngine {
-  readonly config: ICLIConfig
+  readonly config: IConfig
   readonly plugins: IPlugin[]
 
   readonly topics: ITopic[]

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -1,5 +1,5 @@
 import {ICommand} from './command'
-import {ICLIConfig} from './config'
+import {IConfig} from './config'
 import {IPlugin} from './plugin'
 
 export interface Hooks {
@@ -15,4 +15,4 @@ export interface Hooks {
   }
 }
 
-export type IHook<T extends {}> = (options: T & {config: ICLIConfig}) => any
+export type IHook<T extends {}> = (options: T & {config: IConfig}) => any