Use sh:nodeKind only as fallback

ektrah · Nov 5, 2024 · 559c8ae · 559c8ae
1 parent 0d5cc19
commit 559c8ae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/schema/src/decompiler/shacl.ts b/packages/schema/src/decompiler/shacl.ts
@@ -30,8 +30,8 @@ export default function decompile(graph: Graph, builder: SchemaBuilder): void {
                 .concat(graph.objects(propertyShape, Shacl.xone).concatMap(x => splitOr(x, graph)))
                 .concat(graph.objects(propertyShape, Shacl.hasValue))
                 .concat(graph.objects(propertyShape, Shacl.node))
-                .concat(graph.objects(propertyShape, Shacl.nodeKind).concatMap(x => mapNodeKindToClass(x)))
-                .concat(graph.objects(propertyShape, Shacl.qualifiedValueShape).concatMap(x => extract(x, graph)));
+                .concat(graph.objects(propertyShape, Shacl.qualifiedValueShape).concatMap(x => extract(x, graph)))
+                .concatIfEmpty(graph.objects(propertyShape, Shacl.nodeKind).concatMap(x => mapNodeKindToClass(x)));
 
             const minCount = graph.objects(propertyShape, Shacl.minCount)
                 .concat(graph.objects(propertyShape, Shacl.qualifiedMinCount))