feat: added loadConfig

package.json

@@ -12,6 +12,7 @@
  "@dxcli/config": "^0.1.27",
  "@dxcli/dev": "^2.0.12",
  "@dxcli/engine": "^0.1.12",
+ "@dxcli/loader": "^0.2.8",
  "@dxcli/semantic-release": "^0.2.4",
  "@dxcli/tslint": "^0.0.23",
  "@dxcli/version": "^0.1.6",
@@ -38,6 +39,9 @@
  ],
  "license": "MIT",
  "main": "lib/index.js",
+ "peerDependencies": {
+ "@dxcli/loader": "^0.2.8"
+ },
  "repository": "dxcli/test",
  "scripts": {
  "commitmsg": "dxcli-commitlint",

src/command.ts

@@ -1,12 +1,11 @@
+import {IConfig} from '@dxcli/config'
 import run from '@dxcli/engine'
 import * as _ from 'lodash'
 
-import {Options} from '.'
-
-export default (args: string[] | string | undefined, opts: Options = {}) => ({
- async run(ctx: {expectation: string}) {
+export default (args: string[] | string | undefined) => ({
+ async run(ctx: {config: IConfig, expectation: string}) {
  args = _.castArray(args)
  ctx.expectation = ctx.expectation || `runs ${args.join(' ')}`
- await run(args, {root: opts.root || module.parent!.parent!.filename})
+ await run(args, ctx.config)
  }
 })

src/hook.ts

@@ -1,7 +1,6 @@
+import {IConfig} from '@dxcli/config'
 import {Engine} from '@dxcli/engine'
 
-import {Options} from './options'
-
 /**
  * tests a dxcli hook
  *
@@ -12,13 +11,12 @@ import {Options} from './options'
  *
  * @param event - hook to run
  * @param hookOpts - options to pass to hook. Config object will be passed automatically.
- * @param opts - test options
  */
-export default (event?: string, hookOpts: object = {}, opts: Options = {}) => ({
- async run(ctx: {expectation: string}) {
+export default (event?: string, hookOpts: object = {}) => ({
+ async run(ctx: {config: IConfig, expectation: string}) {
  ctx.expectation = ctx.expectation || `runs ${event} hook`
  const engine = new Engine()
- await engine.load(opts.root || module.parent!.parent!.filename)
+ await engine.load(ctx.config.root)
  await engine.runHook(event!, hookOpts || {})
  }
 })

src/index.ts

@@ -1,12 +1,14 @@
+// tslint:disable no-var-before-return
+import {IConfig} from '@dxcli/config'
 import {expect, fancy, FancyTypes, NockScope} from 'fancy-test'
 
 import command from './command'
 import exit from './exit'
 import hook from './hook'
-
-import {Options} from './options'
+import loadConfig from './load_config'
 
 export const test = fancy
+.register('loadConfig', loadConfig)
 .register('command', command)
 .register('exit', exit)
 .register('hook', hook)
@@ -18,5 +20,5 @@ export {
 
  FancyTypes,
  NockScope,
- Options,
+ IConfig,
 }

src/load_config.ts

@@ -0,0 +1,14 @@
+import * as path from 'path'
+
+import {IConfig} from '@dxcli/config'
+import {load} from '@dxcli/loader'
+
+/**
+ * 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
+ }
+})

test/command.test.ts

@@ -1,23 +1,26 @@
 import * as path from 'path'
 
-import fancy, {expect} from '../src'
+import {expect, test} from '../src'
 
 const root = path.join(__dirname, 'fixtures/multi')
 
 describe('command', () => {
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .command(['foo:bar'], {root})
  .do(output => expect(output.stdout).to.equal('hello world!\n'))
  .it()
 
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .command(['foo:bar', '--name=foo'], {root})
  .do(output => expect(output.stdout).to.equal('hello foo!\n'))
  .it()
 
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .command(['foo:bar', '--name=foo'], {root})
  .do(output => expect(output.stdout).to.equal('hello foo!\n'))

test/hook.test.ts

@@ -1,26 +1,30 @@
 import * as path from 'path'
 
-import fancy, {expect} from '../src'
+import {expect, test} from '../src'
+
+const root = path.join(__dirname, 'fixtures/multi')
 
 describe('hooks', () => {
  const stdout = `test/0.0.0 (${process.platform}-${process.arch}) node-${process.version}\n`
- const root = path.join(__dirname, 'fixtures/multi')
 
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .hook('init', {id: '-v'}, {root})
  .exit(0)
  .do(output => expect(output.stdout).to.equal(stdout))
  .it('catches -v')
 
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .hook('init', {id: '--version'}, {root})
  .exit(0)
  .do(output => expect(output.stdout).to.equal(stdout))
  .it('catches --version')
 
- fancy
+ test
+ .loadConfig({root})
  .stdout()
  .hook('init', {}, {root})
  .it()

yarn.lock

@@ -151,7 +151,7 @@
  cli-ux "^3.2.1"
  debug "^3.1.0"
 
-"@dxcli/loader@^0.2.5":
+"@dxcli/loader@^0.2.5", "@dxcli/loader@^0.2.8":
  version "0.2.8"
  resolved "https://registry.yarnpkg.com/@dxcli/loader/-/loader-0.2.8.tgz#a704e704d0682e82ab0ad2d1393cbe326986c922"
  dependencies: