Merge branch 'main' into semantics-test

CHANGELOG.md

@@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TypeScript wrappers generation for messages with single quote: PR [#1106](https://github.com/tact-lang/tact/pull/1106)
 - `foreach` loops now properly handle `as coins` map value serialization type: PR [#1186](https://github.com/tact-lang/tact/pull/1186)
 - The typechecker now rejects integer map key types with variable width (`coins`, `varint16`, `varint32`, `varuint16`, `varuint32`): PR [#1276](https://github.com/tact-lang/tact/pull/1276)
+- Code generation for `self` argument in optional struct methods: PR [#1284](https://github.com/tact-lang/tact/pull/1284)
 
 ### Docs
 

package.json

@@ -49,7 +49,7 @@
     "unboc": "bin/unboc.js"
   },
   "dependencies": {
-    "@tact-lang/opcode": "^0.0.16",
+    "@tact-lang/opcode": "^0.0.18",
     "@ton/core": "0.59.1",
     "@ton/crypto": "^3.2.0",
     "@tonstudio/parser-runtime": "^0.0.1",

src/generator/writers/writeExpression.ts

@@ -624,8 +624,7 @@ export function writeExpression(f: AstExpression, wCtx: WriterContext): string {
                 }
             }
 
-            // Render
-            const s = writeExpression(f.self, wCtx);
+            const s = writeCastedExpression(f.self, methodDescr.self!, wCtx);
             if (methodDescr.isMutating) {
                 // check if it's an l-value
                 const path = tryExtractPath(f.self);

src/generator/writers/writeFunction.ts

@@ -527,8 +527,10 @@ function writeCondition(
 }
 
 export function writeFunction(f: FunctionDescription, ctx: WriterContext) {
-    // Resolve self
-    const self = f.self?.kind === "ref" ? getType(ctx.ctx, f.self.name) : null;
+    const [self, isSelfOpt] =
+        f.self?.kind === "ref"
+            ? [getType(ctx.ctx, f.self.name), f.self.optional]
+            : [null, false];
 
     // Write function header
     let returns: string = resolveFuncType(f.returns, ctx);
@@ -546,7 +548,9 @@ export function writeFunction(f: FunctionDescription, ctx: WriterContext) {
     // Resolve function descriptor
     const params: string[] = [];
     if (self) {
-        params.push(resolveFuncType(self, ctx) + " " + funcIdOf("self"));
+        params.push(
+            resolveFuncType(self, ctx, isSelfOpt) + " " + funcIdOf("self"),
+        );
     }
     for (const a of f.params) {
         params.push(resolveFuncType(a.type, ctx) + " " + funcIdOf(a.name));
@@ -619,7 +623,7 @@ export function writeFunction(f: FunctionDescription, ctx: WriterContext) {
                 }
                 ctx.body(() => {
                     // Unpack self
-                    if (self) {
+                    if (self && !isSelfOpt) {
                         ctx.append(
                             `var (${resolveFuncTypeUnpack(self, funcIdOf("self"), ctx)}) = ${funcIdOf("self")};`,
                         );

src/test/e2e-emulated/contracts/non-mutating-methods.tact

@@ -0,0 +1,18 @@
+struct SomeStruct { i: Int; b: Bool }
+
+extends fun equal(self: SomeStruct?, other: SomeStruct?): Bool {
+    if (self == null && other == null) { return true }
+    if (self == null || other == null) { return false }
+    return self!!.i == other!!.i && self!!.b == other!!.b;
+}
+
+contract Tester {
+    receive() { }
+
+    get fun test1(): Bool {
+        let s1 = SomeStruct {i: 42, b: true};
+        let s2 = SomeStruct {i: 42, b: false};
+        let s3: SomeStruct? = null;
+        return s1.equal(s1) && !s1.equal(s2) && !s3.equal(s2);
+    }
+}

src/test/e2e-emulated/non-mutating-methods.spec.ts

@@ -0,0 +1,35 @@
+import { toNano } from "@ton/core";
+import { Blockchain, SandboxContract, TreasuryContract } from "@ton/sandbox";
+import { Tester } from "./contracts/output/non-mutating-methods_Tester";
+import "@ton/test-utils";
+
+describe("bugs", () => {
+    let blockchain: Blockchain;
+    let treasure: SandboxContract<TreasuryContract>;
+    let contract: SandboxContract<Tester>;
+
+    beforeEach(async () => {
+        blockchain = await Blockchain.create();
+        blockchain.verbosity.print = false;
+        treasure = await blockchain.treasury("treasure");
+
+        contract = blockchain.openContract(await Tester.fromInit());
+
+        const deployResult = await contract.send(
+            treasure.getSender(),
+            { value: toNano("10") },
+            null,
+        );
+
+        expect(deployResult.transactions).toHaveTransaction({
+            from: treasure.address,
+            to: contract.address,
+            success: true,
+            deploy: true,
+        });
+    });
+
+    it("should implement non-mutating method chaining correctly", async () => {
+        expect(await contract.getTest1()).toStrictEqual(true);
+    });
+});

tact.config.json

@@ -104,6 +104,11 @@
       "path": "./src/test/e2e-emulated/contracts/mutating-methods.tact",
       "output": "./src/test/e2e-emulated/contracts/output"
     },
+    {
+      "name": "non-mutating-methods",
+      "path": "./src/test/e2e-emulated/contracts/non-mutating-methods.tact",
+      "output": "./src/test/e2e-emulated/contracts/output"
+    },
     {
       "name": "underscore-variable",
       "path": "./src/test/e2e-emulated/contracts/underscore-variable.tact",

yarn.lock

@@ -1325,10 +1325,10 @@
   resolved "https://registry.npmjs.org/@tact-lang/opcode/-/opcode-0.0.14.tgz"
   integrity sha512-8FKHK2jwvViRBReO2t40DCkHAP9KPTRWZof4kdsAUJFlyeWIC8SsRQSl9QkZxF+48WvjDduKNqN5Ltb80paufA==
 
-"@tact-lang/opcode@^0.0.16":
-  version "0.0.16"
-  resolved "https://registry.npmjs.org/@tact-lang/opcode/-/opcode-0.0.16.tgz"
-  integrity sha512-YJTUjoDOy+e+FHHppJiF+uWJ2IMjVknB9VQ5n78pknCE129DazCb/nFXnw0wVRDVcn8Tn59ky+pmjiQjQOjEbw==
+"@tact-lang/opcode@^0.0.18":
+  version "0.0.18"
+  resolved "https://registry.npmjs.org/@tact-lang/opcode/-/opcode-0.0.18.tgz#5081ca87f133cab5cd1ea0c1b1c6be9803d9d707"
+  integrity sha512-o/dvtvN6Zo3g5IMjDuzn3631uPihC8G6aaMzRfv4AYCtn36OdaMqbdqZYEfwF7fSzctONn6IkaNfY5rj10ir6Q==
 
 "@tact-lang/ton-abi@^0.0.3":
   version "0.0.3"
@@ -1505,9 +1505,9 @@
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.5.0":
-  version "22.10.2"
-  resolved "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz#a485426e6d1fdafc7b0d4c7b24e2c78182ddabb9"
-  integrity sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==
+  version "22.10.5"
+  resolved "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz#95af89a3fb74a2bb41ef9927f206e6472026e48b"
+  integrity sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==
   dependencies:
     undici-types "~6.20.0"