Resolve block enum types using callee script owner

Author: mgomes

vibes/execution.go

@@ -66,9 +66,10 @@ type capabilityContractScope struct {
 }
 
 type moduleContext struct {
-	key  string
-	path string
-	root string
+	key    string
+	path   string
+	root   string
+	script *Script
 }
 
 type callFrame struct {

vibes/execution_blocks.go

@@ -5,7 +5,11 @@ import "fmt"
 func (exec *Execution) evalBlockLiteral(block *BlockLiteral, env *Env) (Value, error) {
 	blockValue := NewBlock(block.Params, block.Body, env)
 	blk := blockValue.Block()
-	blk.owner = exec.script
+	if ctx := exec.currentModuleContext(); ctx != nil && ctx.script != nil {
+		blk.owner = ctx.script
+	} else {
+		blk.owner = exec.script
+	}
 	if ctx := exec.currentModuleContext(); ctx != nil {
 		blk.moduleKey = ctx.key
 		blk.modulePath = ctx.path
@@ -33,9 +37,10 @@ func (exec *Execution) CallBlock(block Value, args []Value) (Value, error) {
 	}
 	blk := block.Block()
 	exec.pushModuleContext(moduleContext{
-		key:  blk.moduleKey,
-		path: blk.modulePath,
-		root: blk.moduleRoot,
+		key:    blk.moduleKey,
+		path:   blk.modulePath,
+		root:   blk.moduleRoot,
+		script: blk.owner,
 	})
 	defer exec.popModuleContext()
 

vibes/execution_calls.go

@@ -163,9 +163,10 @@ func (exec *Execution) callFunction(fn *ScriptFunction, receiver Value, args []V
 	ctx := moduleContext{}
 	if fn.owner != nil {
 		ctx = moduleContext{
-			key:  fn.owner.moduleKey,
-			path: fn.owner.modulePath,
-			root: fn.owner.moduleRoot,
+			key:    fn.owner.moduleKey,
+			path:   fn.owner.modulePath,
+			root:   fn.owner.moduleRoot,
+			script: fn.owner,
 		}
 	}
 	exec.pushModuleContext(ctx)