From 6f0be96243f675382c165bab6c2affb2fc190934 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 14 Oct 2018 12:47:29 -0400 Subject: [PATCH] add more commands to suggestions & improve sorting --- lib/modules/console/suggestions.js | 65 ++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/lib/modules/console/suggestions.js b/lib/modules/console/suggestions.js index fc6a8715..bfe78195 100644 --- a/lib/modules/console/suggestions.js +++ b/lib/modules/console/suggestions.js @@ -1,9 +1,12 @@ let utils = require('../../utils/utils'); class Suggestions { - constructor(_embark, options) { + constructor(embark, options) { + this.events = embark.events; this.plugins = options.plugins; this.registerApi(); + this.listenToEvents(); + this.contracts = {} } registerApi() { @@ -14,16 +17,64 @@ class Suggestions { }); } + listenToEvents() { + this.events.on("deploy:contract:deployed", (contract) => { + this.contracts[contract.className] = contract + }) + } + getSuggestions(cmd) { - if (cmd === 'web3') { + cmd = cmd.toLowerCase() + + if (cmd === 'web3' || cmd === 'web3.') { return [ - {value: 'web3.eth', command_type: "web3 object", description: "ethereum"}, - {value: 'web3.net', command_type: "web3 object", description: "network"}, - {value: 'web3.shh', command_type: "web3 object", description: "whisper"} + {value: 'web3.eth', command_type: "web3 object", description: "module for interacting with the Ethereum network"}, + {value: 'web3.net', command_type: "web3 object", description: "module for interacting with network properties"}, + {value: 'web3.shh', command_type: "web3 object", description: "module for interacting with the whisper protocol"}, + {value: 'web3.bzz', command_type: "web3 object", description: "module for interacting with the swarm network"}, + {value: 'web3.eth.getAccounts()', command_type: "web3 object", description: "get list of accounts"} ] } - console.dir("printing suggestions for " + cmd); - return [{value: 'hello', command_type: "embark", description: "says hello back!"}, {value: 'SimpleStorage', command_type: "web3 object", description: ""}, {value: 'web3.eth.getAccounts', command_type: "web3", description: "get list of accounts"}] + + let suggestions = [] + for (let contractName in this.contracts) { + let contract = this.contracts[contractName] + if (contract.className.toLowerCase().indexOf(cmd) >= 0 || contract.deployedAddress.indexOf(cmd) >= 0 || cmd.indexOf('contract') >= 0) { + suggestions.push({value: contract.className, command_type: "web3 object", description: "contract deployed at " + contract.deployedAddress}); + } + + if ('profile'.indexOf(cmd) >= 0) { + suggestions.push({value: "profile " + contract.className, command_type: "embark command", description: "profile " + contract.className + " contract"}); + } + } + + // TODO: make this registered through an API instead + + if ('help'.indexOf(cmd) >= 0) { + suggestions.push({value: 'help', command_type: "embark command", description: "displays quick list of some of the available embark commands"}); + } + if ('versions'.indexOf(cmd) >= 0) { + suggestions.push({value: 'versions', command_type: "embark command", description: "display versions in use for libraries and tools like web3 and solc"}); + } + if ('ipfs'.indexOf(cmd) >= 0) { + suggestions.push({value: 'ipfs', command_type: "javascript object", description: "instantiated js-ipfs object configured to the current environment (available if ipfs is enabled)"}); + } + if ('swarm'.indexOf(cmd) >= 0) { + suggestions.push({value: 'swarm', command_type: "javascript object", description: "instantiated swarm-api object configured to the current environment (available if swarm is enabled)"}); + } + if (cmd == 'w' || cmd === 'we' || cmd === 'web') { + suggestions.push({value: 'web3', command_type: "javascript object", description: "instantiated web3.js object configured to the current environment"}); + } + if ('embarkjs'.indexOf(cmd) >= 0) { + suggestions.push({value: 'EmbarkJS', command_type: "javascript object", description: "EmbarkJS static functions for Storage, Messages, Names, etc."}); + } + + // sort first the ones that match the command at the beginning of the string, then prefer smaller commands first + return suggestions.sort((x,y) => { + let diff = x.value.indexOf(cmd) - y.value.indexOf(cmd) + if (diff !== 0) return diff; + return x.value.length - y.value.length; + }); } }