@ulb-darmstadt/shacl-form 1.7.1 → 1.7.3

package/dist/property-template.d.ts

@@ -31,6 +31,7 @@ export declare class ShaclPropertyTemplate {
     languageIn: Term[] | undefined;
     datatype: NamedNode | undefined;
     hasValue: Term | undefined;
+    qualifiedValueShape: Term | undefined;
     owlImports: NamedNode[];
     config: Config;
     extendedShapes: NamedNode[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ulb-darmstadt/shacl-form",
-    "version": "1.7.1",
+    "version": "1.7.3",
     "description": "SHACL form generator",
     "main": "dist/form-default.js",
     "module": "dist/form-default.js",

package/src/form.ts

@@ -1,8 +1,8 @@
 import { ShaclNode } from './node'
 import { Config } from './config'
 import { ClassInstanceProvider, Plugin, listPlugins, registerPlugin } from './plugin'
-import { Store, NamedNode, DataFactory } from 'n3'
-import { DCTERMS_PREDICATE_CONFORMS_TO, RDF_PREDICATE_TYPE, SHACL_OBJECT_NODE_SHAPE, SHACL_PREDICATE_TARGET_CLASS } from './constants'
+import { Store, NamedNode, DataFactory, Quad } from 'n3'
+import { DCTERMS_PREDICATE_CONFORMS_TO, PREFIX_SHACL, RDF_PREDICATE_TYPE, SHACL_OBJECT_NODE_SHAPE, SHACL_PREDICATE_TARGET_CLASS } from './constants'
 import { Editor, Theme } from './theme'
 import { serialize } from './serialize'
 import { Validator } from 'shacl-engine'
@@ -156,6 +156,10 @@ export class ShaclForm extends HTMLElement {
 
         this.config.shapesGraph.deleteGraph('')
         this.shape?.toRDF(this.config.shapesGraph)
+        if (this.shape) {
+            // add node target for validation. this is required in case of missing sh:targetClass in root shape
+            this.config.shapesGraph.add(new Quad(this.shape.shaclSubject, DataFactory.namedNode(PREFIX_SHACL + 'targetNode'), this.shape.nodeId, undefined))
+        }
         try {
             const dataset = this.config.shapesGraph
             const report = await new Validator(dataset, { details: true, factory: DataFactory }).validate({ dataset })

package/src/property-template.ts

@@ -31,6 +31,9 @@ const mappers: Record<string, (template: ShaclPropertyTemplate, term: Term) => v
     [`${PREFIX_SHACL}languageIn`]:   (template, term) => { template.languageIn = template.config.lists[term.value]; template.datatype = DataFactory.namedNode(PREFIX_RDF + 'langString') },
     [`${PREFIX_SHACL}defaultValue`]: (template, term) => { template.defaultValue = term },
     [`${PREFIX_SHACL}hasValue`]:     (template, term) => { template.hasValue = term },
+    [`${PREFIX_SHACL}qualifiedValueShape`]:     (template, term) => { template.qualifiedValueShape = term },
+    [`${PREFIX_SHACL}qualifiedMinCount`]: (template, term) => { template.minCount = parseInt(term.value) },
+    [`${PREFIX_SHACL}qualifiedMaxCount`]: (template, term) => { template.maxCount = parseInt(term.value) },
     [OWL_PREDICATE_IMPORTS.id]:   (template, term) => { template.owlImports.push(term as NamedNode) },
     [SHACL_PREDICATE_CLASS.id]:   (template, term) => {
         template.class = term as NamedNode
@@ -79,6 +82,7 @@ export class ShaclPropertyTemplate  {
     languageIn: Term[] | undefined
     datatype: NamedNode | undefined
     hasValue: Term | undefined
+    qualifiedValueShape: Term | undefined
     owlImports: NamedNode[] = []
 
     config: Config
@@ -88,6 +92,9 @@ export class ShaclPropertyTemplate  {
         this.parent = parent
         this.config = config
         this.merge(quads)
+        if (this.qualifiedValueShape) {
+            this.merge(config.shapesGraph.getQuads(this.qualifiedValueShape, null, null, null))
+        }
     }
 
     merge(quads: Quad[]): ShaclPropertyTemplate {

package/src/property.ts

@@ -8,6 +8,7 @@ import { ShaclPropertyTemplate } from './property-template'
 import { Editor, fieldFactory } from './theme'
 import { toRDF } from './serialize'
 import { findPlugin } from './plugin'
+import { RDF_PREDICATE_TYPE, SHACL_PREDICATE_TARGET_CLASS } from './constants'
 
 export class ShaclProperty extends HTMLElement {
     template: ShaclPropertyTemplate
@@ -46,6 +47,22 @@ export class ShaclProperty extends HTMLElement {
             const values = valueSubject ? config.dataGraph.getQuads(valueSubject, this.template.path, null, null) : []
             let valuesContainHasValue = false
             for (const value of values) {
+                // ignore values that do not conform to this property.
+                // this might be the case when there are multiple properties with the same sh:path in a NodeShape.
+                if (this.template.node) {
+                    const targetClasses = config.shapesGraph.getObjects(this.template.node, SHACL_PREDICATE_TARGET_CLASS, null)
+                    if (targetClasses.length > 0) {
+                        let hasTargetClass = false
+                        for (let i = 0; i < targetClasses.length && !hasTargetClass; i++) {
+                            if (config.dataGraph.getQuads(value.object, RDF_PREDICATE_TYPE, targetClasses[i], null).length > 0) {
+                                hasTargetClass = true
+                            }        
+                        }
+                        if (!hasTargetClass) {
+                            continue
+                        }
+                    }
+                }
                 this.addPropertyInstance(value.object)
                 if (this.template.hasValue && value.object.equals(this.template.hasValue)) {
                     valuesContainHasValue = true

package/src/util.ts

@@ -85,22 +85,32 @@ function findClassInstancesFromOwlImports(clazz: NamedNode, context: ShaclNode |
 }
 
 export function findInstancesOf(clazz: NamedNode, template: ShaclPropertyTemplate, indent = 0): InputListEntry[] {
-    // find instances in the shapes graph
-    const instances: Term[] = template.config.shapesGraph.getSubjects(RDF_PREDICATE_TYPE, clazz, SHAPES_GRAPH)
-    // find instances in the data graph
-    instances.push(...template.config.dataGraph.getSubjects(RDF_PREDICATE_TYPE, clazz, null))
-    // find instances in imported taxonomies
-    findClassInstancesFromOwlImports(clazz, template, template.config.shapesGraph, instances)
-    
-    const entries = createInputListEntries(instances, template.config.shapesGraph, template.config.languages, indent)
-    for (const subClass of template.config.shapesGraph.getSubjects(RDFS_PREDICATE_SUBCLASS_OF, clazz, null)) {
-        entries.push(...findInstancesOf(subClass as NamedNode, template, indent + 1))
+    let instances: Term[]
+    // if template has sh:in, then just use that as class instances
+    if (template.shaclIn) {
+        const list = template.config.lists[template.shaclIn]
+        instances = list?.length ? list : []
+    } else {
+        // find instances in the shapes graph
+        instances = template.config.shapesGraph.getSubjects(RDF_PREDICATE_TYPE, clazz, SHAPES_GRAPH)
+        // find instances in the data graph
+        instances.push(...template.config.dataGraph.getSubjects(RDF_PREDICATE_TYPE, clazz, null))
+        // find instances in imported taxonomies
+        findClassInstancesFromOwlImports(clazz, template, template.config.shapesGraph, instances)
     }
-    if (template.config.shapesGraph.getQuads(clazz, RDF_PREDICATE_TYPE, OWL_OBJECT_NAMED_INDIVIDUAL, null).length > 0) {
-        entries.push(...createInputListEntries([ clazz ], template.config.shapesGraph, template.config.languages, indent))
-        for (const subClass of template.config.shapesGraph.getSubjects(SKOS_PREDICATE_BROADER, clazz, null)) {
+
+    const entries = createInputListEntries(instances, template.config.shapesGraph, template.config.languages, indent)
+    // build inheritance tree only if sh:in is not defined
+    if (template.shaclIn === undefined) {
+        for (const subClass of template.config.shapesGraph.getSubjects(RDFS_PREDICATE_SUBCLASS_OF, clazz, null)) {
             entries.push(...findInstancesOf(subClass as NamedNode, template, indent + 1))
         }
+        if (template.config.shapesGraph.getQuads(clazz, RDF_PREDICATE_TYPE, OWL_OBJECT_NAMED_INDIVIDUAL, null).length > 0) {
+            entries.push(...createInputListEntries([ clazz ], template.config.shapesGraph, template.config.languages, indent))
+            for (const subClass of template.config.shapesGraph.getSubjects(SKOS_PREDICATE_BROADER, clazz, null)) {
+                entries.push(...findInstancesOf(subClass as NamedNode, template, indent + 1))
+            }
+        }
     }
     return entries
 }