some more refactors and review comment adaptions.

Author: christianparpart

README.md

@@ -210,7 +210,7 @@ Since version 0.8.11, the solidity compiler natively supports the
 language server protocol. With solc-js, you can now use it as follows:
 
 ```javascript
-var solc = require('solc');
+const solc = require('solc');
 
 // Callback to be invoked when additional files have to be opened during
 // source code analysis stage.
@@ -223,16 +223,15 @@ function fileReadCallback(path)
             contents: 'library L { function f() internal returns (uint) { return 7; } }';
         };
     }
-    else
-        return { error: 'File not found' };
+    return { error: 'File not found' };
 }
 
 // Put solcjs into LSP mode.
 // Needs to be called only once before the actual LSP I/O calls.
-solc.lspStart(fileReadCallback);
+solc.lsp.start(fileReadCallback);
 
 // Send some LSP JSON-RPC message and optionally receive a reply.
-var lspInitializationMessage = {
+const lspInitializationMessage = {
     'jsonrpc': '2.0',
     'method': 'initialize',
     'params': {
@@ -251,14 +250,14 @@ var lspInitializationMessage = {
         }
     }
 };
-solc.lspSendReceive(JSON.stringify(lspInitializationMessage)));
-solc.lspSendReceive(JSON.stringify({'jsonrpc': '2.0', 'method': 'initialized'}));
+solc.lsp.sendReceive(JSON.stringify(lspInitializationMessage)));
+solc.lsp.sendReceive(JSON.stringify({'jsonrpc': '2.0', 'method': 'initialized'}));
 
 // Now, with the LSP server, being set up the following
 // can be called as often as needed.
 function lspRoundtrip(jsonRpcInputObject)
 {
-    return JSON.parse(solc.lspSendReceive(JSON.stringify(jsonRpcInputObject)));
+    return JSON.parse(solc.lsp.sendReceive(JSON.stringify(jsonRpcInputObject)));
 }
 ```
 

common/interfaces.ts

@@ -0,0 +1,9 @@
+export interface ReadCallbackReply {
+  error?: string;
+  contents?: string
+}
+
+export interface Callbacks {
+    import(path: string): ReadCallbackReply;
+}
+

wrapper.ts

@@ -3,18 +3,10 @@ import { https } from 'follow-redirects';
 import MemoryStream from 'memorystream';
 import assert from 'assert';
 import * as semver from 'semver';
+import { Callbacks } from './common/interfaces';
 
 const Module = module.constructor as any;
 
-interface ReadCallbackReply {
-  error?: string;
-  contents?: string
-}
-
-interface Callbacks {
-    import(path: string): ReadCallbackReply;
-}
-
 function setupMethods (soljson) {
   let version;
   if ('_solidity_version' in soljson) {
@@ -73,23 +65,23 @@ function setupMethods (soljson) {
   const createWrappedLspSend = function() {
     const wrappedLspSend = soljson.cwrap('solidity_lsp_send', 'number', ['string']);
     return function (input: String) {
-      let args = [];
+      const args = [];
       args.push(JSON.stringify(input));
       return wrappedLspSend.apply(undefined, args);
     };
   };
 
 	// Creates a wrapper around `int solidity_lsp_start(callbacks: Callbacks)`.
 	const createWrappedLspStart = function() {
-    const wrappedLspStart = soljson.cwrap('solidity_lsp_start', 'number', []);
-    return function (callbacks: Callbacks) {
+		const wrappedLspStart = soljson.cwrap('solidity_lsp_start', 'number', []);
+		return function (callbacks: Callbacks) {
 			let readCallback = callbacks.import;
 			assert(typeof readCallback === 'function', 'Invalid callback specified.');
 			const copyFromCString = soljson.UTF8ToString || soljson.Pointer_stringify;
 
 			const wrappedReadCallback = function (path: string, contents: string, error: string) {
-        // Calls the user-supplied file read callback and passes the return values
-        // accordingly to either @p contents or into @p error on failure.
+				// Calls the user-supplied file read callback and passes the return values
+				// accordingly to either @p contents or into @p error on failure.
 				const result = readCallback(copyFromCString(path));
 				if (typeof result.contents === 'string') {
 					copyToCString(result.contents, contents);
@@ -104,7 +96,7 @@ function setupMethods (soljson) {
 			const wrappedFunctionId = addFunction(wrappedReadCallback, 'ii');
 
 			try {
-        // call solidity_lsp_start(callbacks)
+				// call solidity_lsp_start(callbacks)
 				let args = [];
 				args.push(wrappedFunctionId);
 				let output = wrappedLspStart.apply(undefined, args);
@@ -119,7 +111,7 @@ function setupMethods (soljson) {
 			// safe to be released.
 			// Probably by clearly defining semantics and memory lifetimes
 			// of output strings.
-    };
+		};
 	};
 
   // This is to support multiple versions of Emscripten.