Merge pull request #90 from tonlabs/1.1.1-rc

1.1.1 rc

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.1] - 2022-02-11
+### Fixed
+ - An error "TON Client binary bridge is not set"  that occurred when using `js wrap` command as a module
+
+### Improved
+ -  Command parameter parsing when using tondev as a module. 
+    Now, when some unrecognized option is found, an error occurs.
+    Previously unrecognized option was silently skipped.
+
 ## [1.1.0] - 2022-02-09
 ### New
  - If a new version of everdev is available, then the user who executes any `everdev` command will be

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "everdev",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Everscale Dev Environment",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

src/__tests__/checkArgs.ts

@@ -0,0 +1,40 @@
+import fs from 'fs'
+import path from 'path'
+
+import { doneTests, initTests, deleteFolderRecursive } from './init'
+import { StringTerminal, runCommand } from '..'
+
+const outPath = path.resolve(__dirname, '..', '..', `${Date.now()}-tmp`)
+
+beforeAll(initTests)
+afterAll(doneTests)
+beforeEach(() => deleteFolderRecursive(outPath))
+afterEach(() => deleteFolderRecursive(outPath))
+
+test('Should create HelloWallet.tvc in user defined output directory', async () => {
+    const solPath = path.resolve(__dirname, '..', '..', 'contracts', 'HelloWallet.sol')
+
+    const terminal = new StringTerminal()
+    await runCommand(terminal, 'sol compile', {
+        file: solPath,
+        outputDir: outPath,
+    })
+    expect(terminal.stderr.trim()).toEqual('')
+
+    const tvcFile = path.resolve(outPath, 'HelloWallet.tvc')
+    expect(fs.existsSync(tvcFile)).toBeTruthy()
+})
+
+test('Should warn user to use options in camelCase', async () => {
+    const solPath = path.resolve(__dirname, '..', '..', 'contracts', 'HelloWallet.sol')
+    const terminal = new StringTerminal()
+    try {
+        await runCommand(terminal, 'sol compile', {
+            file: solPath,
+           'hello-world': 'hi!',
+        })
+        throw Error("This function didn't throw")
+    } catch (err: any) {
+        expect(err.message).toMatch(/Unknow option: hello-world/)
+    }
+})

src/__tests__/init.ts

@@ -37,7 +37,7 @@ export function writeTempJson(name: string, json: unknown): string {
     return writeTempText(name, JSON.stringify(json, undefined, "    "));
 }
 
-function deleteFiles(files: string[]) {
+export function deleteFiles(files: string[]) {
     files.forEach((file) => {
         if (fs.existsSync(file)) {
             fs.unlinkSync(file);
@@ -64,7 +64,7 @@ export function doneTests() {
     everdevDone();
 }
 
-function deleteFolderRecursive(directoryPath: string) {
+export function deleteFolderRecursive(directoryPath: string) {
     if (fs.existsSync(directoryPath)) {
         fs.readdirSync(directoryPath).forEach((file) => {
             const curPath = path.join(directoryPath, file);

src/__tests__/wrap.ts

@@ -0,0 +1,32 @@
+import path from 'path'
+
+import { doneTests, initTests, deleteFiles } from './init'
+import { StringTerminal, runCommand } from '..'
+
+beforeAll(initTests)
+afterAll(doneTests)
+
+test('Shoud create HelloWallet.abi.json file', async () => {
+    const solPath = path.resolve(__dirname, '..', '..', 'contracts', 'HelloWallet.sol')
+    const terminal = new StringTerminal()
+    await runCommand(terminal, 'sol compile', {
+        file: solPath,
+    })
+    expect(terminal.stderr.trim()).toEqual('')
+})
+
+test('Shoud create HelloWalletContract.js file', async () => {
+    const wrappedJs = path.resolve(__dirname, '..', '..', 'HelloWalletContract.js')
+    deleteFiles([wrappedJs])
+
+    const terminal = new StringTerminal()
+    await runCommand(terminal, 'js wrap', {
+        file: path.resolve(__dirname, '..', '..', 'HelloWallet.abi.json'),
+    })
+    expect(terminal.stderr.trim()).toEqual('')
+
+    const { HelloWalletContract } = await import(wrappedJs)
+    expect(typeof HelloWalletContract).toEqual('object')
+
+    deleteFiles([wrappedJs])
+})

src/controllers/contract/run.ts

@@ -58,7 +58,7 @@ async function inputTuple(terminal: Terminal, param: AbiParam): Promise<any> {
     while (true) {
         const value = await inputLine(terminal, `${param.name} (${param.type})`)
         try {
-            return JSON.parse(value) 
+            return JSON.parse(value)
         } catch (err: any) {
             terminal.log(err.toString())
         }
@@ -192,5 +192,6 @@ export async function logRunResult(
         out_messages: outMessages.filter(x => x?.body_type !== MessageBodyType.Output),
     };
     terminal.log();
-    terminal.log(`Execution has finished with result: ${JSON.stringify(details, undefined, "    ")}`);
+    terminal.log('Execution has finished with result:');
+    terminal.log(JSON.stringify(details, undefined, "    "));
 }

src/controllers/index.ts

@@ -65,6 +65,8 @@ export async function runCommand(terminal: Terminal, name: string, args: any): P
     }
 
     const resolvedArgs: any = Object.assign({}, args);
+    let checkedArgs = Object.keys(resolvedArgs);
+
     for (const arg of command.args ?? []) {
         const name = arg.name
             .split("-")
@@ -78,8 +80,20 @@ export async function runCommand(terminal: Terminal, name: string, args: any): P
             } else {
                 throw await missingArgError(arg);
             }
+        } else {
+            // remove matched element from array 
+            checkedArgs = checkedArgs.filter(k => k !== name);
         }
     }
 
+    if (checkedArgs.length > 0) {
+        const msg = [`Unknow option: ${checkedArgs[0]}`]
+        if (checkedArgs[0].includes('-')) {
+            msg.push(
+                `You must convert parameters to camelcase, for example "output-dir" to "outputDir"`,
+            )
+        }
+        throw Error(msg.join('\n'))
+    }
     await command.run(terminal, resolvedArgs);
 }

src/controllers/js/wrap.ts

@@ -6,6 +6,9 @@ import {
 import path from "path";
 import {TonClient} from "@tonclient/core";
 import {resolveContract, writeTextFile} from "../../core/utils";
+const {libNode} = require("@tonclient/lib-node");
+
+TonClient.useBinaryLibrary(libNode);
 
 enum ExportFormat {
     CommonJs = "commonjs",