fix: Fix wrong Declaration typescript types

field33 · Nov 22, 2022 · 12e6c9a · 12e6c9a
1 parent 195a8de
commit 12e6c9a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
@@ -29,12 +29,12 @@ pub fn parser_bench(b: &mut Bencher, turtle: &str) {
         Ontology::parse(
             turtle,
             ParserOptions::builder()
-                .known(owlish::owl::Declaration::AnnotationProperty(
-                    IRI::new("http://query-server.field33.com/ontology/query-field")
+                .known(owlish::owl::Declaration::AnnotationProperty {
+                    iri: IRI::new("http://query-server.field33.com/ontology/query-field")
                         .unwrap()
                         .into(),
-                    vec![],
-                ))
+                    annotations: vec![],
+                })
                 .build(),
         )
         .unwrap();

diff --git a/extend_wasm_pkg.sh b/extend_wasm_pkg.sh
@@ -65,10 +65,10 @@ export function matchAxiom(axiom, matcher) {
     }
 }
 
-export function matchDeclaration(axiom, matcher) {
-    for (const key in axiom) {
+export function matchDeclaration(declaration, matcher) {
+    for (const key in declaration) {
         if (matcher[key]) {
-            matcher[key](axiom[key])
+            matcher[key](declaration[key])
             break
         }
     }

diff --git a/src/api/wasm.rs b/src/api/wasm.rs
@@ -112,12 +112,12 @@ extern "C" {
 #[wasm_bindgen(typescript_custom_section)]
 const ONTOLOGY_TS_API: &'static str = r#"
 interface Declaration {
-    Class?: [IRI, Array<Annotation>],
-    NamedIndividual?: [IRI, Array<Annotation>],
-    ObjectProperty?: [IRI, Array<Annotation>],
-    DataProperty?: [IRI, Array<Annotation>],
-    AnnotationProperty?: [IRI, Array<Annotation>],
-    Datatype?: [IRI, Array<Annotation>],
+    Class?: {iri: IRI, annotations: Array<Annotation>},
+    NamedIndividual?: {iri: IRI, annotations: Array<Annotation>},
+    ObjectProperty?: {iri: IRI, annotations: Array<Annotation>},
+    DataProperty?: {iri: IRI, annotations: Array<Annotation>},
+    AnnotationProperty?: {iri: IRI, annotations: Array<Annotation>},
+    Datatype?: {iri: IRI, annotations: Array<Annotation>},
 }
 
 interface Axiom {
@@ -189,12 +189,12 @@ export interface AxiomMatcher<R> {
 export function matchAxiom<R>(axiom: Axiom, matcher: AxiomMatcher<R>): R
 
 interface DeclarationMatcher<R> {
-    Class?: (cls: [IRI, Array<Annotation>]) => R,
-    NamedIndividual?: (individual: [IRI, Array<Annotation>]) => R,
-    ObjectProperty?: (objectProp: [IRI, Array<Annotation>]) => R,
-    DataProperty?: (dataProp: [IRI, Array<Annotation>]) => R,
-    AnnotationProperty?: (annotationProp: [IRI, Array<Annotation>]) => R,
-    Datatype?: (datatype: [IRI, Array<Annotation>]) => R,
+    Class?: (cls: Declaration["Class"]) => R,
+    NamedIndividual?: (individual: Declaration["NamedIndividual"]) => R,
+    ObjectProperty?: (objectProp: Declaration["ObjectProperty"]) => R,
+    DataProperty?: (dataProp: Declaration["DataProperty"]) => R,
+    AnnotationProperty?: (annotationProp: Declaration["AnnotationProperty"]) => R,
+    Datatype?: (datatype: Declaration["Datatype"]) => R,
 
 }