Try to find and fix broken blank node parsing

Author: ajuvercr

Cargo.lock

@@ -32,13 +32,22 @@ lov = { path = "../lov/" }
 
 oxigraph = { version = "0.5.3", features = ["rdf-12", "js"], default-features=false }
 
-shacl_rdf = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-shacl_ir = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-srdf = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-shacl_ast = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-prefixmap = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-iri_s = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-shacl_validation = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
-
 oxrdf = "0.3.2"
 
+# shacl_rdf = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# shacl_ir = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# srdf = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# shacl_ast = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# prefixmap = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# iri_s = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+# shacl_validation = { git = "https://github.com/ajuvercr/rudof", branch = "feat/wasm-2" }
+#
+
+# [patch."https://github.com/ajuvercr/rudof"]
+shacl_rdf = { path = "../../rudof/shacl_rdf" }
+shacl_ir = { path = "../../rudof/shacl_ir" }
+srdf = { path = "../../rudof/srdf" }
+shacl_ast = { path = "../../rudof/shacl_ast" }
+prefixmap = { path = "../../rudof/prefixmap" }
+iri_s = { path = "../../rudof/iri_s" }
+shacl_validation = { path = "../../rudof/shacl_validation", default-features = false }

core/Cargo.toml

@@ -280,7 +280,110 @@ pub struct LocalConfig {
     pub shapes: HashSet<String>,
     /// Features to disable
     pub disabled: HashSet<Disabled>,
+    /// disable which prefices from prefix.cc to show
     pub prefix_disabled: HashSet<String>,
+    /// confiure completion behavior
+    pub completion: CompletionConfig,
+}
+
+/// Lets the user configure how the property completion should happen.
+/// There are two main modes: strict and loose (default)
+/// On loose, the editor will suggest anything, not caring about the domain.
+/// On strict, the editor will only suggest property that have a matching domain or anything if the
+/// type could not be determined.
+///
+/// Both options can be specialized, ie only strict on these properties or only loose on these
+/// properties.
+///
+/// For example { loose: ["http://www.w3.org/2000/01/rdf-schema#"] }, here the editor will be strict, and show properties
+/// from rdfs
+/// On the other hand { strict: ["http://www.w3.org/ns/shacl#"] }, here the editor will be loose,
+/// and only show shacl properties if the objects is the correct type
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
+#[serde(untagged)]
+pub enum CompletionConfig {
+    // "strict" | "loose" | "none"
+    Mode(CompletionMode),
+
+    // { "except": [...] }
+    Except(ExceptRules),
+
+    // { "strict": [...] }
+    Strict(StrictRules),
+}
+
+impl Default for CompletionConfig {
+    fn default() -> Self {
+        Self::Mode(CompletionMode::None)
+    }
+}
+
+impl CompletionConfig {
+    fn combine(&mut self, other: CompletionConfig) {
+        use CompletionConfig::*;
+
+        if matches!(other, Mode(CompletionMode::None)) {
+            return;
+        }
+
+        if matches!(self, Mode(CompletionMode::None)) {
+            *self = other;
+            return;
+        }
+
+        if let Strict(r) = self {
+            if let Strict(r2) = other {
+                r.strict.extend(r2.strict);
+                return;
+            }
+        }
+
+        if let Except(r) = self {
+            if let Except(r2) = other {
+                r.loose.extend(r2.loose);
+                return;
+            }
+        }
+
+        *self = other;
+    }
+    pub fn correct_domain_required(&self, property: &str) -> bool {
+        match self {
+            CompletionConfig::Mode(CompletionMode::Loose)
+            | CompletionConfig::Mode(CompletionMode::None) => false,
+            CompletionConfig::Mode(CompletionMode::Strict) => true,
+            CompletionConfig::Except(completion_rules) => !completion_rules
+                .loose
+                .iter()
+                .any(|x| property.starts_with(x)),
+            CompletionConfig::Strict(completion_rules) => completion_rules
+                .strict
+                .iter()
+                .any(|x| property.starts_with(x)),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Default, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum CompletionMode {
+    #[default]
+    None,
+    Loose,
+    Strict,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Default)]
+#[serde(deny_unknown_fields)]
+pub struct ExceptRules {
+    #[serde(default)]
+    pub loose: Vec<String>,
+}
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Default)]
+#[serde(deny_unknown_fields)]
+pub struct StrictRules {
+    #[serde(default)]
+    pub strict: Vec<String>,
 }
 
 impl LocalConfig {
@@ -290,11 +393,13 @@ impl LocalConfig {
         self.shapes.extend(other.shapes);
         self.disabled.extend(other.disabled);
         self.prefix_disabled.extend(other.prefix_disabled);
+        self.completion.combine(other.completion);
     }
     #[cfg(target_arch = "wasm32")]
     pub async fn global(_: &Fs) -> Option<Self> {
         None
     }
+
     #[cfg(not(target_arch = "wasm32"))]
     pub async fn global(fs: &Fs) -> Option<Self> {
         let global_path = dirs::config_dir()