refactor file structure

Author: tintinweb

bin/main.js

@@ -11,7 +11,7 @@ const os = require('os');
 const path = require('path');
 
 const { InteractiveSolidityShell, SolidityStatement } = require('../src/handler');
-const { convert, multilineInput } = require('../src/utils');
+const { convert, multilineInput } = require('../src/cli/utils');
 
 const CONFIG_HOME = path.join(os.homedir(), '.solidity-shell');
 const CONFIG_FILE = '.config';

package.json

@@ -7,7 +7,7 @@
     "solidity-shell": "bin/main.js"
   },
   "scripts": {
-    "updateCompilerList": "node scripts/UpdateCompilerList.js > src/solcVersions.js"
+    "updateCompilerList": "node scripts/UpdateCompilerList.js > src/compiler/solcVersions.js"
   },
   "author": {
     "name": "tintinweb",

scripts/updateCompilerList.js

@@ -4,7 +4,7 @@
  * @author github.com/tintinweb
  * @license MIT
  * */
-const { getSolcJsCompilerList } = require('../src/remoteCompiler');
+const { getSolcJsCompilerList } = require('../src/compiler/remoteCompiler');
 
 
 getSolcJsCompilerList({nightly:false}).then(compilers => {

src/cli/utils.js

@@ -0,0 +1,40 @@
+'use strict'
+/**
+ * @author github.com/tintinweb
+ * @license MIT
+ * */
+
+function convert(str){
+    switch(str){
+        case '': return undefined; 
+        case 'true': return true;
+        case 'false': return false;
+    }
+    try {
+        let num = parseInt(str);
+        if(!isNaN(num)) return num;
+    } catch {}
+
+    return str;
+}
+
+function multilineInput(command){
+    while (true) {
+
+        let numBrOpen = command.split('{').length - 1;
+        let numBrClose = command.split('}').length - 1;
+
+        if (numBrOpen === numBrClose) {
+            break;
+        }
+
+        const rl = require('readline-sync');
+        command += '\n' + rl.question("... ").trim()
+    }
+    return command;
+}
+
+module.exports = {
+    convert,
+    multilineInput,
+}

src/remoteCompiler.js src/compiler/remoteCompiler.jssrc/remoteCompiler.js renamed to src/compiler/remoteCompiler.js

@@ -6,6 +6,7 @@
 
 //autogenerated with # npm run updateCompilerList
 module.exports.solcVersions = [
+    "v0.8.11+commit.d7f03943",
     "v0.8.10+commit.fc410830",
     "v0.8.9+commit.e5eed63a",
     "v0.8.8+commit.dddeac2f",

src/solcVersions.js src/compiler/solcVersions.jssrc/solcVersions.js renamed to src/compiler/solcVersions.js

@@ -0,0 +1,36 @@
+'use strict'
+/**
+ * @author github.com/tintinweb
+ * @license MIT
+ * */
+
+const fs = require('fs');
+
+function readFileCallback(sourcePath, options) {
+    options = options || {};
+    if(sourcePath.startsWith("https://")){
+        if(options.allowHttp){
+            
+        }
+    }
+    else {
+        const prefixes = [options.basePath ? options.basePath : ""].concat(
+            options.includePath ? options.includePath : []
+        );
+        for (const prefix of prefixes) {
+            const prefixedSourcePath = (prefix ? prefix + '/' : "") + sourcePath;
+            if (fs.existsSync(prefixedSourcePath)) {
+                try {
+                    return { 'contents': fs.readFileSync(prefixedSourcePath).toString('utf8') }
+                } catch (e) {
+                    return { error: 'Error reading ' + prefixedSourcePath + ': ' + e };
+                }
+            }
+        }
+    }
+    return { error: 'File not found inside the base path or any of the include paths.' }
+}
+
+module.exports = {
+    readFileCallback
+}

src/compiler/utils.js

@@ -6,8 +6,8 @@
 /** IMPORT */
 const Web3 = require('web3')
 const solc = require('solc')
-const { getRemoteCompiler } = require('./remoteCompiler.js')
-const {readFileCallback} = require('./utils.js')
+const { getRemoteCompiler } = require('./compiler/remoteCompiler.js')
+const {readFileCallback} = require('./compiler/utils.js')
 const path = require('path');
 
 /** CONST */
@@ -278,7 +278,7 @@ contract ${this.settings.templateContractName} {
                 input.settings.outputSelection['*']['*'] = ['abi', 'evm.bytecode']
 
                 function readFileCallbackLambda(sourcePath) {
-                    return readFileCallback(sourcePath, {basePath: process.cwd(), includePath: [path.join(process.cwd(),"./node_modules/")]});
+                    return readFileCallback(sourcePath, {basePath: process.cwd(), includePath: [path.join(process.cwd(),"node_modules")]});
                 }
 
                 const callbacks = { 'import': readFileCallbackLambda };