feat: add bindings for check_condition function

js/example/test/checking_attribute_condition.test.ts

@@ -0,0 +1,19 @@
+import { expect } from "chai";
+import { Attribute, OCABox, create_nested_attr_type_from_js } from "oca.js";
+
+describe("Attribute with condition is built", () => {
+  try {
+    const textTypeJs = create_nested_attr_type_from_js("Text");
+
+    const attribute = new Attribute("name")
+      .setAttributeType(textTypeJs)
+      .setCondition("${age} > 18");
+
+    it("check condition", () => {
+      expect(attribute.checkCondition({ age: 20 })).to.be.true;
+      expect(attribute.checkCondition({ age: 18 })).to.be.false;
+    });
+  } catch (error) {
+    console.error("Error checking attribute condition", error);
+  }
+});

js/example/test/parsing-attribute-types.test.ts

@@ -13,10 +13,8 @@ describe('Parsing attribute types', () => {
 	}),
 
 	it("shouldn't be parsed", () => {
-		expect( () => create_nested_attr_type_from_js("Wrong")).to.throw("Can't parse attribute type: Wrong")
-		// expect( () => create_nested_attr_type_from_js("Wrong")).to.throw("Attribute type Wrong doesn't exist")
+		expect( () => create_nested_attr_type_from_js("Wrong")).to.throw("Attribute type Wrong doesn't exist")
 		const reference = "refs:not_said";
-		expect( () => create_nested_attr_type_from_js(reference)).to.throw("Can't parse attribute type: refs:not_said")
-		// expect( () => create_nested_attr_type_from_js(reference)).to.throw("Invalid said: Unknown code")
+		expect( () => create_nested_attr_type_from_js(reference)).to.throw("Invalid said: Unknown code")
 	})
 })

js/example/yarn.lock

@@ -2583,7 +2583,7 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 "oca.js@file:../wasm/pkg":
-  version "0.3.7"
+  version "0.4.1-rc.6"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"

js/wasm/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oca-js"
 description = "Bindings for the OCA in JavaScript"
-version = "0.4.1-rc.2"
+version = "0.4.1-rc.6"
 license = "EUPL-1.2"
 edition = "2021"
 authors = [
@@ -25,8 +25,8 @@ strip = "debuginfo"
 
 [dependencies]
 isolang = { version = "2.3.0", features = ["serde"] }
-oca-bundle = { version = "0.4.1-rc.2", features = ["format_overlay"] }
-oca-ast = { version = "0.4.1-rc.2" }
+oca-bundle = { version = "0.4.1-rc.6", features = ["format_overlay"] }
+oca-ast = { version = "0.4.1-rc.6" }
 serde = "1.0.130"
 serde-wasm-bindgen = "0.5.0"
 serde_json = "1.0.105"

js/wasm/src/lib.rs

@@ -22,7 +22,7 @@ use oca_bundle::state::{
 };
 use oca_bundle::Encode;
 use serde::Serialize;
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
@@ -49,6 +49,8 @@ extern "C" {
     pub type EntryCodesMapping;
     #[wasm_bindgen(typescript_type = "string[]")]
     pub type Dependencies;
+    #[wasm_bindgen(typescript_type = "string | IAttribute")]
+    pub type AttributeConstructor;
 }
 
 #[wasm_bindgen]
@@ -255,17 +257,25 @@ pub struct Attribute {
 }
 
 #[wasm_bindgen]
-pub fn create_nested_attr_type_from_js(value: JsValue) -> Result<JsValue, JsValue> {
-    NestedAttrType::from_js_value(value).and_then(|attr_type| attr_type.to_js_value())
+pub fn create_nested_attr_type_from_js(
+    value: JsValue,
+) -> Result<JsValue, JsValue> {
+    NestedAttrType::from_js_value(value)
+        .and_then(|attr_type| attr_type.to_js_value())
 }
 
 #[wasm_bindgen]
 impl Attribute {
     #[wasm_bindgen(constructor)]
-    pub fn new(name: String) -> Self {
-        Self {
-            raw: AttributeRaw::new(name),
-        }
+    pub fn new(name_or_object: AttributeConstructor) -> Self {
+        let raw = if name_or_object.is_string() {
+            let name = name_or_object.as_string().unwrap();
+            AttributeRaw::new(name)
+        } else {
+            serde_wasm_bindgen::from_value(name_or_object.into()).unwrap()
+        };
+
+        Self { raw }
     }
 
     #[wasm_bindgen(js_name = "setAttributeType")]
@@ -312,6 +322,32 @@ impl Attribute {
         self
     }
 
+    #[wasm_bindgen(js_name = "checkCondition")]
+    pub fn check_condition(&self, data: JsValue) -> Result<bool, JsValue> {
+        let data_raw_value: serde_json::Value =
+            serde_wasm_bindgen::from_value(data)
+                .map_err(|err| JsValue::from(format!("{:?}", err)))?;
+
+        let data_raw_o = data_raw_value
+            .as_object()
+            .ok_or(JsValue::from("data must be an object"))?;
+        let data_raw: BTreeMap<String, Box<dyn std::fmt::Display + 'static>> =
+            data_raw_o
+                .iter()
+                .map(|(key, value)| {
+                    (
+                        key.clone(),
+                        Box::new(value.clone())
+                            as Box<dyn std::fmt::Display + 'static>,
+                    )
+                })
+                .collect();
+
+        self.raw
+            .check_condition(data_raw)
+            .map_err(|err| JsValue::from(serde_json::to_string(&err).unwrap()))
+    }
+
     #[wasm_bindgen(js_name = "setConformance")]
     pub fn set_conformance(mut self, conformance: ConformanceOptions) -> Self {
         let conformance_raw: String = serde_wasm_bindgen::from_value(conformance.into()).unwrap();