diff --git a/src/jsc/ConsoleObject.zig b/src/jsc/ConsoleObject.zig index 2489ea14ea03..917dfe29949a 100644 --- a/src/jsc/ConsoleObject.zig +++ b/src/jsc/ConsoleObject.zig @@ -1136,7 +1136,7 @@ pub const Formatter = struct { pub fn canHaveCircularReferences(tag: Tag) bool { return switch (tag) { - .Function, .Array, .Object, .Map, .Set, .Error, .Class, .Event => true, + .Function, .Array, .Object, .Map, .Set, .Error, .Class, .Event, .JSX => true, else => false, }; } @@ -3140,13 +3140,12 @@ pub const Formatter = struct { } } - if (try value.get(this.globalThis, "props")) |props| { + if (try value.get(this.globalThis, "props")) |props| props: { const prev_quote_strings = this.quote_strings; defer this.quote_strings = prev_quote_strings; this.quote_strings = true; - // SAFETY: JSX props are always objects - const props_obj = props.getObject().?; + const props_obj = props.getObject() orelse break :props; var props_iter = try jsc.JSPropertyIterator(.{ .skip_empty_name = true, .include_value = true, diff --git a/src/test_runner/pretty_format.zig b/src/test_runner/pretty_format.zig index 2a5fcdaf5600..25cdc6535223 100644 --- a/src/test_runner/pretty_format.zig +++ b/src/test_runner/pretty_format.zig @@ -326,7 +326,7 @@ pub const JestPrettyFormat = struct { } pub inline fn canHaveCircularReferences(tag: Tag) bool { - return tag == .Array or tag == .Object or tag == .Map or tag == .Set; + return tag == .Array or tag == .Object or tag == .Map or tag == .Set or tag == .JSX; } const Result = struct { @@ -1534,13 +1534,12 @@ pub const JestPrettyFormat = struct { } } - if (try value.get(this.globalThis, "props")) |props| { + if (try value.get(this.globalThis, "props")) |props| props: { const prev_quote_strings = this.quote_strings; defer this.quote_strings = prev_quote_strings; this.quote_strings = true; - // SAFETY: JSX props are always an object. - const props_obj = props.getObject().?; + const props_obj = props.getObject() orelse break :props; var props_iter = try jsc.JSPropertyIterator(.{ .skip_empty_name = true, .include_value = true, diff --git a/test/js/bun/util/inspect.test.js b/test/js/bun/util/inspect.test.js index 32a70af30183..54b2680e27d5 100644 --- a/test/js/bun/util/inspect.test.js +++ b/test/js/bun/util/inspect.test.js @@ -316,6 +316,58 @@ it("jsx with fragment", () => { expect(input).toBe(output); }); +it("jsx with circular reference in props", () => { + const el = { + $$typeof: Symbol.for("react.element"), + type: "div", + props: {}, + }; + el.props.foo = el; + expect(Bun.inspect(el)).toBe("
"); +}); + +it("jsx with circular reference as props object", () => { + const el = { + $$typeof: Symbol.for("react.transitional.element"), + type: "div", + key: null, + ref: null, + props: {}, + }; + el.props = el; + expect(Bun.inspect(el)).toBe( + ``, + ); +}); + +it("jsx with circular reference in key", () => { + const el = { + $$typeof: Symbol.for("react.element"), + type: "div", + }; + el.key = el; + expect(Bun.inspect(el)).toBe(""); +}); + +it("jsx with circular reference in children", () => { + const el = { + $$typeof: Symbol.for("react.element"), + type: "div", + props: { children: null }, + }; + el.props.children = el; + expect(Bun.inspect(el)).toBe("