Audit fixes, RDF library upgrade

package.json

@@ -8,13 +8,13 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "turbo": "2.0.5",
-    "@changesets/cli": "^2.x.x",
     "@babel/cli": "^7.24.1",
     "@babel/core": "^7.24.3",
     "@babel/node": "^7.23.9",
     "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-    "@babel/preset-env": "^7.24.3"
+    "@babel/preset-env": "^7.24.3",
+    "@changesets/cli": "^2.x.x",
+    "turbo": "2.0.5"
   },
   "packageManager": "[email protected]",
   "scripts": {

packages/credential-sdk/package.json

@@ -31,11 +31,11 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@comunica/actor-init-sparql-rdfjs": "^1.22.3",
+    "@comunica/query-sparql-rdfjs": "^4.0.2",
     "@digitalcredentials/vc-status-list": "^8.0.0",
     "@docknetwork/crypto-wasm-ts": "^0.63.0",
     "@juanelas/base64": "^1.1.5",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "^0.25.0",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "^0.26.0",
     "@stablelib/ed25519": "^1.0.0",
     "@subsquid/ss58-codec": "latest",
     "@transmute/json-web-signature": "^0.7.0-unstable.82",

packages/credential-sdk/src/rdf-and-cd/rdf.js

@@ -66,17 +66,17 @@ export async function queryNextLookup(claimgraph, query, engine) {
 
   // Query the engine, if querying multiple times user should
   // pass engine parameter for optimal performance
-  const result = await engine.query(query, { sources: [store] });
+  const bindingsStream = await engine.queryBindings(query, { sources: [store] });
 
   // Get bindings from query
-  const bindings = await result.bindings();
+  const bindings = await bindingsStream.toArray();
 
   // Convert bindings to claimgraph format using lookupNext variable
   bindings.forEach((b) => assert(
-    b.get('?lookupNext') !== undefined,
-    "Query for next lookup must always bind '?lookupNext'",
+    b.get('lookupNext') !== undefined,
+    "Query for next lookup must always bind 'lookupNext'",
   ));
-  return bindings.map((binding) => fromJsonldjsNode(binding.get('?lookupNext')));
+  return bindings.map((binding) => fromJsonldjsNode(binding.get('lookupNext')));
 }
 
 /**

packages/credential-sdk/tests/crawl.test.js

@@ -1,4 +1,4 @@
-import { newEngine } from "@comunica/actor-init-sparql-rdfjs";
+import { QueryEngine } from "@comunica/query-sparql-rdfjs";
 
 import { crawl } from "../src/rdf-and-cd";
 import { ANYCLAIM, MAYCLAIM, MAYCLAIM_DEF_1 } from "../src/rdf-and-cd";
@@ -72,7 +72,7 @@ describe("Crawler unit tests", () => {
       RULES,
       CURIOSITY,
       resolveGraph,
-      newEngine()
+      new QueryEngine()
     );
     expect(allFacts).toEqual([
       [

packages/credential-sdk/tests/rdf-turtle.test.js

@@ -1,4 +1,4 @@
-import { newEngine } from "@comunica/actor-init-sparql-rdfjs";
+import { QueryEngine } from "@comunica/query-sparql-rdfjs";
 import { parseRDFDocument, queryNextLookup } from "../src/rdf-and-cd";
 
 const rdfInputs = [
@@ -48,15 +48,15 @@ const claimgraph = [
 
 describe("RDF SPARQL", () => {
   test("Can query an RDF source (dbpedia)", async () => {
-    const engine = newEngine();
+    const engine = new QueryEngine();
     const query =
       "SELECT * { ?s ?p <http://dbpedia.org/resource/Belgium>. ?s ?p ?lookupNext } LIMIT 2";
     const newGraph = await queryNextLookup(dbpediaSource, query, engine);
     expect(newGraph).toEqual([{ Iri: "http://dbpedia.org/resource/Belgium" }]);
   });
 
   test("Can query a claimgraph", async () => {
-    const engine = newEngine();
+    const engine = new QueryEngine();
     const query = `prefix dockalpha: <http://rdf.dock.io/alpha/2021#>
     select * {
       ?root dockalpha:mayClaim dockalpha:ANYCLAIM .