diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-19 21:32:59 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-19 22:41:49 +0800 |
commit | 87d157b805465d76a8eb25cda84fb91dc064faec (patch) | |
tree | 445f4d4e0f4cf087c40025d7a2f3075a57f36f89 | |
parent | 56d48758d308f9450aaac2e986dd09efd8d479c0 (diff) | |
download | dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar.gz dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar.bz2 dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar.lz dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar.xz dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.tar.zst dexon-sol-tools-87d157b805465d76a8eb25cda84fb91dc064faec.zip |
Move logWithTime function to utils
-rw-r--r-- | packages/sol-compiler/src/compiler.ts | 15 | ||||
-rw-r--r-- | packages/sol-compiler/src/utils/utils.ts | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index 17a1ce563..986999254 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -10,7 +10,6 @@ import { URLResolver, } from '@0x/sol-resolver'; import { logUtils } from '@0x/utils'; -import chalk from 'chalk'; import * as chokidar from 'chokidar'; import { CompilerOptions, ContractArtifact, ContractVersionData, StandardOutput } from 'ethereum-types'; import * as fs from 'fs'; @@ -136,18 +135,18 @@ export class Compiler { } public async watchAsync(): Promise<void> { console.clear(); // tslint:disable-line:no-console - logWithTime('Starting compilation in watch mode...'); + utils.logWithTime('Starting compilation in watch mode...'); const watcher = chokidar.watch('^$', { ignored: /(^|[\/\\])\../ }); const onFileChangedAsync = async () => { watcher.unwatch('*'); // Stop watching try { await this.compileAsync(); - logWithTime('Found 0 errors. Watching for file changes.'); + utils.logWithTime('Found 0 errors. Watching for file changes.'); } catch (err) { if (err.typeName === 'CompilationError') { - logWithTime(`Found ${err.errorsCount} ${pluralize('error', err.errorsCount)}. Watching for file changes.`); + utils.logWithTime(`Found ${err.errorsCount} ${pluralize('error', err.errorsCount)}. Watching for file changes.`); } else { - logWithTime('Found errors. Watching for file changes.'); + utils.logWithTime('Found errors. Watching for file changes.'); } } @@ -157,7 +156,7 @@ export class Compiler { await onFileChangedAsync(); watcher.on('change', (changedFilePath: string) => { console.clear(); // tslint:disable-line:no-console - logWithTime('File change detected. Starting incremental compilation...'); + utils.logWithTime('File change detected. Starting incremental compilation...'); onFileChangedAsync(); }); } @@ -340,7 +339,3 @@ export class Compiler { logUtils.warn(`${contractName} artifact saved!`); } } - -function logWithTime(arg: string): void { - logUtils.log(`[${chalk.gray(new Date().toLocaleTimeString())}] ${arg}`); -} diff --git a/packages/sol-compiler/src/utils/utils.ts b/packages/sol-compiler/src/utils/utils.ts index 4f2de2caa..538efc61a 100644 --- a/packages/sol-compiler/src/utils/utils.ts +++ b/packages/sol-compiler/src/utils/utils.ts @@ -1,6 +1,12 @@ +import { logUtils } from '@0x/utils'; +import chalk from 'chalk'; + export const utils = { stringifyWithFormatting(obj: any): string { const stringifiedObj = JSON.stringify(obj, null, '\t'); return stringifiedObj; }, + logWithTime(arg: string): void { + logUtils.log(`[${chalk.gray(new Date().toLocaleTimeString())}] ${arg}`); + }, }; |