Improve error recovery

.changeset/spicy-ways-sing.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Improve error recovery

cmd/astro-wasm/astro-wasm.go

@@ -260,15 +260,23 @@ func Transform() any {
 		h := handler.NewHandler(source, transformOptions.Filename)
 
 		styleError := []string{}
-		handler := js.FuncOf(func(this js.Value, args []js.Value) any {
+		promiseHandle := js.FuncOf(func(this js.Value, args []js.Value) any {
 			resolve := args[0]
+			reject := args[1]
 
 			go func() {
 				var doc *astro.Node
+				defer func() {
+					if err := recover(); err != nil {
+						reject.Invoke(wasm_utils.ErrorToJSError(h, err.(error)))
+						return
+					}
+				}()
 
 				doc, err := astro.ParseWithOptions(strings.NewReader(source), astro.ParseOptionWithHandler(h))
 				if err != nil {
-					fmt.Println(err)
+					reject.Invoke(wasm_utils.ErrorToJSError(h, err))
+					return
 				}
 
 				// Hoist styles and scripts to the top-level
@@ -403,11 +411,11 @@ func Transform() any {
 
 			return nil
 		})
-		defer handler.Release()
+		defer promiseHandle.Release()
 
 		// Create and return the Promise object
 		promiseConstructor := js.Global().Get("Promise")
-		return promiseConstructor.New(handler)
+		return promiseConstructor.New(promiseHandle)
 	})
 }
 

internal_wasm/utils/utils.go

@@ -1,9 +1,15 @@
 package wasm_utils
 
 import (
+	"fmt"
+	"regexp"
+	"runtime/debug"
+	"strings"
 	"syscall/js"
 
+	"github.com/norunners/vert"
 	astro "github.com/withastro/compiler/internal"
+	"github.com/withastro/compiler/internal/handler"
 )
 
 // See https://stackoverflow.com/questions/68426700/how-to-wait-a-js-async-function-from-golang-wasm
@@ -50,3 +56,46 @@ func GetAttrs(n *astro.Node) js.Value {
 	}
 	return attrs
 }
+
+type JSError struct {
+	Message string `js:"message"`
+	Stack   string `js:"stack"`
+}
+
+func (err *JSError) Value() js.Value {
+	return vert.ValueOf(err).Value
+}
+
+var FN_NAME_RE = regexp.MustCompile(`(\w+)\([^)]+\)$`)
+
+func ErrorToJSError(h *handler.Handler, err error) js.Value {
+	stack := string(debug.Stack())
+	message := strings.TrimSpace(err.Error())
+	if strings.Contains(message, ":") {
+		message = strings.TrimSpace(strings.Split(message, ":")[1])
+	}
+	hasFnName := false
+	message = fmt.Sprintf("UnknownCompilerError: %s", message)
+	cleanStack := message
+	for _, v := range strings.Split(stack, "\n") {
+		matches := FN_NAME_RE.FindAllString(v, -1)
+		if len(matches) > 0 {
+			name := strings.Split(matches[0], "(")[0]
+			if name == "panic" {
+				cleanStack = message
+				continue
+			}
+			cleanStack += fmt.Sprintf("\n    at %s", strings.Split(matches[0], "(")[0])
+			hasFnName = true
+		} else if hasFnName {
+			url := strings.Split(strings.Split(strings.TrimSpace(v), " ")[0], "/compiler/")[1]
+			cleanStack += fmt.Sprintf(" (@astrojs/compiler/%s)", url)
+			hasFnName = false
+		}
+	}
+	jsError := JSError{
+		Message: message,
+		Stack:   cleanStack,
+	}
+	return jsError.Value()
+}