Merge pull request #11 from ton-blockchain/tolk-v1.0

Tolk v1.0: handle `import` without ".tolk", release wasm and stdlib

Author: tolk-vm

README.md

@@ -1,8 +1,7 @@
 # WASM wrapper for TON Tolk Language
 
-**Tolk** is a new language for writing smart contracts in TON. Think of Tolk as the "next‑generation FunC".
-Tolk compiler is literally a fork of FunC compiler, introducing familiar syntax similar to TypeScript,
-but leaving all low-level optimizations untouched. 
+**Tolk** is a next-generation language for smart contracts in TON.
+It replaces FunC with modern syntax, strong types, and built-in serialization — while generating even more efficient assembler code.
 
 **tolk-js** is a WASM wrapper for Tolk compiler. 
 [Blueprint](https://github.com/ton-org/blueprint) uses tolk-js to compile `.tolk` files, 
@@ -81,13 +80,14 @@ The function `runTolkCompiler()` accepts the following properties (look up `Tolk
 * `entrypointFileName` — obvious
 * `fsReadCallback` — explained above
 * `optimizationLevel` (default 2) — controls Tolk compiler stack optimizer
-* `withStackComments` (default false) — Fift output will contain comments, if you wish to debug its output
+* `withStackComments` (default false) — Fift output will contain stack comments, if you wish to debug its output
+* `withSrcLineComments` (default false) — Fift output will contain line comments from original .tolk files
 * `experimentalOptions` (default '') — you can pass experimental compiler options here
 
 
 ## Embedded stdlib functions
 
-Tolk standard functions (`beginCell`, `assertEndOfSlice`, and lots of others) are available out of the box *(if you worked with FunC earlier, you had to download stdlib.fc and store in your project; in Tolk, you don't need any additional files)*.
+Tolk standard functions (`beginCell`, `assertEnd`, and lots of others) are available out of the box *(if you worked with FunC earlier, you had to download stdlib.fc and store in your project; in Tolk, you don't need any additional files)*.
 
 It works, because all stdlib files are embedded into JS, placed near wasm. If you `import "@stdlib/tvm-dicts"` for example, tolk-js will handle it, `fsReadCallback` won't be called.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton/tolk-js",
-  "version": "0.99.0",
+  "version": "1.0.0",
   "description": "Tolk Language compiler (next-generation FunC)",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",

src/index.ts

@@ -86,9 +86,9 @@ export async function runTolkCompiler(compilerConfig: TolkCompilerConfig): Promi
   const callbackPtr = mod.addFunction(function (kind: number, dataPtr: any, destContents: any, destError: any) {
     switch (kind) { // enum ReadCallback::Kind in C++
       case 0:       // realpath
-        let relativeFilename = copyFromCString(mod, dataPtr)
-        if (relativeFilename.startsWith('@stdlib/') && !relativeFilename.endsWith('.tolk')) {
-          relativeFilename += '.tolk'     // import "@stdlib/gas-payments"
+        let relativeFilename = copyFromCString(mod, dataPtr)  // from `import` statement, relative to cur file
+        if (!relativeFilename.endsWith('.tolk')) {
+          relativeFilename += '.tolk'
         }
         allocatedPointers.push(copyToCStringPtr(mod, realpath(relativeFilename), destContents))
         break

src/path-utils.ts

@@ -77,8 +77,8 @@ function posixNormalize(path: string, allowAboveRoot: boolean): string {
   return res
 }
 
-// 'realpath' in Tolk internals is used to resolve #include
-// (e.g., to detect that #include "a.tolk" and #include "dir/../a.tolk" reference the same file)
+// 'realpath' in Tolk internals is used to resolve imports
+// (e.g., to detect that `import "a.tolk"` and `import "dir/../a"` reference the same file)
 // here we do the same using manual normalization, taken from Node internals (to work in web)
 //
 // also, 'realpath' in C++ resolves symlinks