diff options
author | F. Eugene Aumson <gene@aumson.org> | 2018-07-02 04:05:15 +0800 |
---|---|---|
committer | F. Eugene Aumson <gene@aumson.org> | 2018-07-09 22:45:21 +0800 |
commit | a0e3676e3aef4692732375c02c274223b3349f63 (patch) | |
tree | 73060cfac9340899492c4d586d2722c9e01781f4 /packages/abi-gen | |
parent | 2276793629292c6ff38ae107c8eac7a7ba2c4b81 (diff) | |
download | dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar.gz dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar.bz2 dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar.lz dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar.xz dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.tar.zst dexon-sol-tools-a0e3676e3aef4692732375c02c274223b3349f63.zip |
move abi-gen funcs from index to utils for testing
preparing for unit testing. purely refactoring (no functionality
changed).
Diffstat (limited to 'packages/abi-gen')
-rw-r--r-- | packages/abi-gen/src/index.ts | 41 | ||||
-rw-r--r-- | packages/abi-gen/src/utils.ts | 24 |
2 files changed, 31 insertions, 34 deletions
diff --git a/packages/abi-gen/src/index.ts b/packages/abi-gen/src/index.ts index f38a162aa..753bb2cce 100644 --- a/packages/abi-gen/src/index.ts +++ b/packages/abi-gen/src/index.ts @@ -3,15 +3,12 @@ import { abiUtils, logUtils } from '@0xproject/utils'; import chalk from 'chalk'; import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from 'ethereum-types'; -import * as fs from 'fs'; import { sync as globSync } from 'glob'; import * as Handlebars from 'handlebars'; import * as _ from 'lodash'; import * as mkdirp from 'mkdirp'; import * as yargs from 'yargs'; -import toSnakeCase = require('to-snake-case'); - import { ContextData, ContractsBackend, ParamKind } from './types'; import { utils } from './utils'; @@ -70,34 +67,6 @@ function registerPartials(partialsGlob: string): void { } } -function makeOutputFilePath(name: string): string { - let fileName = toSnakeCase(name); - // HACK: Snake case doesn't make a lot of sense for abbreviated names but we can't reliably detect abbreviations - // so we special-case the abbreviations we use. - fileName = fileName.replace('z_r_x', 'zrx').replace('e_r_c', 'erc'); - return `${args.output}/${fileName}.ts`; -} - -function writeOutputFile(name: string, renderedTsCode: string): void { - const filePath = makeOutputFilePath(name); - fs.writeFileSync(filePath, renderedTsCode); - logUtils.log(`Created: ${chalk.bold(filePath)}`); -} - -function isOutputFileUpToDate(abiFile: string, outFile: string): boolean { - const abiFileModTimeMs = fs.statSync(abiFile).mtimeMs; - try { - const outFileModTimeMs = fs.statSync(makeOutputFilePath(outFile)).mtimeMs; - return outFileModTimeMs > abiFileModTimeMs; - } catch (err) { - if (err.code === 'ENOENT') { - return false; - } else { - throw err; - } - } -} - Handlebars.registerHelper('parameterType', utils.solTypeToTsType.bind(utils, ParamKind.Input, args.backend)); Handlebars.registerHelper('returnType', utils.solTypeToTsType.bind(utils, ParamKind.Output, args.backend)); if (args.partials) { @@ -136,8 +105,11 @@ for (const abiFileName of abiFileNames) { process.exit(1); } - if (isOutputFileUpToDate(abiFileName, namedContent.name)) { - logUtils.log(`Already up to date: ${chalk.bold(makeOutputFilePath(namedContent.name))}`); + const outFileName = utils.makeOutputFileName(namedContent.name); + const outFilePath = `${args.output}/${outFileName}.ts`; + + if (utils.isOutputFileUpToDate(abiFileName, outFilePath)) { + logUtils.log(`Aready up to date: ${chalk.bold(outFilePath)}`); continue; } @@ -175,5 +147,6 @@ for (const abiFileName of abiFileNames) { events: eventAbis, }; const renderedTsCode = template(contextData); - writeOutputFile(namedContent.name, renderedTsCode); + utils.writeOutputFile(outFilePath, renderedTsCode); + logUtils.log(`Created: ${chalk.bold(outFilePath)}`); } diff --git a/packages/abi-gen/src/utils.ts b/packages/abi-gen/src/utils.ts index 66390174c..56b996ce3 100644 --- a/packages/abi-gen/src/utils.ts +++ b/packages/abi-gen/src/utils.ts @@ -2,6 +2,7 @@ import { AbiType, ConstructorAbi, DataItem } from 'ethereum-types'; import * as fs from 'fs'; import * as _ from 'lodash'; import * as path from 'path'; +import toSnakeCase = require('to-snake-case'); import { ContractsBackend, ParamKind } from './types'; @@ -92,4 +93,27 @@ export const utils = { inputs: [], }; }, + makeOutputFileName(name: string): string { + let fileName = toSnakeCase(name); + // HACK: Snake case doesn't make a lot of sense for abbreviated names but we can't reliably detect abbreviations + // so we special-case the abbreviations we use. + fileName = fileName.replace('z_r_x', 'zrx').replace('e_r_c', 'erc'); + return fileName; + }, + writeOutputFile(filePath: string, renderedTsCode: string): void { + fs.writeFileSync(filePath, renderedTsCode); + }, + isOutputFileUpToDate(abiFile: string, outputFile: string): boolean { + const abiFileModTimeMs = fs.statSync(abiFile).mtimeMs; + try { + const outFileModTimeMs = fs.statSync(outputFile).mtimeMs; + return outFileModTimeMs > abiFileModTimeMs; + } catch (err) { + if (err.code === 'ENOENT') { + return false; + } else { + throw err; + } + } + }, }; |