Make `BuildError` and `ResolveError` use C++ instead of JSC C API

Fixes memory leak with private data never being cleared
Fixes a case where a ResolveError could actually be a BuildError

1 files changed, 3 insertions, 4 deletions

diff --git a/src/js_ast.zig b/src/js_ast.zig
index cdf7a3ad9..fdd220926 100644
--- a/src/js_ast.zig
+++ b/src/js_ast.zig
@@ -9693,6 +9693,9 @@ pub const Macro = struct {
                                 } else if (value.as(JSC.WebCore.Blob)) |resp| {
                                     blob_ = resp.*;
                                     blob_.?.allocator = null;
+                                } else if (value.as(JSC.ResolveMessage) != null or value.as(JSC.BuildMessage) != null) {
+                                    this.macro.vm.runErrorHandler(value, null);
+                                    return error.MacroFailed;
                                 }
                             } else {
                                 var private_data = JSCBase.JSPrivateDataPtr.from(JSC.C.JSObjectGetPrivate(value.asObjectRef()).?);
@@ -9705,10 +9708,6 @@ pub const Macro = struct {
                                         node.updateSymbolsMap(Visitor, this.visitor);
                                         return _entry.value_ptr.*;
                                     },
-                                    .ResolveMessage, .BuildMessage => {
-                                        this.macro.vm.runErrorHandler(value, null);
-                                        return error.MacroFailed;
-                                    },
 
                                     else => {},
                                 }