Working on the new architecture of the tool

.gitignore

@@ -21,4 +21,5 @@ Cargo.lock
 .idea/
 
 # Ignore virtual environments from the Python bindings
-.venv
+.venv
+.DS_Store

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "shacl_testsuite/data-shapes"]
 	path = shacl_testsuite/data-shapes
 	url = https://github.com/w3c/data-shapes.git
+[submodule "shacl_validation/tests/data-shapes"]
+	path = shacl_validation/tests/data-shapes
+	url = https://github.com/w3c/data-shapes

Cargo.toml

@@ -1,34 +1,27 @@
 [workspace]
 resolver = "2"
 members = [
-    "dctap",
+    # "dctap",
     "rbe",
-    "rbe_testsuite",
+    # "rbe_testsuite",
     "iri_s",
     "prefixmap",
     "srdf",
-    "shex_ast",
-    "shex_compact",
-    "rudof_lib",
-    "rudof_cli",
-    "shex_testsuite",
-    "shex_validation",
-    "shapemap",
+    # "shex_ast",
+    # "shex_compact",
+    # "rudof_lib",
+    # "rudof_cli",
+    # "shex_testsuite",
+    # "shex_validation",
+    # "shapemap",
     "shacl_ast",
     "shacl_validation",
-    "shacl_testsuite",
-    "shapes_converter",
+    # "shapes_converter",
     "sparql_service",
-    "python",
+    # "python",
 ]
 
-exclude = [
-    "shex_compact_winnow"
-]
-
-default-members = [
-    "rudof_cli"
-]
+exclude = ["shex_compact_winnow"]
 
 [workspace.package]
 edition = "2021"
@@ -46,37 +39,35 @@ authors = [
 ]
 
 [workspace.dependencies]
-iri_s = { version = "0.1.32", path = "./iri_s" }
-dctap = { version = "0.1.31", path = "./dctap" }
-prefixmap = { version = "0.1.32", path = "./prefixmap" }
+iri_s = { version = "*", path = "./iri_s" }
+# dctap = { version = "0.1.31", path = "./dctap" }
+prefixmap = { version = "*", path = "./prefixmap" }
 rbe = { version = "0.1.7", path = "./rbe" }
-rbe_testsuite = { version = "0.1.7", path = "./rbe_testsuite" }
-rudof_lib = { version = "0.1.35", path = "./rudof_lib" }
-rudof_cli = { version = "0.1.35", path = "./rudof_cli" }
-shex_ast = { version = "0.1.0", path = "./shex_ast" }
-shapemap = { version = "0.1.0", path = "./shapemap" }
-shacl_ast = { version = "0.1.35", path = "./shacl_ast" }
-shacl_validation = { version = "0.1.37", path = "./shacl_validation" }
-shapes_converter = { version = "0.1.33", path = "./shapes_converter" }
-shex_testsuite = { version = "0.1.0", path = "./shex_testsuite" }
-shex_validation = { version = "0.1.0", path = "./shex_validation" }
-shex_compact = { version = "0.1.0", path = "./shex_compact" }
-srdf = { version = "0.1.35", path = "./srdf" }
-sparql_service = { version = "0.1.37", path = "./sparql_service" }
+# rbe_testsuite = { version = "0.1.7", path = "./rbe_testsuite" }
+# rudof_lib = { version = "0.1.35", path = "./rudof_lib" }
+# rudof_cli = { version = "0.1.35", path = "./rudof_cli" }
+# shex_ast = { version = "0.1.0", path = "./shex_ast" }
+# shapemap = { version = "0.1.0", path = "./shapemap" }
+shacl_ast = { version = "*", path = "./shacl_ast" }
+shacl_validation = { version = "*", path = "./shacl_validation" }
+# shapes_converter = { version = "0.1.33", path = "./shapes_converter" }
+# shex_validation = { version = "0.1.0", path = "./shex_validation" }
+# shex_compact = { version = "0.1.0", path = "./shex_compact" }
+srdf = { version = "*", path = "./srdf" }
+sparql_service = { version = "*", path = "./sparql_service" }
 
-# [dependencies]
-# External dependencies
 anyhow = "1.0"
-clap = { version = "4.2.1", features = ["derive"] }
-colored = "2"
-indexmap = "2.1"
-oxrdf = "0.2.0-alpha.5"
+clap = { version = "4.5.23", features = ["derive"] }
+colored = "2.2.0"
+indexmap = { version = "2", features = ["serde"] }
 regex = "1.10.4"
 supports-color = "3.0.0"
-serde = "1"
+serde = "1.0.216"
 serde_json = "1.0"
-serde_derive = "1"
+serde_derive = "1.0.216"
 serde_yml = "0.0.12"
-thiserror = "1.0"
+thiserror = "2.0.8"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = [ "env-filter" ] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+lazy_static = "1"
+oxrdf = "0.2.0"

iri_s/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iri_s"
-version = "0.1.32"
+version = "0.1.58"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/iri_s"
@@ -10,15 +10,12 @@ homepage.workspace = true
 repository.workspace = true
 
 [features]
-default = []
-rdf-star = [ "oxrdf/rdf-star" ]
 
 [dependencies]
-lazy_static = "1"
-oxrdf = { version = "0.2.0-alpha.5" }
-oxiri = "0.2.3-alpha.1"
+lazy_static = { workspace = true }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+thiserror = { workspace = true }
+oxiri = "0.2.0-alpha.5"
 reqwest = { version = "0.12", features = ["blocking", "json"] }
-serde = "1.0"
-serde_derive = "1.0"
-thiserror = "1.0.0"
 url = "2.2.2"

iri_s/README.md

@@ -0,0 +1,3 @@
+# IriS
+
+IriS acts as a wrapper for the actual IRI, allowing for a simple interaction

iri_s/src/error.rs

@@ -0,0 +1,41 @@
+use thiserror::Error;
+
+#[derive(Error, Debug, Clone)]
+pub enum GenericIriError {
+    #[error("Error parsing {str} as IRI. Error: {err}")]
+    IriParse { str: String, err: String },
+    #[error("Error parsing {str} using base: {base} as IRI. Error: {err}")]
+    IriWithBaseParse {
+        str: String,
+        base: String,
+        err: String,
+    },
+    #[error("Error resolving IRI `{other}` with base IRI `{base}`. Error: {err}")]
+    IriResolve {
+        base: String,
+        other: String,
+        err: String,
+    },
+    #[error("Error joining IRI `{current}` with `{str}`. Error: {err}")]
+    Join {
+        current: String,
+        str: String,
+        err: String,
+    },
+    #[error("Error creating reqwest HTTP client. Error: {error}")]
+    ReqwestClientCreation { error: String },
+    #[error("Error parsing Iri {str} as Url. Error: {error}")]
+    UrlParse { str: String, error: String },
+    #[error("HTTP request error: {error}")]
+    Reqwest { error: String },
+    #[error("HTTP request error as String: {error}")]
+    ReqwestText { error: String },
+    #[error("Error trying to obtain a path from file scheme Url: {url}")]
+    ConvertingFileUrlToPath { url: String },
+    #[error("Error reading from file {path} obtained from url {url}. Error: {error}")]
+    IO {
+        path: String,
+        url: String,
+        error: String,
+    },
+}