Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes https://github.com/zazuko/rdf-validate-shacl/issues/136 #137

Merged
merged 13 commits into from
Jul 23, 2024
Merged

fixes https://github.com/zazuko/rdf-validate-shacl/issues/136 #137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7caa7a1
fixes https://github.com/zazuko/rdf-validate-shacl/issues/136
s-tittel Jul 15, 2024
67ac570
Merge branch 'zazuko:master' into master
s-tittel Jul 19, 2024
e21aa0f
fixed focusNode/shape pair id
s-tittel Jul 19, 2024
7e8549f
added test case
s-tittel Jul 19, 2024
8eb0d06
adapt test cases: reorder / deduplicate validation results
s-tittel Jul 19, 2024
0530aa5
clear already checked focus nodes when validation qualified value shapes
s-tittel Jul 19, 2024
4deaaf3
Revert "adapt test cases: reorder / deduplicate validation results"
s-tittel Jul 19, 2024
e5ce55a
Revert "clear already checked focus nodes when validation qualified v…
s-tittel Jul 19, 2024
494b615
revert commit 8eb0 and move list of checked focusNodes to engine
s-tittel Jul 19, 2024
6f37de4
move checkedNodes Set creation to initReport
s-tittel Jul 19, 2024
d0f440c
allow 'some' recursion
s-tittel Jul 20, 2024
20cb981
renamed vairables to reflect semantics and moved maxNodeChecks to opt…
s-tittel Jul 23, 2024
6041552
Create many-queens-matter.md
tpluscode Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ class SHACLValidator {
}

// Exposed to be available from validation functions as `SHACL.nodeConformsToShape`
nodeConformsToShape(focusNode, shapeNode, engine = this.validationEngine.clone()) {
nodeConformsToShape(focusNode, shapeNode, engine = this.validationEngine.clone(), resetCheckedNodes = false) {
s-tittel marked this conversation as resolved.
Show resolved Hide resolved
if (resetCheckedNodes) {
this.checkedNodes.clear()
}
const shape = this.shapesGraph.getShape(shapeNode)
try {
this.depth++
Expand Down
2 changes: 1 addition & 1 deletion src/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ function validateQualifiedHelper(context, focusNode, constraint) {
const path = constraint.shape.pathObject
return getPathObjects(context.$data, focusNode, path)
.filter(value =>
context.nodeConformsToShape(value, qualifiedValueShapeNode) &&
context.nodeConformsToShape(value, qualifiedValueShapeNode, context.validationEngine, true) &&
!validateQualifiedConformsToASibling(context, value, [...siblingShapes]),
)
.length
Expand Down