Merge pull request #130 from zazuko/list-perf

perf: reuse sh:in nodeSet
zazuko · Apr 16, 2024 · 1bb0383 · 1bb0383
2 parents f2411d6 + 1329680
commit 1bb0383
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/.changeset/olive-points-double.md b/.changeset/olive-points-double.md
@@ -0,0 +1,5 @@
+---
+"rdf-validate-shacl": patch
+---
+
+Improve performance of validating `sh:in` constraints
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,11 +36,11 @@
     "@changesets/cli": "^2.22.0",
     "@rdfjs/parser-n3": "^2.0.1",
     "@tpluscode/eslint-config": "^0.4.4",
+    "@zazuko/env-node": "^2",
     "c8": "^8.0.1",
     "get-stream": "^6.0.0",
     "mocha": "^10.2.0",
     "nanoid": "^4.0.2",
-    "@zazuko/env-node": "^2",
     "rdf-ext": "^2.5.1",
     "rdf-utils-dataset": "^2.0.0"
   },

diff --git a/src/validators.js b/src/validators.js
@@ -132,9 +132,13 @@ function validateHasValueProperty(context, focusNode, valueNode, constraint) {
 
 function validateIn(context, focusNode, valueNode, constraint) {
   const { sh } = context.ns
-  const inNode = constraint.getParameterValue(sh.in)
+  if (!constraint.nodeSet) {
+    const inNode = constraint.getParameterValue(sh.in)
+    constraint.nodeSet = new NodeSet(rdfListToArray(context.$shapes.node(inNode)))
+  }
+  const { nodeSet } = constraint
 
-  return new NodeSet(rdfListToArray(context.$shapes.node(inNode))).has(valueNode)
+  return nodeSet.has(valueNode)
 }
 
 function validateLanguageIn(context, focusNode, valueNode, constraint) {