support numbers by default, bigints can be later

getlago · Oct 28, 2024 · 503ed06 · 503ed06
1 parent 7575abe
commit 503ed06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/expression-js/index.js b/expression-js/index.js
@@ -10,10 +10,10 @@ elem.oninput = function () {
   error.innerHTML = "";
   try {
     expression = parseExpression(elem.value);
-    output.innerHTML = evaluateExpression(expression, "code", BigInt(1231254123), {
-      started_at: BigInt(123124123),
-      ended_at: BigInt(1241231241),
-      replicas: BigInt(8),
+    output.innerHTML = evaluateExpression(expression, "code", 1231254123, {
+      started_at: 123124123,
+      ended_at: 1241231241,
+      replicas: 8,
     });
   } catch (e) {
     error.innerHTML = e;

diff --git a/expression-js/src/lib.rs b/expression-js/src/lib.rs
@@ -29,7 +29,7 @@ pub fn parse_expression(expression: String) -> Result<Expression, String> {
 pub fn evaluate_expression(
     expression: Expression,
     code: String,
-    timestamp: u64,
+    timestamp: u32,
     js_properties: &JsValue,
 ) -> Result<JsValue, JsValue> {
     let mut properties = HashMap::new();
@@ -43,7 +43,7 @@ pub fn evaluate_expression(
         let insert = if value.is_string() {
             String::try_from(value)?
         } else {
-            let n = u64::try_from(value)?;
+            let n = f64::try_from(value)?;
             format!("{n}")
         };
 
@@ -52,7 +52,7 @@ pub fn evaluate_expression(
 
     let event = expression_core::Event {
         code,
-        timestamp,
+        timestamp: timestamp.into(),
         properties,
     };