Merge pull request #128 from code0-tech/#118-integer-support

Add Integer Support

Author: raphael-goetz

Cargo.lock

@@ -8,7 +8,7 @@ edition = "2024"
 
 [workspace.dependencies]
 code0-flow = { version = "0.0.28" }
-tucana = { version = "0.0.62" }
+tucana = { version = "0.0.63" }
 tokio = { version = "1.44.1", features = ["rt-multi-thread", "signal"] }
 log = "0.4.27"
 futures-lite = "2.6.0"

Cargo.toml

@@ -2,8 +2,9 @@ use crate::context::signal::Signal;
 use crate::runtime::error::RuntimeError;
 use std::convert::Infallible;
 use tucana::shared::value::Kind;
-use tucana::shared::{ListValue, Struct, Value};
+use tucana::shared::{ListValue, NumberValue, Struct, Value};
 
+use crate::value::number_to_f64;
 #[derive(Clone, Debug)]
 pub enum Argument {
     // Eval => Evaluated Value
@@ -40,12 +41,23 @@ impl TryFromArgument for Value {
     }
 }
 
+impl TryFromArgument for NumberValue {
+    fn try_from_argument(a: &Argument) -> Result<Self, Signal> {
+        match a {
+            Argument::Eval(Value {
+                kind: Some(Kind::NumberValue(n)),
+            }) => Ok(n.clone()),
+            _ => Err(type_err("Expected number", a)),
+        }
+    }
+}
+
 impl TryFromArgument for f64 {
     fn try_from_argument(a: &Argument) -> Result<Self, Signal> {
         match a {
             Argument::Eval(Value {
                 kind: Some(Kind::NumberValue(n)),
-            }) => Ok(*n),
+            }) => number_to_f64(n).ok_or_else(|| type_err("Expected number", a)),
             _ => Err(type_err("Expected number", a)),
         }
     }

crates/core/src/context/argument.rs

@@ -371,7 +371,17 @@ fn preview_value(value: &Value) -> String {
 
 fn format_value_json(value: &Value) -> String {
     match value.kind.as_ref() {
-        Some(Kind::NumberValue(v)) => v.to_string(),
+        Some(Kind::NumberValue(v)) => {
+            match v.number {
+                Some(kind) => {
+                    match kind {
+                        tucana::shared::number_value::Number::Integer(i) => i.to_string(),
+                        tucana::shared::number_value::Number::Float(f) => f.to_string(),
+                    }
+                }
+                _ => "null".to_string(),
+            } 
+        },
         Some(Kind::BoolValue(v)) => v.to_string(),
         Some(Kind::StringValue(v)) => format!("{:?}", v),
         Some(Kind::NullValue(_)) | None => "null".to_string(),

crates/core/src/context/executor.rs

@@ -1,3 +1,4 @@
 pub mod context;
 pub mod debug;
 pub mod runtime;
+pub mod value;