Merge pull request #75 from algorand-devrel/dev

0.27.1
algorandfoundation · Jul 13, 2023 · a72bd21 · a72bd21
2 parents 7ca0797 + 5c3280e
commit a72bd21
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorandfoundation/tealscript",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "description": "Enables Algorand smart contract development with native TypeScript syntax, tooling, and IDE support",
   "homepage": "https://github.com/algorand-devrel/TEALScript",
   "bugs": {

diff --git a/src/lib/compiler.ts b/src/lib/compiler.ts
@@ -3027,6 +3027,12 @@ export default class Compiler {
     chain.push(node);
 
     chain.forEach((n) => {
+      if (ts.isElementAccessExpression(n)) {
+        this.processNode(n);
+        if (this.lastType === 'txn') this.lastType = 'gtxns';
+        return;
+      }
+
       if (ts.isPropertyAccessExpression(n) && ['Account', 'Asset', 'Application', 'Address'].includes(n.expression.getText())) {
         if (['zeroIndex', 'zeroAddress'].includes(n.name.getText())) {
           this.push(n.name, 'int 0', this.getABIType(n.expression.getText()));
@@ -3476,13 +3482,13 @@ export default class Compiler {
 
   private getChain(
     node: ts.PropertyAccessExpression,
-    chain: (ts.PropertyAccessExpression | ts.CallExpression)[] = [],
-  ): (ts.PropertyAccessExpression | ts.CallExpression)[] {
+    chain: (ts.PropertyAccessExpression | ts.CallExpression | ts.ElementAccessExpression)[] = [],
+  ): (ts.PropertyAccessExpression | ts.CallExpression | ts.ElementAccessExpression)[] {
     if (ts.isPropertyAccessExpression(node.expression)) {
       chain.push(node.expression);
       return this.getChain(node.expression, chain);
     }
-    if (ts.isCallExpression(node.expression)) {
+    if (ts.isCallExpression(node.expression) || ts.isElementAccessExpression(node.expression)) {
       chain.push(node.expression);
       if (!ts.isPropertyAccessExpression(node.expression.expression)) throw new Error('Invalid call chain');
       return this.getChain(

diff --git a/tests/contracts/artifacts/GeneralTest.approval.teal b/tests/contracts/artifacts/GeneralTest.approval.teal
@@ -10,22 +10,18 @@ abi_route_txnTypeEnum:
 	!=
 	&&
 	assert
-	byte 0x
+
+	// no dupn needed
 	callsub txnTypeEnum
 	int 1
 	return
 
 txnTypeEnum:
-	proto 1 0
+	proto 0 0
 
 	// tests/contracts/general.algo.ts:6
-	// t = this.txnGroup[0]
+	// assert(this.txnGroup[0].typeEnum === TransactionType.Payment)
 	int 0
-	frame_bury -1 // t: txn
-
-	// tests/contracts/general.algo.ts:7
-	// assert(t.typeEnum === TransactionType.Payment)
-	frame_dig -1 // t: txn
 	gtxns TypeEnum
 	int pay
 	==

diff --git a/tests/contracts/artifacts/GeneralTest.json b/tests/contracts/artifacts/GeneralTest.json
@@ -30,7 +30,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDgKCWIgbWFpbgoKYWJpX3JvdXRlX3R4blR5cGVFbnVtOgoJdHhuIE9uQ29tcGxldGlvbgoJaW50IE5vT3AKCT09Cgl0eG4gQXBwbGljYXRpb25JRAoJaW50IDAKCSE9CgkmJgoJYXNzZXJ0CglieXRlIDB4CgljYWxsc3ViIHR4blR5cGVFbnVtCglpbnQgMQoJcmV0dXJuCgp0eG5UeXBlRW51bToKCXByb3RvIDEgMAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9nZW5lcmFsLmFsZ28udHM6NgoJLy8gdCA9IHRoaXMudHhuR3JvdXBbMF0KCWludCAwCglmcmFtZV9idXJ5IC0xIC8vIHQ6IHR4bgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9nZW5lcmFsLmFsZ28udHM6NwoJLy8gYXNzZXJ0KHQudHlwZUVudW0gPT09IFRyYW5zYWN0aW9uVHlwZS5QYXltZW50KQoJZnJhbWVfZGlnIC0xIC8vIHQ6IHR4bgoJZ3R4bnMgVHlwZUVudW0KCWludCBwYXkKCT09Cglhc3NlcnQKCXJldHN1YgoKbWFpbjoKCXR4biBOdW1BcHBBcmdzCglibnogcm91dGVfYWJpCgoJLy8gZGVmYXVsdCBjcmVhdGVBcHBsaWNhdGlvbgoJdHhuIEFwcGxpY2F0aW9uSUQKCWludCAwCgk9PQoJdHhuIE9uQ29tcGxldGlvbgoJaW50IE5vT3AKCT09CgkmJgoJcmV0dXJuCgpyb3V0ZV9hYmk6CgltZXRob2QgInR4blR5cGVFbnVtKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3R4blR5cGVFbnVtCgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDgKCWIgbWFpbgoKYWJpX3JvdXRlX3R4blR5cGVFbnVtOgoJdHhuIE9uQ29tcGxldGlvbgoJaW50IE5vT3AKCT09Cgl0eG4gQXBwbGljYXRpb25JRAoJaW50IDAKCSE9CgkmJgoJYXNzZXJ0CgoJLy8gbm8gZHVwbiBuZWVkZWQKCWNhbGxzdWIgdHhuVHlwZUVudW0KCWludCAxCglyZXR1cm4KCnR4blR5cGVFbnVtOgoJcHJvdG8gMCAwCgoJLy8gdGVzdHMvY29udHJhY3RzL2dlbmVyYWwuYWxnby50czo2CgkvLyBhc3NlcnQodGhpcy50eG5Hcm91cFswXS50eXBlRW51bSA9PT0gVHJhbnNhY3Rpb25UeXBlLlBheW1lbnQpCglpbnQgMAoJZ3R4bnMgVHlwZUVudW0KCWludCBwYXkKCT09Cglhc3NlcnQKCXJldHN1YgoKbWFpbjoKCXR4biBOdW1BcHBBcmdzCglibnogcm91dGVfYWJpCgoJLy8gZGVmYXVsdCBjcmVhdGVBcHBsaWNhdGlvbgoJdHhuIEFwcGxpY2F0aW9uSUQKCWludCAwCgk9PQoJdHhuIE9uQ29tcGxldGlvbgoJaW50IE5vT3AKCT09CgkmJgoJcmV0dXJuCgpyb3V0ZV9hYmk6CgltZXRob2QgInR4blR5cGVFbnVtKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3R4blR5cGVFbnVtCgllcnI=",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDgKaW50IDEKcmV0dXJu"
   },
   "contract": {

diff --git a/tests/contracts/general.algo.ts b/tests/contracts/general.algo.ts
@@ -3,7 +3,6 @@ import { Contract } from '../../src/lib/index';
 // eslint-disable-next-line no-unused-vars
 class GeneralTest extends Contract {
   txnTypeEnum(): void {
-    const t = this.txnGroup[0];
-    assert(t.typeEnum === TransactionType.Payment);
+    assert(this.txnGroup[0].typeEnum === TransactionType.Payment);
   }
 }