From 7d6a17ae3b0e9e2fda199d82b5aad2c3654e658d Mon Sep 17 00:00:00 2001
From: Ludovic Muller <ludovicmuller1@gmail.com>
Date: Tue, 27 Aug 2024 08:06:38 +0200
Subject: [PATCH] handler-fetch: upgrade oxigraph to 0.4.0-rc.1

---
 .changeset/lazy-glasses-attend.md             |  5 ++++
 package-lock.json                             |  2 +-
 packages/handler-fetch/lib/query.js           | 26 ++++++++++++++-----
 packages/handler-fetch/lib/worker.js          |  2 +-
 packages/handler-fetch/package.json           |  2 +-
 .../handler-fetch/test/handler-fetch.test.js  |  2 +-
 6 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/lazy-glasses-attend.md

diff --git a/.changeset/lazy-glasses-attend.md b/.changeset/lazy-glasses-attend.md
new file mode 100644
index 00000000..0ae9ad08
--- /dev/null
+++ b/.changeset/lazy-glasses-attend.md
@@ -0,0 +1,5 @@
+---
+"trifid-handler-fetch": patch
+---
+
+Upgrade Oxigraph to 0.4.0-rc.1.
diff --git a/package-lock.json b/package-lock.json
index e7a4e6e0..56503102 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15247,7 +15247,7 @@
       "version": "3.3.1",
       "license": "MIT",
       "dependencies": {
-        "oxigraph": "^0.4.0-alpha.7",
+        "oxigraph": "^0.4.0-rc.1",
         "uuid": "^10.0.0"
       },
       "devDependencies": {
diff --git a/packages/handler-fetch/lib/query.js b/packages/handler-fetch/lib/query.js
index c0363089..77221246 100644
--- a/packages/handler-fetch/lib/query.js
+++ b/packages/handler-fetch/lib/query.js
@@ -19,19 +19,31 @@ export const performOxigraphQuery = async (store, query) => {
 
   try {
     if (isConstructQuery) {
-      contentType = 'application/n-quads'
-      results = store.query(query, {
+      const queryResults = store.query(query, {
         use_default_graph_as_union: true,
-      }).map((quad) => quad.toString()).join('.\n')
-      if (results) {
-        results = `${results}.\n`
+      })
+      if (Array.isArray(queryResults)) {
+        contentType = 'application/n-quads'
+        results = queryResults.map((quad) => quad.toString()).join('.\n')
+        if (results) {
+          results = `${results}.\n`
+        }
+      } else {
+        contentType = 'text/plain'
+        results = 'Something went wrong while getting the query results (expected array).'
       }
     } else {
-      contentType = 'application/sparql-results+json'
-      results = store.query(query, {
+      const queryResults = store.query(query, {
         use_default_graph_as_union: true,
         results_format: 'json',
       })
+      if (typeof queryResults === 'string') {
+        contentType = 'application/sparql-results+json'
+        results = queryResults
+      } else {
+        contentType = 'text/plain'
+        results = 'Something went wrong while getting the query results (expected string).'
+      }
     }
   } catch (error) {
     contentType = 'text/plain'
diff --git a/packages/handler-fetch/lib/worker.js b/packages/handler-fetch/lib/worker.js
index bffc50e7..f853e5c2 100644
--- a/packages/handler-fetch/lib/worker.js
+++ b/packages/handler-fetch/lib/worker.js
@@ -70,7 +70,7 @@ const handleConfig = async (config) => {
   store.load(data, {
     format: contentType,
     base_iri: baseIri,
-    to_named_graph: graphNameIri,
+    to_graph_name: graphNameIri,
   })
   parentPort.postMessage({
     type: 'log',
diff --git a/packages/handler-fetch/package.json b/packages/handler-fetch/package.json
index 020b69a6..22429c72 100644
--- a/packages/handler-fetch/package.json
+++ b/packages/handler-fetch/package.json
@@ -28,7 +28,7 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "oxigraph": "^0.4.0-alpha.7",
+    "oxigraph": "^0.4.0-rc.1",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/handler-fetch/test/handler-fetch.test.js b/packages/handler-fetch/test/handler-fetch.test.js
index 699e42e6..df03698b 100644
--- a/packages/handler-fetch/test/handler-fetch.test.js
+++ b/packages/handler-fetch/test/handler-fetch.test.js
@@ -37,7 +37,7 @@ describe('trifid-handler-fetch', () => {
     `, {
       format: 'text/turtle',
       base_iri: 'http://example.org/',
-      to_named_graph: oxigraph.defaultGraph(),
+      to_graph_name: oxigraph.defaultGraph(),
     })
   })