Feat v0.9.2 converter consolidation (#75)

Co-authored-by: Jeffrey Smith <jasafpro@gmail.com>
Co-committed-by: Jeffrey Smith <jasafpro@gmail.com>

server/triggers/event.go

@@ -3,7 +3,6 @@ package triggers
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"log"
 	"time"
 
@@ -72,7 +71,7 @@ func (e *Engine) fireEventTrigger(triggerID, packageID, entryPoint string, ev ev
 	if len(ev.Payload) > 0 {
 		var payloadMap map[string]any
 		if json.Unmarshal(ev.Payload, &payloadMap) == nil {
-			_ = ctxDict.SetKey(starlark.String("event_payload"), mapToStarlark(payloadMap))
+			_ = ctxDict.SetKey(starlark.String("event_payload"), sandbox.MapToDict(payloadMap))
 		} else {
 			_ = ctxDict.SetKey(starlark.String("event_payload"), starlark.String(string(ev.Payload)))
 		}
@@ -114,43 +113,6 @@ func (e *Engine) hasPermission(ctx context.Context, packageID, permission string
 	return false
 }
 
-// mapToStarlark converts a map[string]any to a Starlark dict.
-func mapToStarlark(m map[string]any) *starlark.Dict {
-	d := starlark.NewDict(len(m))
-	for k, v := range m {
-		_ = d.SetKey(starlark.String(k), goToStarlark(v))
-	}
-	return d
-}
-
-// goToStarlark converts a Go value to a Starlark value.
-func goToStarlark(v any) starlark.Value {
-	switch val := v.(type) {
-	case nil:
-		return starlark.None
-	case bool:
-		return starlark.Bool(val)
-	case int:
-		return starlark.MakeInt(val)
-	case int64:
-		return starlark.MakeInt64(val)
-	case float64:
-		return starlark.Float(val)
-	case string:
-		return starlark.String(val)
-	case map[string]any:
-		return mapToStarlark(val)
-	case []any:
-		elems := make([]starlark.Value, len(val))
-		for i, e := range val {
-			elems[i] = goToStarlark(e)
-		}
-		return starlark.NewList(elems)
-	default:
-		return starlark.String(fmt.Sprintf("%v", val))
-	}
-}
-
 // RunContext builds a sandbox.RunContext for a trigger invocation.
 func triggerRunContext(userID, teamID string) *sandbox.RunContext {
 	if userID == "" {

server/triggers/webhook.go

@@ -13,6 +13,7 @@ import (
 	"go.starlark.net/starlark"
 
 	"armature/models"
+	"armature/sandbox"
 )
 
 // HandleWebhook is the Gin handler for inbound webhook triggers.
@@ -152,7 +153,7 @@ func parseWebhookResponse(val starlark.Value) webhookResponse {
 		}
 
 		if bodyVal, found, _ := d.Get(starlark.String("body")); found {
-			resp.body = starlarkToGo(bodyVal)
+			resp.body = sandbox.StarlarkToGo(bodyVal)
 		} else {
 			resp.body = gin.H{"ok": true}
 		}
@@ -168,41 +169,6 @@ func parseWebhookResponse(val starlark.Value) webhookResponse {
 	return webhookResponse{status: 200, body: gin.H{"ok": true}}
 }
 
-// starlarkToGo converts a Starlark value to a Go value (for JSON serialization).
-func starlarkToGo(v starlark.Value) any {
-	switch val := v.(type) {
-	case starlark.NoneType:
-		return nil
-	case starlark.Bool:
-		return bool(val)
-	case starlark.Int:
-		if i, ok := val.Int64(); ok {
-			return i
-		}
-		return val.String()
-	case starlark.Float:
-		return float64(val)
-	case starlark.String:
-		return string(val)
-	case *starlark.List:
-		result := make([]any, val.Len())
-		for i := 0; i < val.Len(); i++ {
-			result[i] = starlarkToGo(val.Index(i))
-		}
-		return result
-	case *starlark.Dict:
-		result := make(map[string]any, val.Len())
-		for _, item := range val.Items() {
-			if k, ok := item[0].(starlark.String); ok {
-				result[string(k)] = starlarkToGo(item[1])
-			}
-		}
-		return result
-	default:
-		return v.String()
-	}
-}
-
 // verifyHMAC checks the HMAC-SHA256 signature of a webhook payload.
 func verifyHMAC(body []byte, secret, signature string) bool {
 	if signature == "" {