fix: fixed config loading

package.json

@@ -14,7 +14,7 @@
  "@dxcli/engine": "^0.1.12",
  "@dxcli/loader": "^0.2.8",
  "@dxcli/semantic-release": "^0.3.3",
- "@dxcli/tslint": "^0.0.23",
+ "@dxcli/tslint": "^0.0.24",
  "@dxcli/version": "^0.1.6",
  "chai": "^4.1.2",
  "cli-ux": "^3.2.2",

src/command.ts

@@ -2,8 +2,11 @@ import {IConfig} from '@dxcli/config'
 import run from '@dxcli/engine'
 import * as _ from 'lodash'
 
+import loadConfig from './load_config'
+
 export default (args: string[] | string | undefined) => ({
  async run(ctx: {config: IConfig, expectation: string}) {
+ if (!ctx.config) ctx.config = await loadConfig().run({} as any)
  args = _.castArray(args)
  ctx.expectation = ctx.expectation || `runs ${args.join(' ')}`
  await run(args, ctx.config)

src/hook.ts

@@ -1,6 +1,8 @@
 import {IConfig} from '@dxcli/config'
 import {Engine} from '@dxcli/engine'
 
+import loadConfig from './load_config'
+
 /**
  * tests a dxcli hook
  *
@@ -14,6 +16,7 @@ import {Engine} from '@dxcli/engine'
  */
 export default (event?: string, hookOpts: object = {}) => ({
  async run(ctx: {config: IConfig, expectation: string}) {
+ if (!ctx.config) ctx.config = await loadConfig().run({} as any)
  ctx.expectation = ctx.expectation || `runs ${event} hook`
  const engine = new Engine()
  await engine.load(ctx.config.root)

src/index.ts

@@ -7,6 +7,8 @@ import exit from './exit'
 import hook from './hook'
 import loadConfig from './load_config'
 
+loadConfig.root = module.parent!.filename
+
 export const test = fancy
 .register('loadConfig', loadConfig)
 .register('command', command)

src/load_config.ts

@@ -1,14 +1,18 @@
-import * as path from 'path'
-
 import {IConfig} from '@dxcli/config'
 import {load} from '@dxcli/loader'
 
+export type WithRoot<T> = T & {root: string}
+
 /**
  * loads CLI plugin/multi config
  */
-export default (opts: {root?: string} = {}) => ({
- async run(ctx: {config: IConfig}) {
- const {config} = await load({root: opts.root || path.dirname(module.parent!.filename)})
- ctx.config = config
+export const _loadConfig = (opts: {root?: string} = {}) => {
+ return {
+ async run(ctx: {config: IConfig}) {
+ const {config} = await load({root: opts.root || loadConfig.root})
+ return ctx.config = config
+ }
  }
-})
+}
+const loadConfig = _loadConfig as WithRoot<typeof _loadConfig>
+export default loadConfig

yarn.lock

@@ -203,9 +203,9 @@
  execa "^0.9.0"
  semantic-release "^12.2.5"
 
-"@dxcli/tslint@^0.0.23":
- version "0.0.23"
- resolved "https://registry.yarnpkg.com/@dxcli/tslint/-/tslint-0.0.23.tgz#c9877ec9927bb958c1a71edac3263007ce64b22d"
+"@dxcli/tslint@^0.0.24":
+ version "0.0.24"
+ resolved "https://registry.yarnpkg.com/@dxcli/tslint/-/tslint-0.0.24.tgz#32c19a574828d643bcb446cbfc0b2dbbbf1c1da0"
  dependencies:
  tslint "^5.9.1"
  tslint-xo "^0.5.0"