Commit 0de5849e8a29aeaf9d9a45d9a4cab14dfed5f1ac | lib/zig/json

author	Meghan Denny <hello@nektro.net> 2026-06-25 21:08:56 -07:00
committer	Meghan Denny <hello@nektro.net> 2026-06-25 21:08:56 -07:00
log	0de5849e8a29aeaf9d9a45d9a4cab14dfed5f1ac
tree	c81c16a717c20316abf90298fecf47db90c30915
parent	64efd2e04fd7bdd9f4b62383ad3668596dfad15a
signature	Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw

stringify: handle unicode strings

1 files changed, 14 insertions(+), 14 deletions(-)

json.zig+14-14

 @@ -743,17 +743,13 @@ pub fn stringify(writer: anytype, value: anytype, options: std.json.Stringify.Op
                 try writer.writeAll("\"");
             }
         } else {
-            return error.Unexpected;
+            var view = std.unicode.Utf8View.init(value) catch return error.Unexpected;
-        }
+            var iter = view.iterator();
-        return;
+            try writer.writeAll("\"");
-    }
+            while (iter.nextCodepointSlice()) |sl| {
-    if (comptime extras.isArrayOf(u8)(T)) {
+                const cp = std.unicode.utf8Decode(sl) catch unreachable;
-        if (extras.matchesAll(u8, &value, std.ascii.isAscii)) {
+                if (cp < 128) {
-            if (extras.matchesAll(u8, &value, std.ascii.isPrint)) {
+                    const c: u8 = @intCast(cp);
-                try writer.writevAll(&.{ &.{'"'}, &value, &.{'"'} });
-            } else {
-                try writer.writeAll("\"");
-                for (&value) |c| {
                     try writer.writeAll(switch (c) {
                         0x08 => "\\b",
                         0x09 => "\\t",
 @@ -765,14 +761,18 @@ pub fn stringify(writer: anytype, value: anytype, options: std.json.Stringify.Op
                         0x23...0x7e => &.{c},
                         else => "\\u00" ++ extras.to_hex([_]u8{c}),
                     });
+                    continue;
                 }
-                try writer.writeAll("\"");
+                try writer.writeAll(sl);
             }
-        } else {
+            try writer.writeAll("\"");
-            return error.Unexpected;
+            return;
         }
         return;
     }
+    if (comptime extras.isArrayOf(u8)(T)) {
+        return stringify(writer, &value, options);
+    }
     if (comptime extras.isSlice(T)) {
         try writer.writeAll("[");
         for (value, 0..) |item, i| {