linkedql: Correct type handling in client

cayleygraph · Dec 15, 2019 · abd548c · abd548c
1 parent 13579de
commit abd548c
Show file tree

Hide file tree

Showing 5 changed files with 457 additions and 330 deletions.
diff --git a/cmd/generate_linkedql_client/generate_linkedql_client.go b/cmd/generate_linkedql_client/generate_linkedql_client.go
@@ -23,7 +23,9 @@ import (
 const schemaFile = "linkedql.json"
 const outputFilePath = "query/linkedql/client/client.go"
 
+var stepIRI = quad.IRI("http://cayley.io/linkedql#Step")
 var pathStepIRI = quad.IRI("http://cayley.io/linkedql#PathStep")
+var iteratorStepIRI = quad.IRI("http://cayley.io/linkedql#IteratorStep")
 
 func main() {
 	ctx := context.TODO()
@@ -33,7 +35,7 @@ func main() {
 		panic(err)
 	}
 
-	stepClass, err := owl.GetClass(ctx, qs, pathStepIRI)
+	stepClass, err := owl.GetClass(ctx, qs, stepIRI)
 
 	if err != nil {
 		panic(err)
@@ -43,6 +45,9 @@ func main() {
 	var decls []ast.Decl
 
 	for _, stepSubClass := range stepSubClasses {
+		if stepSubClass.Identifier == pathStepIRI || stepSubClass.Identifier == iteratorStepIRI {
+			continue
+		}
 		stepSubClassDecls, err := stepSubClassToDecls(stepSubClass)
 		if err != nil {
 			panic(err)

diff --git a/internal/linkedql/schema/schema.go b/internal/linkedql/schema/schema.go
@@ -250,6 +250,23 @@ func (g *generator) Generate() []byte {
 			Range:  rng,
 		})
 	}
+	graph := []interface{}{
+		map[string]string{
+			"@id":   "linkedql:Step",
+			"@type": "owl:Class",
+		},
+		map[string]interface{}{
+			"@id":             "linkedql:PathStep",
+			"@type":           "owl:Class",
+			"rdfs:subClassOf": map[string]string{"@id": "linkedql:Step"},
+		},
+		map[string]interface{}{
+			"@id":             "linkedql:IteratorStep",
+			"@type":           "owl:Class",
+			"rdfs:subClassOf": map[string]string{"@id": "linkedql:Step"},
+		},
+	}
+	graph = append(graph, g.out...)
 	data, err := json.Marshal(map[string]interface{}{
 		"@context": map[string]interface{}{
 			"rdf":      map[string]string{"@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#"},
@@ -258,7 +275,7 @@ func (g *generator) Generate() []byte {
 			"xsd":      map[string]string{"@id": "http://www.w3.org/2001/XMLSchema#"},
 			"linkedql": map[string]string{"@id": "http://cayley.io/linkedql#"},
 		},
-		"@graph": g.out,
+		"@graph": graph,
 	})
 	if err != nil {
 		panic(err)