Skip to content

Do not render .0 for integers in the TS value renderer #3313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vigoo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Do not render .0 for integers in the TS value renderer #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
151bb6a
Do not render .0 for integers in the TS value renderer
vigoo Apr 30, 2026
fa12742
Fix
vigoo Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions cli/golem-cli/src/agent_id_display/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,27 @@ impl<'a> Lexer<'a> {
})?;
Ok((Token::FloatLit(v), start, self.pos))
} else if negative {
let v: i64 = text.parse().map_err(|e| LexError {
position: start,
message: format!("invalid integer: {e}"),
})?;
Ok((Token::IntLit(v), start, self.pos))
match text.parse::<i64>() {
Ok(v) => Ok((Token::IntLit(v), start, self.pos)),
Err(_) => {
let v: f64 = text.parse().map_err(|e| LexError {
position: start,
message: format!("invalid integer: {e}"),
})?;
Ok((Token::FloatLit(v), start, self.pos))
}
}
} else {
let v: u64 = text.parse().map_err(|e| LexError {
position: start,
message: format!("invalid integer: {e}"),
})?;
Ok((Token::UintLit(v), start, self.pos))
match text.parse::<u64>() {
Ok(v) => Ok((Token::UintLit(v), start, self.pos)),
Err(_) => {
let v: f64 = text.parse().map_err(|e| LexError {
position: start,
message: format!("invalid integer: {e}"),
})?;
Ok((Token::FloatLit(v), start, self.pos))
}
}
}
}

Expand Down
14 changes: 5 additions & 9 deletions cli/golem-cli/src/agent_id_display/render_ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use golem_common::model::agent::text_utils::{
write_json_escaped, write_json_escaped_char, write_with_decimal_point,
};
use golem_common::model::agent::text_utils::{write_json_escaped, write_json_escaped_char};
use golem_common::model::agent::{
BinaryReference, BinarySource, ComponentModelElementValue, DataValue, ElementValue,
NamedElementValues, TextReference, TextSource, UnstructuredBinaryElementValue,
Expand Down Expand Up @@ -408,10 +406,9 @@ fn render_f32(buf: &mut String, v: f32) {
} else if v == f32::NEG_INFINITY {
buf.push_str("-Infinity");
} else if v == 0.0 && v.is_sign_negative() {
buf.push_str("-0.0");
buf.push_str("-0");
} else {
let s = format!("{v}");
write_with_decimal_point(buf, &s);
write!(buf, "{v}").unwrap();
}
}

Expand All @@ -423,9 +420,8 @@ fn render_f64(buf: &mut String, v: f64) {
} else if v == f64::NEG_INFINITY {
buf.push_str("-Infinity");
} else if v == 0.0 && v.is_sign_negative() {
buf.push_str("-0.0");
buf.push_str("-0");
} else {
let s = format!("{v}");
write_with_decimal_point(buf, &s);
write!(buf, "{v}").unwrap();
}
}
4 changes: 2 additions & 2 deletions cli/golem-cli/tests/app/agents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,8 +1198,8 @@ async fn test_invoke_and_repl_agent_id_casing_and_normalizing() {
.await;
assert!(outputs.success_or_dump());
assert!(outputs.stdout_contains_ordered([
r#"LongAgentName(("1212",100.0))"#,
r#"[{ oneField: "1212", anotherField: 100.0 }, { oneField: "1", anotherField: 2.0 }]"#,
r#"LongAgentName(("1212",100))"#,
r#"[{ oneField: "1212", anotherField: 100 }, { oneField: "1", anotherField: 2 }]"#,
]));

let outputs = ctx
Expand Down
Loading