Merge branch 'main' into dependabot/npm_and_yarn/docs/npm_and_yarn-01…

…54404f20

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Optional types for `self` argument in `extends mutates` functions are now allowed: PR [#854](https://github.com/tact-lang/tact/pull/854)
+
 ### Fixed
 
 - Collisions in getter method ids are now handled and reported properly: PR [#875](https://github.com/tact-lang/tact/pull/875)

src/generator/writers/writeExpression.ts

@@ -558,13 +558,6 @@ export function writeExpression(f: AstExpression, wCtx: WriterContext): string {
 
         // Reference type
         if (selfTyRef.kind === "ref") {
-            if (selfTyRef.optional) {
-                throwCompilationError(
-                    `Cannot call function of non - direct type: "${printTypeRef(selfTyRef)}"`,
-                    f.loc,
-                );
-            }
-
             // Render function call
             const selfTy = getType(wCtx.ctx, selfTyRef.name);
 

src/generator/writers/writeFunction.ts

@@ -503,7 +503,7 @@ function writeCondition(
 
 export function writeFunction(f: FunctionDescription, ctx: WriterContext) {
     // Resolve self
-    const self = f.self ? getType(ctx.ctx, f.self) : null;
+    const self = f.self?.kind === "ref" ? getType(ctx.ctx, f.self.name) : null;
 
     // Write function header
     let returns: string = resolveFuncType(f.returns, ctx);
@@ -683,7 +683,7 @@ function writeNonMutatingFunction(
 
 export function writeGetter(f: FunctionDescription, ctx: WriterContext) {
     // Render tensors
-    const self = f.self !== null ? getType(ctx.ctx, f.self) : null;
+    const self = f.self?.kind === "ref" ? getType(ctx.ctx, f.self.name) : null;
     if (!self) {
         throw new Error(`No self type for getter ${idTextErr(f.name)}`); // Impossible
     }

src/storage/__snapshots__/resolveAllocation.spec.ts.snap

@@ -2293,7 +2293,11 @@ exports[`resolveAllocation should write program 1`] = `
           "returns": {
             "kind": "void",
           },
-          "self": "Sample",
+          "self": {
+            "kind": "ref",
+            "name": "Sample",
+            "optional": false,
+          },
         },
       },
       "header": null,

src/test/e2e-emulated/contracts/mutating-method-chaining.tact → src/test/e2e-emulated/contracts/mutating-methods.tact

@@ -1,8 +1,17 @@
+asm(value key self keySize) extends mutates fun nativeUdictStoreUint(self: Cell?, keySize: Int, key: Int, value: Slice) { DICTUSET }
+
 extends mutates fun multiply(self: Int, x: Int): Int {
     self *= x;
     return self;
 }
 
+extends fun multiplyExtends(self: Int?, x: Int): Int? {
+    if (self == null) {
+        return null;
+    }
+    return self!! * x;
+}
+
 struct Foo {
     s: Slice;
 }
@@ -64,4 +73,15 @@ contract Tester {
         self.s.loadUint(1);
         return self.s.loadUint(3);
     }
+
+    get fun test10(dict: Cell?): Cell? {
+        dict.nativeUdictStoreUint(8, 123, rawSlice("456"));
+        return dict;
+    }
+
+    get fun test11(x: Int?): Int? {
+        x.multiplyExtends(2);
+        x.multiplyExtends(2).multiplyExtends(3);
+        return x.multiplyExtends(2).multiplyExtends(3);
+    }
 }