fix: fix cannot catch exception promblem

Author: wenli.lw

bin/index.js

@@ -5,7 +5,7 @@ const parseArgs = require('../libs/parse-args')
 const { join } = require('path')
 const pkg = require(join(__dirname, '../package.json'))
 const vm = require('./vm')
-require('colors')
+const chalk = require('chalk')
 
 let silent = false
 
@@ -17,28 +17,21 @@ const start = function () {
  }
 
  if (argv.version) {
- console.log(`\n${pkg.name} version: ${pkg.version}\n`.yellow)
- return
+ return Promise.resolve(chalk.yellow(`\n${pkg.name} version: ${pkg.version}\n`))
  }
 
  silent = argv.silent
- return vm().then(function (ret) {
+ return vm()
+ .then(function (ret) {
  log(ret)
  return require('../index.js')(argv, ret)
  })
 }
 
-const ret = start()
-if (ret != null) {
- if (typeof ret === 'object' && ret.then) {
- ret.then(function (ret) {
- if (!silent) {
- console.log(ret)
- }
- }).catch(function (e) {
- console.error(e.red)
- })
- } else {
+start().then(function (ret) {
+ if (!silent) {
  console.log(ret)
  }
-}
+}).catch(function (e) {
+ console.error(chalk.red(e.message), '\n', e)
+})

index.js

@@ -1,6 +1,5 @@
 let fire = require('./libs/index')
 
-global.Promise = require('bluebird') // replace default promise for debug
 const wrap = require('./libs/wrap')
 const log = require('./libs/util/log')
 const parseArgs = require('./libs/parse-args')

libs/util/log.js

@@ -1,5 +1,11 @@
 const callerId = require('caller-id')
+const chalk = require('chalk')
 module.exports = process.env.DEBUG === 'log' ? function (...args) {
  let data = callerId.getData()
- console.log(`${data.filePath} > ${data.functionName}:${data.lineNumber}`.blue, '\n', ...args, '\n----------------'.blue)
+ console.log(
+ chalk.blue(`${data.filePath} > ${data.functionName}:${data.lineNumber}`),
+ '\n',
+ ...args,
+ chalk.blue('\n----------------')
+ )
 } : function () {}

package.json

@@ -1,6 +1,6 @@
 {
  "name": "node-fire",
- "version": "0.2.6",
+ "version": "0.2.7",
  "description": "Run a js object or a function by command line directly.",
  "bin": {
  "fire": "./bin/index.js"
@@ -10,11 +10,14 @@
  "test": "standard --fix && ava",
  "start": "node bin/index"
  },
+ "standard": {
+ "ignore": ["test/fixtures/error.js"]
+ },
  "dependencies": {
  "bluebird": "^3.4.7",
  "caller-id": "^0.1.0",
+ "chalk": "^1.1.3",
  "co": "^4.6.0",
- "colors": "^1.1.2",
  "debug": "^2.6.1",
  "rc": "^1.1.7",
  "resolve": "^1.3.2",

test/fixtures/error.js

@@ -0,0 +1 @@
+should throw error

test/test.js

@@ -14,3 +14,8 @@ test('exec2', async (t) => {
  t.is(await exec('./examples/test2.js hello name=world !'), 'hello world!')
  t.pass()
 })
+
+test('should catch error', async t => {
+ const ret = await exec('./test/fixtures/error.js')
+ t.is(ret, '')
+})