embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

quality improvements for the cmd

This commit is contained in:
Jonathan Rainville 2018-10-17 13:18:33 -04:00 committed by Pascal Precht
parent 2205a26236
commit a394504e23
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/cmd.js
View File

@ -330,33 +330,33 @@ class Cmd {
.option('--framework <framework>', 'UI framework to use. (default: react)')
.option('--contract-language <language>', 'Language used for the smart contract generation (default: solidity)')
.option('--overwrite', 'Overwrite existing files. (default: false)')
.action(function(contract, fields, options){
if(contract === undefined){
.description(__('Generates a contract and a function tester for you\nExample: ContractName field1:uint field2:address --contract-language solidity --framework react'))
.action(function(contract, fields, options) {
if (contract === undefined) {
console.log("contract name is required");
process.exit(0);
}
const fieldMapping = {};
if(fields.length > 0){
let fieldMapping = {};
if (fields.length > 0) {
const typeRegex = /^(u?int[0-9]{0,3}(\[\])?|string|bool|address|bytes[0-9]{0,3})(\[\])?$/;
const varRegex = /^[a-zA-Z][a-zA-Z0-9_]*$/;
fields.forEach(curr => {
fieldMapping = fields.reduce((acc, curr) => {
const c = curr.split(':');
if(!varRegex.test(c[0])){
if (!varRegex.test(c[0])) {
console.log("Invalid variable name: " + c[0]);
process.exit(0);
process.exit(1);
}
if(!typeRegex.test(c[1])){
if (!typeRegex.test(c[1])) {
console.log("Invalid datatype: " + c[1] + " - The dApp generator might not support this type at the moment");
process.exit(0);
process.exit(1);
}
fieldMapping[c[0]] = c[1];
});
acc[c[0]] = c[1];
return acc;
}, {});
}
checkDeps();

7
cmd/cmd_controller.js
View File

@ -494,8 +494,13 @@ class EmbarkController {
callback();
});
}
], function (_err) {
], function(_err) {
engine.logger.info(__("finished generating the UI").underline);
engine.logger.info(__("You can add the UI to your Dapp easily by adding the following in embark.json:"));
engine.logger.info((` "js/${options.contract}.js": [\n` +
` "${options.contract}.js"\n` +
` ],\n` +
` "index.html": "app/${options.contract}.html"`).cyan);
process.exit();
});
}