From d77a6620f3f15549e5b9cd75f78cfe91ffaaa8d2 Mon Sep 17 00:00:00 2001
From: Karl Seguin <k@openmymind.io>
Date: Tue, 13 Jan 2026 13:05:16 +0800
Subject: [PATCH] merge main

---
 src/browser/js/Value.zig       | 2 +-
 src/browser/webapi/Console.zig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/js/Value.zig b/src/browser/js/Value.zig
index 54415df0..6b452bd8 100644
--- a/src/browser/js/Value.zig
+++ b/src/browser/js/Value.zig
@@ -236,7 +236,7 @@ fn _toString(self: Value, comptime null_terminate: bool, opts: js.String.ToZigOp
 }
 
 
-pub fn (ctx: *js.Context, json: []const u8) !Value {
+pub fn fromJson(ctx: *js.Context, json: []const u8) !Value {
     const v8_isolate = v8.Isolate{ .handle = ctx.isolate.handle };
     const json_string = v8.String.initUtf8(v8_isolate, json);
     const v8_context = v8.Context{ .handle = ctx.handle };
diff --git a/src/browser/webapi/Console.zig b/src/browser/webapi/Console.zig
index 46412295..1f9b458e 100644
--- a/src/browser/webapi/Console.zig
+++ b/src/browser/webapi/Console.zig
@@ -54,7 +54,7 @@ pub fn warn(_: *const Console, values: []js.Value, page: *Page) void {
 
 pub fn clear(_: *const Console) void {}
 
-pub fn assert(_: *const Console, assertion: js.Value, values: []js.Object, page: *Page) void {
+pub fn assert(_: *const Console, assertion: js.Value, values: []js.Value, page: *Page) void {
     if (assertion.toBool()) {
         return;
     }