fix: should detect base exceptions and break instead

Author: JairusSW

assembly/test.ts

@@ -1,46 +1,10 @@
-import { JSON } from "json-as";
-// 1st Level Abort
-// try {
-//   abort("Failed to execute!", "test.ts");
-//   console.log("This should not execute");
-// } catch (e) {
-//   console.log("Got an error: " + e.toString());
-// } finally {
-//   console.log("Gracefully shutting down...");
-//   process.exit(0);
-// }
-import { __Exception } from "./types/exception";
-@json
-class Vec3 {
-  x: i32 = 0;
-  y: i32 = 0;
-  z: i32 = 0;
-}
 try {
-  JSON.parse<Vec3>("\"hello\"")
+  // Do something
+  abort("Failed to execute!", "test.ts");
+  console.log("This should not execute");
 } catch (e) {
   console.log("Got an error: " + e.toString());
 } finally {
   console.log("Gracefully shutting down...");
   process.exit(0);
-}
-
-// function doSomething(shouldAbort: boolean = false): void {
-//   if (shouldAbort) {
-//     abort("Function 'doSomething' failed to execute properly!");
-//   }
-//   console.log("'doSomething' executed");
-// }
-
-// // 2nd Level Abort
-// try {
-//   doSomething(false);
-//   console.log("First exception passed");
-//   doSomething(true);
-//   console.log("Second exception passed")
-// } catch (e) {
-//   console.log("Got an error: " + e.toString());
-// } finally {
-//   console.log("Gracefully shutting down...");
-//   process.exit(0);
-// }
+}

transform/lib/linkers/exception.js

@@ -49,9 +49,12 @@ export class ExceptionLinker extends Visitor {
 
   public changed: boolean = false;
   public fn: FunctionDeclaration | null = null;
+  public loop: DoStatement | null = null;
 
   public exceptions: ExceptionParent[] = [];
 
+  public baseException: boolean = false;
+
   visitCallExpression(
     node: CallExpression,
     ref: Node | Node[] | null = null,
@@ -235,6 +238,12 @@ export class ExceptionLinker extends Visitor {
       node.range,
     );
 
+    if (this.loop) {
+      breakStmt = Node.createBreakStatement(null, node.range);
+      this.loop = null;
+      return breakStmt;
+    }
+
     if (parent) {
       const returnType = toString(parent.signature.returnType);
       if (DEBUG) console.log("Return Type: " + returnType + " derived from " + parent.name.text);
@@ -385,8 +394,12 @@ export class ExceptionLinker extends Visitor {
     }
   }
 
-  static replace(node: Node | Node[]): void {
+  static replace(node: Node | Node[], baseException: boolean = false): void {
     ExceptionLinker.SN.fn = null;
+    if (baseException && !Array.isArray(node) && node.kind == NodeKind.Do) {
+      const n = node as DoStatement;
+      ExceptionLinker.SN.loop = n;
+    }
     ExceptionLinker.SN.visit(node);
   }
 }

transform/lib/linkers/exception.js.map

@@ -1,6 +1,7 @@
 import {
   CallExpression,
   CommonFlags,
+  ExpressionStatement,
   FunctionDeclaration,
   IdentifierExpression,
   Node,
@@ -11,7 +12,7 @@ import {
   TryStatement,
 } from "assemblyscript/dist/assemblyscript.js";
 import { Visitor } from "./lib/visitor.js";
-import { toString } from "./lib/util.js";
+import { SimpleParser, toString } from "./lib/util.js";
 import { replaceRef } from "./utils.js";
 import { ExceptionLinker } from "./linkers/exception.js";
 
@@ -46,6 +47,7 @@ export class TryTransform extends Visitor {
 
     const hasBaseException = node.bodyStatements.some((v) => {
       if (!v) return false;
+      if (v.kind == NodeKind.Expression) v = (v as ExpressionStatement).expression;
       if (
         v.kind == NodeKind.Call
         && (v as CallExpression).expression.kind == NodeKind.Identifier
@@ -80,7 +82,7 @@ export class TryTransform extends Visitor {
       )
     ) : null;
 
-    ExceptionLinker.replace(tryLoop || tryBlock);
+    ExceptionLinker.replace(tryLoop || tryBlock, hasBaseException);
 
     if (DEBUG) console.log("Before Try: " + toString(beforeTry));