add global shapes

Author: ajuvercr

core/src/components.rs

@@ -59,6 +59,10 @@ pub struct Open;
 #[derive(Component, Debug)]
 pub struct Dirty;
 
+/// Indicates that this should be a global entity, linked to all other documents
+#[derive(Component, Debug)]
+pub struct Global;
+
 /// [`Component`] containing the [`lsp_types::Url`] of the current document.
 #[derive(Component, AsRef, Deref, AsMut, DerefMut, Debug)]
 pub struct Label(pub crate::lsp_types::Url);

core/src/systems/lov.rs

@@ -213,7 +213,7 @@ pub fn fetch_lov_properties<C: Client + Resource>(
 }
 
 type Sender = futures::channel::mpsc::UnboundedSender<CommandQueue>;
-fn spawn_document(
+pub fn spawn_document(
     url: Url,
     content: String,
     sender: &Sender,
@@ -248,7 +248,6 @@ fn spawn_document(
         extra(e, world);
 
         world.run_schedule(ParseLabel);
-        drop(_enter);
     });
 
     let _ = sender.unbounded_send(command_queue);

core/src/systems/shapes/data.rs

@@ -67,41 +67,6 @@ impl NeighsRDF for Rdf {
         P: srdf::matcher::Matcher<Self::IRI> + Clone,
         O: srdf::matcher::Matcher<Self::Term> + Clone,
     {
-        if let Some(p) = predicate.value() {
-            if p == MyTerm::named_node("http://www.w3.org/ns/shacl#minCount", 0..0) {
-                tracing::debug!(
-                    "matching mincount {:?} {:?} {:?}",
-                    subject.value().map(|x| x.value),
-                    predicate.value().map(|x| x.value),
-                    object.value().map(|x| x.value)
-                );
-                let subject = subject.clone();
-                let predicate = predicate.clone();
-                let object = object.clone();
-                for t in self.triples()?.filter_map(move |t| {
-                    match subject == t.subject && predicate == t.predicate && object == t.object {
-                        true => Some(t),
-                        false => {
-                            tracing::debug!(
-                                "  NOT FOUND {:?} {:?} {:?}",
-                                t.subject.value,
-                                t.predicate.value,
-                                t.object.value
-                            );
-                            None
-                        }
-                    }
-                }) {
-                    tracing::debug!(
-                        "  FOUND {:?} {:?} {:?}",
-                        t.subject.value,
-                        t.predicate.value,
-                        t.object.value
-                    );
-                }
-            }
-        }
-
         let triples = self.triples()?.filter_map(move |triple| {
             match subject == triple.subject
                 && predicate == triple.predicate

core/src/systems/shapes/mod.rs

@@ -128,7 +128,7 @@ pub fn validate_shapes(
         ),
         (Changed<Triples>, Without<Dirty>, With<Open>),
     >,
-    other: Query<(&Label, &ShaclShapes, &Prefixes)>,
+    other: Query<(&Label, &ShaclShapes, &Prefixes, Option<&Global>)>,
     mut client: ResMut<DiagnosticPublisher>,
     res: Res<ServerConfig>,
 ) {
@@ -138,15 +138,16 @@ pub fn validate_shapes(
 
     for (rope, label, links, item, triples) in &query {
         info!("Validate shapes {}", label.as_str());
-        let other: &Query<(&Label, &ShaclShapes, &Prefixes)> = &other;
+        let other: &Query<(&Label, &ShaclShapes, &Prefixes, Option<&Global>)> = &other;
         let client: &mut DiagnosticPublisher = &mut client;
         let mut diagnostics: Vec<crate::lsp_types::Diagnostic> = Vec::new();
 
-        for (other_label, schema, prefixes) in other {
-            if links
-                .iter()
-                .find(|link| link.0.as_str().starts_with(other_label.0.as_str()))
-                .is_none()
+        for (other_label, schema, prefixes, global) in other {
+            if global.is_none()
+                && links
+                    .iter()
+                    .find(|link| link.0.as_str().starts_with(other_label.0.as_str()))
+                    .is_none()
                 && label.0 != other_label.0
             {
                 continue;
@@ -165,12 +166,8 @@ pub fn validate_shapes(
             let rdf = Rdf::new(triples);
             let ir = schema.ir();
             for (_, shape) in ir.iter_with_targets() {
-                tracing::debug!("shape {}", shape.id());
                 let results = match shape.validate(&rdf, &mut runner, None, Some(shape), ir) {
-                    Ok(r) => {
-                        tracing::debug!("results {}", r.len());
-                        r
-                    }
+                    Ok(r) => r,
                     Err(e) => {
                         tracing::debug!("errors {}", e);
                         continue;

examples/example.ttl

@@ -3,12 +3,5 @@
 @prefix ex: <http://example.org/>.
 @prefix : <http://example.org/>.
 
-:MinInclusive a sh:NodeShape;
-  sh:targetClass :Node;
-  sh:property [
-    sh:path :p;
-    sh:minCount 2;
-  ].
-
 <abc> a :Node.
 

lang-turtle/src/lib.rs

@@ -18,7 +18,7 @@ use lov::LocalPrefix;
 use lsp_core::{
     feature::diagnostics::publish_diagnostics,
     lang::{Lang, LangHelper},
-    lsp_types::{SemanticTokenType, Url},
+    lsp_types::{SemanticTokenType, TextDocumentItem, Url},
     prelude::*,
     CreateEvent,
 };
@@ -73,7 +73,10 @@ pub fn setup_world<C: Client + ClientSync + Resource + Clone>(world: &mut World)
     });
 
     world.schedule_scope(lsp_core::Startup, |_, schedule| {
-        schedule.add_systems(extract_known_prefixes_from_config::<C>);
+        schedule.add_systems((
+            extract_known_prefixes_from_config::<C>,
+            extract_known_shapes_from_config::<C>,
+        ));
     });
 
     setup_parsing(world);
@@ -248,6 +251,71 @@ fn prefix_from_source(url: &Url, source: &str) -> Option<(Cow<'static, str>, Cow
     prefix_from_declaration(&triples).or_else(|| prefix_from_prefixes(&turtle, &triples))
 }
 
+pub fn extract_known_shapes_from_config<C: Client + ClientSync + Resource + Clone>(
+    config: Res<ServerConfig>,
+    client: Res<C>,
+    fs: Res<Fs>,
+    sender: Res<CommandSender>,
+) {
+    for on in config.config.local.shapes.iter().cloned() {
+        let c = client.clone();
+        let fs = fs.clone();
+
+        let sender = sender.0.clone();
+
+        let fut = async move {
+            let Some(files) = find(&on, &fs, &c).await else {
+                return;
+            };
+
+            for (content, url) in files {
+                let mut command_queue = CommandQueue::default();
+                let item = TextDocumentItem {
+                    version: 1,
+                    uri: url.clone(),
+                    language_id: String::from("turtle"),
+                    text: String::new(),
+                };
+
+                let spawn = spawn_or_insert(
+                    url.clone(),
+                    (
+                        RopeC(ropey::Rope::from_str(&content)),
+                        Source(content.clone()),
+                        Label(url.clone()), // this might crash
+                        Wrapped(item),
+                        Types(HashMap::new()),
+                    ),
+                    Some("turtle".into()),
+                    (Global,),
+                );
+
+                command_queue.push(move |world: &mut World| {
+                    let span = tracing::span!(tracing::Level::INFO, "span shapes");
+                    let _enter = span.enter();
+                    spawn(world);
+                    world.run_schedule(ParseLabel);
+                });
+
+                let _ = sender.unbounded_send(command_queue);
+            }
+
+            // This is the plan of approach: - add these ontologies to the predefined LOV things - need prefered prefix:
+            //          - filename.ttl -> filename
+            //          - parse and look for things?
+            //   - let the lov things also add prefixes to the prefix thing
+            //   - Profit
+
+            // spawn_or_insert(url, bundle, language_id, extra)
+            // we have the turtle files!
+            // we have 2 choices now:
+            //  add it to the ecs without links
+        };
+
+        client.spawn(fut);
+    }
+}
+
 pub fn extract_known_prefixes_from_config<C: Client + ClientSync + Resource + Clone>(
     config: Res<ServerConfig>,
     client: Res<C>,