feat: Expose computations to WASM

field33 · Mar 24, 2023 · 21cdd98 · 21cdd98
1 parent 334a1a4
commit 21cdd98
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/api/wasm.rs b/src/api/wasm.rs
@@ -6,6 +6,7 @@ use super::Ontology;
 use js_sys::{Array, Number, JSON};
 use wasm_bindgen::{prelude::*, JsCast};
 use web_sys::console::error_1;
+use crate::computation::GetComputations;
 
 #[wasm_bindgen]
 impl Ontology {
@@ -99,6 +100,20 @@ impl Ontology {
         }
         array.unchecked_into()
     }
+
+    /// Get all FNO/Oxolotl computations of this ontology.
+    #[wasm_bindgen(js_name = "computations")]
+    pub fn wasm_computations(&self) -> ComputationArray {
+        let array = Array::new();
+        for a in self.computations() {
+            if let Ok(s) = serde_json::to_string(&a) {
+                if let Ok(value) = JSON::parse(&s) {
+                    array.push(&value);
+                }
+            }
+        }
+        array.unchecked_into()
+    }
 }
 
 #[wasm_bindgen]
@@ -107,6 +122,8 @@ extern "C" {
     pub type AxiomArray;
     #[wasm_bindgen(typescript_type = "Array<Declaration>")]
     pub type DeclarationArray;
+    #[wasm_bindgen(typescript_type = "Array<Computation>")]
+    pub type ComputationArray;
 }
 
 #[wasm_bindgen(typescript_custom_section)]
@@ -153,6 +170,11 @@ interface Axiom {
     HasKey?: HasKey
 }
 
+interface Computation {
+    iri: IRI,
+    axioms: Array<Axiom>,
+}
+
 export interface AxiomMatcher<R> {
     AnnotationAssertion?: (a: AnnotationAssertion) => R
     SubObjectPropertyOf?: (a: SubObjectPropertyOf) => R

diff --git a/src/computation/mod.rs b/src/computation/mod.rs
@@ -1,10 +1,12 @@
 use std::collections::HashMap;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     api::{Ontology, IRI},
     owl::{well_known, Axiom, ClassAssertion, ClassConstructor},
 };
 
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct Computation {
     iri: IRI,
     axioms: Vec<Axiom>,
@@ -19,7 +21,7 @@ impl Computation {
     }
 }
 
-trait GetComputations {
+pub trait GetComputations {
     fn computations(&self) -> Vec<Computation>;
 }
 

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -327,6 +327,7 @@ mod tests {
         },
         parser::{ParserOptions, ParserOptionsBuilder},
     };
+    use crate::computation::GetComputations;
 
     #[test]
     fn ontology() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -327,6 +327,7 @@ mod tests { @@
             },
             parser::{ParserOptions, ParserOptionsBuilder},
         };
+        use crate::computation::GetComputations;
         #[test]
         fn ontology() {
@@ Expand Down @@