feat: complex arguments

rdf-connect · Jul 1, 2024 · 41aeef9 · 41aeef9
1 parent f24638f
commit 41aeef9
Show file tree

Hide file tree

Showing 28 changed files with 1,299 additions and 660 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -91,6 +91,10 @@ dependencies {
   // TOML parser.
   implementation("org.tomlj:tomlj:1.1.1")
 
+  // Arrow functional library.
+  implementation("io.arrow-kt:arrow-core:1.2.4")
+  implementation("io.arrow-kt:arrow-fx-coroutines:1.2.4")
+
   // gRPC
   implementation("io.grpc:grpc-netty:1.64.0")
   implementation("io.grpc:grpc-protobuf:1.64.0")
@@ -108,6 +112,7 @@ dependencies {
   // RDF dependencies.
   implementation("org.apache.jena:apache-jena-libs:5.0.0")
   implementation("org.apache.jena:jena-arq:5.0.0")
+  implementation("org.apache.jena:jena-shacl:5.0.0")
 
   // Hide SLF4J warnings.
   implementation("org.slf4j:slf4j-nop:2.0.7")

diff --git a/proto/intermediate.proto b/proto/intermediate.proto
@@ -23,10 +23,17 @@ enum IRParameterCount {
   LIST = 1;
 }
 
+message IRParameters {
+  map<string, IRParameter> parameters = 1;
+}
+
 message IRParameter {
-  IRParameterType type = 1;
-  IRParameterPresence presence = 2;
-  IRParameterCount count = 3;
+  oneof type {
+    IRParameterType simple = 1;
+    IRParameters complex = 2;
+  }
+  IRParameterPresence presence = 3;
+  IRParameterCount count = 4;
 }
 
 message IRProcessor {
@@ -35,9 +42,23 @@ message IRProcessor {
   map<string, string> metadata = 3;
 }
 
+message IRArgumentSimple {
+  repeated string value = 1;
+}
+
+message IRArgumentMap {
+  map<string, IRArgument> arguments = 1;
+}
+
+message IRArgumentComplex {
+  repeated IRArgumentMap value = 1;
+}
+
 message IRArgument {
-  IRParameter parameter = 1;
-  repeated string value = 2;
+  oneof value {
+    IRArgumentSimple simple = 1;
+    IRArgumentComplex complex = 2;
+  }
 }
 
 message IRStage {