From 7c0c72a776a1302ed1b79ffdc4a8ce4850549283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoffer=20=C3=85str=C3=B6m?= Date: Wed, 8 Nov 2017 07:42:14 +0100 Subject: [PATCH] refactor and add `-c` alias for all commands --- src/cdp/http-server.js | 4 ++-- src/cdp/options.js | 1 + src/cdp/{instrument.js => transform.js} | 6 +++--- src/node/options.js | 1 + src/protractor/options.js | 1 + src/puppeteer/options.js | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) rename src/cdp/{instrument.js => transform.js} (86%) diff --git a/src/cdp/http-server.js b/src/cdp/http-server.js index a2bfcff3..0b285b2c 100644 --- a/src/cdp/http-server.js +++ b/src/cdp/http-server.js @@ -2,12 +2,12 @@ const path = require('path'); const Koa = require('koa'); const serve = require('koa-static'); const favicon = require('koa-favicon'); -const instrument = require('./instrument'); +const transform = require('./transform'); module.exports = function createHttpServer(files, exclude, coverage, coverageExclude, httpOpts) { const app = new Koa(); app.use(favicon(path.resolve(__dirname, '../../aw.png'))); - app.use(instrument(files, exclude, coverage, coverageExclude)); + app.use(transform(files, exclude, coverage, coverageExclude)); app.use(...httpOpts.root.map(root => serve(path.resolve(process.cwd(), root)))); return app.listen(httpOpts.port); }; diff --git a/src/cdp/options.js b/src/cdp/options.js index 4c8d223c..e3010721 100644 --- a/src/cdp/options.js +++ b/src/cdp/options.js @@ -3,6 +3,7 @@ module.exports = { description: 'Path to config file', type: 'string', default: 'aw.config.js', + alias: 'c', }, url: { description: 'Url to html file', diff --git a/src/cdp/instrument.js b/src/cdp/transform.js similarity index 86% rename from src/cdp/instrument.js rename to src/cdp/transform.js index 0ef96b33..76f56e1e 100644 --- a/src/cdp/instrument.js +++ b/src/cdp/transform.js @@ -25,11 +25,11 @@ function transformFile(filePath, coverage) { }); }; } -function transform(filePath, coverage) { +function transformify(filePath, coverage) { return new Promise(transformFile(filePath, coverage)); } -module.exports = function instrument(files, exclude, coverage, coverageExclude) { +module.exports = function transform(files, exclude, coverage, coverageExclude) { const shouldInstrument = url => (coverage ? coverageExclude.shouldInstrument(url) : exclude.shouldInstrument(url)); @@ -41,7 +41,7 @@ module.exports = function instrument(files, exclude, coverage, coverageExclude) const url = request.url.substring(1); if (shouldInstrument(url)) { const filePath = path.relative(process.cwd(), url); - response.body = await transform(filePath, coverage); + response.body = await transformify(filePath, coverage); } }; }; diff --git a/src/node/options.js b/src/node/options.js index 1067c938..75fd1fc2 100644 --- a/src/node/options.js +++ b/src/node/options.js @@ -3,6 +3,7 @@ module.exports = { description: 'Path to config file', type: 'string', default: 'aw.config.js', + alias: 'c', }, glob: { description: 'Glob pattern', diff --git a/src/protractor/options.js b/src/protractor/options.js index 9b60c5b3..a0214cba 100644 --- a/src/protractor/options.js +++ b/src/protractor/options.js @@ -3,6 +3,7 @@ module.exports = { description: 'Path to config file', type: 'string', default: 'aw.config.js', + alias: 'c', }, glob: { description: 'Glob pattern', diff --git a/src/puppeteer/options.js b/src/puppeteer/options.js index ec413303..ddce5c96 100644 --- a/src/puppeteer/options.js +++ b/src/puppeteer/options.js @@ -3,6 +3,7 @@ module.exports = { description: 'Path to config file', type: 'string', default: 'aw.config.js', + alias: 'c', }, glob: { description: 'Glob pattern',