arthur/cel-rust-wasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: arthur:main
Branches Tags
arthur:main
arthur:v0.2.0
...
compare: arthur:4973376639c7d0e773b0a585bbb17539c7eca27b
Branches Tags
arthur:main
arthur:v0.2.0

2 Commits
main ... 4973376639

Author SHA1 Message Date
Arthur G.P. Schuster
4973376639 cleanup 2025-08-08 10:11:54 +02:00
Arthur G.P. Schuster
1cce02a8eb convert back to JS values 2025-08-08 10:11:54 +02:00
5 changed files with 65 additions and 112 deletions
Expand all files Collapse all files

3
Cargo.lock generated
View File

@@ -115,12 +115,13 @@ dependencies = [
[[package]] [[package]]
name = "cel-rust-wasm" name = "cel-rust-wasm"
version = "0.1.0" version = "0.2.0"
dependencies = [ dependencies = [
"cel", "cel",
"chrono", "chrono",
"console_error_panic_hook", "console_error_panic_hook",
"js-sys", "js-sys",
"serde",
"serde-wasm-bindgen", "serde-wasm-bindgen",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",

1
Cargo.toml
View File

@@ -10,6 +10,7 @@ crate-type = ["cdylib"]
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
js-sys = "0.3" js-sys = "0.3"
cel = "0.11" cel = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde-wasm-bindgen = "0.6" serde-wasm-bindgen = "0.6"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }

7
README → README.md
View File

@@ -19,13 +19,8 @@ To build and use this:
4. Use the API: 4. Use the API:
```js ```js
// Method 1: Get structured result
const result = evaluate_cel("name + ' is ' + string(age)", {name: "Alice", age: 30});
console.log(result.success, result.result, result.error);
// Method 2: Get string result or error
try { try {
const result = evaluate_cel_string("name + ' is ' + string(age)", {name: "Alice", age: 30}); const result = evaluate_cel("name + ' is ' + string(age)", {name: "Alice", age: 30});
console.log(result); console.log(result);
} catch (error) { } catch (error) {
console.error(error); console.error(error);

76
index.html
View File

@@ -113,8 +113,8 @@
<body> <body>
<h1>CEL-Rust WASM-bindgen Demo</h1> <h1>CEL-Rust WASM-bindgen Demo</h1>
<p> <p>
This demo uses <code>wasm-bindgen</code> to provide a clean JavaScript API This demo uses <code>wasm-bindgen</code> to provide a JavaScript API for
for CEL evaluation. CEL evaluation using <code>cel-rust</code>.
</p> </p>
<div class="container"> <div class="container">
@@ -136,14 +136,9 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
</div> </div>
</div> </div>
<div class="full-width">
<button onclick="evaluate()">Evaluate CEL Expression</button>
<button onclick="evaluateAsString()">Evaluate & Return as String</button>
</div>
<div class="full-width"> <div class="full-width">
<label>Result:</label> <label>Result:</label>
<div id="result" class="result">Click "Evaluate" to see results...</div> <div id="result" class="result">WASM module not loaded yet...</div>
</div> </div>
<div class="examples"> <div class="examples">
@@ -162,9 +157,9 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
<div class="example" onclick="loadExample(this)"> <div class="example" onclick="loadExample(this)">
<h4>Math Operations</h4> <h4>Math Operations</h4>
<code <code
data-expression="(price * quantity) * (1 + tax)" data-expression="(price * double(quantity)) * (1.0 + tax)"
data-context='{"price": 10.50, "quantity": 3, "tax": 0.08}' data-context='{"price": 10.50, "quantity": 3, "tax": 0.08}'
>Expression: (price * quantity) * (1 + tax)</code >Expression: (price * double(quantity)) * (1.0 + tax)</code
> >
<code>Context: {"price": 10.50, "quantity": 3, "tax": 0.08}</code> <code>Context: {"price": 10.50, "quantity": 3, "tax": 0.08}</code>
</div> </div>
@@ -172,9 +167,10 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
<div class="example" onclick="loadExample(this)"> <div class="example" onclick="loadExample(this)">
<h4>List Operations</h4> <h4>List Operations</h4>
<code <code
data-expression="scores.filter(s, s > 90).size() + ' high scores out of ' + string(scores.size())" data-expression="string(scores.filter(s, s > 90).size()) + ' high scores out of ' + string(scores.size())"
data-context='{"scores": [85, 92, 78, 96, 88]}' data-context='{"scores": [85, 92, 78, 96, 88]}'
>Expression: scores.filter(s, s > 90).size() + ' high scores'</code >Expression: string(scores.filter(s, s > 90).size()) + ' high
scores'</code
> >
<code>Context: {"scores": [85, 92, 78, 96, 88]}</code> <code>Context: {"scores": [85, 92, 78, 96, 88]}</code>
</div> </div>
@@ -206,10 +202,7 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
</div> </div>
<script type="module"> <script type="module">
import init, { import init, { evaluate_cel } from "./pkg/cel_rust_wasm.js";
evaluate_cel,
evaluate_cel_string,
} from "./pkg/cel_rust_wasm.js";
let wasmModule; let wasmModule;
@@ -217,12 +210,10 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
wasmModule = await init(); wasmModule = await init();
console.log("WASM module loaded successfully"); console.log("WASM module loaded successfully");
// Make functions globally available // Make function globally available
window.evaluate_cel = evaluate_cel; window.evaluate_cel = evaluate_cel;
window.evaluate_cel_string = evaluate_cel_string;
// Enable the evaluate button setTimeout(evaluate, 0);
document.querySelector("button").disabled = false;
} }
// Initialize WASM when the page loads // Initialize WASM when the page loads
@@ -230,7 +221,6 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
// Make functions globally available for onclick handlers // Make functions globally available for onclick handlers
window.evaluate = evaluate; window.evaluate = evaluate;
window.evaluateAsString = evaluateAsString;
window.loadExample = loadExample; window.loadExample = loadExample;
</script> </script>
@@ -250,45 +240,19 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
// Parse the context as JavaScript object // Parse the context as JavaScript object
const context = contextStr.trim() ? JSON.parse(contextStr) : {}; const context = contextStr.trim() ? JSON.parse(contextStr) : {};
// Evaluate using the string result version // Evaluate and get the actual JavaScript value
const result = window.evaluate_cel(expression, context); const result = window.evaluate_cel(expression, context);
if (result.success) {
resultDiv.className = "result success"; resultDiv.className = "result success";
resultDiv.textContent = `Success: ${result.result}`; resultDiv.textContent = `Success (type '${typeof result}'): ${JSON.stringify(result, null, 2)}`;
} else {
resultDiv.className = "result error";
resultDiv.textContent = `Error: ${result.error}`;
}
} catch (e) {
resultDiv.className = "result error";
resultDiv.textContent = `JavaScript Error: ${e.message}`;
}
}
function evaluateAsString() { // Log the actual JavaScript object to console for inspection
if (!window.evaluate_cel_string) { console.log("CEL Result:", result);
document.getElementById("result").textContent = console.log("Type:", typeof result);
"WASM module not loaded yet...";
return;
}
const expression = document.getElementById("expression").value;
const contextStr = document.getElementById("context").value;
const resultDiv = document.getElementById("result");
try {
// Parse the context as JavaScript object
const context = contextStr.trim() ? JSON.parse(contextStr) : {};
// Evaluate using the string result version
const result = window.evaluate_cel_string(expression, context);
resultDiv.className = "result success";
resultDiv.textContent = `Success (String): ${result}`;
} catch (e) { } catch (e) {
resultDiv.className = "result error"; resultDiv.className = "result error";
resultDiv.textContent = `Error: ${e}`; resultDiv.textContent = `Error: ${e}`;
console.log("CEL Error:", e);
} }
} }
@@ -301,16 +265,16 @@ name + " is " + string(age) + " years old and " + (active ? "active" : "inactive
document.getElementById("context").value = context; document.getElementById("context").value = context;
// Auto-evaluate // Auto-evaluate
setTimeout(evaluate, 100); setTimeout(evaluate, 0);
} }
// Auto-evaluate on input change // Auto-evaluate on input change
document.getElementById("expression").addEventListener("input", () => { document.getElementById("expression").addEventListener("input", () => {
setTimeout(evaluate, 300); setTimeout(evaluate, 100);
}); });
document.getElementById("context").addEventListener("input", () => { document.getElementById("context").addEventListener("input", () => {
setTimeout(evaluate, 300); setTimeout(evaluate, 100);
}); });
</script> </script>
</body> </body>

88
src/lib.rs
View File

@@ -1,5 +1,6 @@
use cel::{Context, Program, Value}; use cel::{Context, Program, Value};
use js_sys; use js_sys;
use serde::Serialize;
use std::collections::HashMap; use std::collections::HashMap;
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
@@ -19,31 +20,6 @@ macro_rules! console_log {
($($t:tt)*) => (log(&format_args!($($t)*).to_string())) ($($t:tt)*) => (log(&format_args!($($t)*).to_string()))
} }
#[wasm_bindgen]
pub struct CelResult {
success: bool,
result: String,
error: Option<String>,
}
#[wasm_bindgen]
impl CelResult {
#[wasm_bindgen(getter)]
pub fn success(&self) -> bool {
self.success
}
#[wasm_bindgen(getter)]
pub fn result(&self) -> String {
self.result.clone()
}
#[wasm_bindgen(getter)]
pub fn error(&self) -> Option<String> {
self.error.clone()
}
}
/// Convert a JavaScript value to a CEL Value recursively /// Convert a JavaScript value to a CEL Value recursively
fn js_value_to_cel_value(js_val: &JsValue) -> Result<Value, String> { fn js_value_to_cel_value(js_val: &JsValue) -> Result<Value, String> {
if js_val.is_null() || js_val.is_undefined() { if js_val.is_null() || js_val.is_undefined() {
@@ -94,36 +70,52 @@ fn js_value_to_cel_value(js_val: &JsValue) -> Result<Value, String> {
} }
} }
/// Evaluate a CEL expression with the given context // Simple wrapper to make Value serializable for JS conversion
#[wasm_bindgen] #[derive(Serialize)]
pub fn evaluate_cel(expression: &str, context: &JsValue) -> CelResult { #[serde(untagged)]
let result = evaluate_cel_internal(expression, context); enum SerializableValue {
Null,
Bool(bool),
Int(i64),
Float(f64),
String(String),
List(Vec<SerializableValue>),
Map(HashMap<String, SerializableValue>),
Other(String),
}
match result { fn cel_value_to_serializable(cel_val: &Value) -> SerializableValue {
Ok(value) => CelResult { match cel_val {
success: true, Value::Null => SerializableValue::Null,
result: format!("{:?}", value), Value::Bool(b) => SerializableValue::Bool(*b),
error: None, Value::Int(i) => SerializableValue::Int(*i),
}, Value::UInt(u) => SerializableValue::Int(*u as i64),
Err(error) => CelResult { Value::Float(f) => SerializableValue::Float(*f),
success: false, Value::String(s) => SerializableValue::String(s.to_string()),
result: String::new(), Value::List(_list) => {
error: Some(error), SerializableValue::List(_list.iter().map(cel_value_to_serializable).collect())
}, }
Value::Map(_map) => SerializableValue::Map(
_map.map
.iter()
.map(|(k, v)| (k.to_string(), cel_value_to_serializable(v)))
.collect(),
),
_ => SerializableValue::Other(format!("{:?}", cel_val)),
} }
} }
/// Evaluate a CEL expression and return the result as a string /// Evaluate a CEL expression and return the actual JavaScript value
#[wasm_bindgen] #[wasm_bindgen]
pub fn evaluate_cel_string(expression: &str, context: &JsValue) -> Result<String, JsValue> { pub fn evaluate_cel(expression: &str, context: &JsValue) -> Result<JsValue, JsValue> {
match evaluate_cel_internal(expression, context) { match evaluate_cel_internal(expression, context) {
Ok(cel_value) => { Ok(cel_value) => {
// Convert the result to a reasonable string representation // Convert to serializable format and then to JS
let result_string = match &cel_value { let serializable = cel_value_to_serializable(&cel_value);
Value::String(s) => s.clone(), match serde_wasm_bindgen::to_value(&serializable) {
_ => format!("{:?}", cel_value).into(), Ok(js_val) => Ok(js_val),
}; Err(e) => Err(JsValue::from_str(&format!("Serialization error: {}", e))),
Ok(result_string.to_string()) }
} }
Err(e) => Err(JsValue::from_str(&e)), Err(e) => Err(JsValue::from_str(&e)),
} }