solid-server 5.8.7 → 5.8.8-5fdbfa12

package/lib/handlers/patch/{n3-patch-parser.js → n3-patch-parser.mjs}

@@ -1,59 +1,57 @@
-// Parses a text/n3 patch
-
-module.exports = parsePatchDocument
-
-const $rdf = require('rdflib')
-const error = require('../../http-error')
-
-const PATCH_NS = 'http://www.w3.org/ns/solid/terms#'
-const PREFIXES = `PREFIX solid: <${PATCH_NS}>\n`
-
-// Parses the given N3 patch document
-async function parsePatchDocument (targetURI, patchURI, patchText) {
-  // Parse the N3 document into triples
-  const patchGraph = $rdf.graph()
-  try {
-    $rdf.parse(patchText, patchGraph, patchURI, 'text/n3')
-  } catch (err) {
-    throw error(400, `Patch document syntax error: ${err}`)
-  }
-
-  // Query the N3 document for insertions and deletions
-  let firstResult
-  try { // solid/protocol v0.9.0
-    firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
-    SELECT ?insert ?delete ?where WHERE {
-      ?patch a solid:InsertDeletePatch.
-      OPTIONAL { ?patch solid:inserts ?insert. }
-      OPTIONAL { ?patch solid:deletes ?delete. }
-      OPTIONAL { ?patch solid:where   ?where.  }
-    }`)
-  } catch (err) {
-    try { // deprecated, kept for compatibility
-      firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
-      SELECT ?insert ?delete ?where WHERE {
-        ?patch solid:patches <${targetURI}>.
-        OPTIONAL { ?patch solid:inserts ?insert. }
-        OPTIONAL { ?patch solid:deletes ?delete. }
-        OPTIONAL { ?patch solid:where   ?where.  }
-      }`)
-    } catch (err) {
-      throw error(400, 'No n3-patch found.', err)
-    }
-  }
-
-  // Return the insertions and deletions as an rdflib patch document
-  const { '?insert': insert, '?delete': deleted, '?where': where } = firstResult
-  if (!insert && !deleted) {
-    throw error(400, 'Patch should at least contain inserts or deletes.')
-  }
-  return { insert, delete: deleted, where }
-}
-
-// Queries the store with the given SPARQL query and returns the first result
-function queryForFirstResult (store, sparql) {
-  return new Promise((resolve, reject) => {
-    const query = $rdf.SPARQLToQuery(sparql, false, store)
-    store.query(query, resolve, null, () => reject(new Error('No results.')))
-  })
-}
+// Parses a text/n3 patch
+
+import $rdf from 'rdflib'
+import error from '../../http-error.mjs'
+
+const PATCH_NS = 'http://www.w3.org/ns/solid/terms#'
+const PREFIXES = `PREFIX solid: <${PATCH_NS}>\n`
+
+// Parses the given N3 patch document
+export default async function parsePatchDocument (targetURI, patchURI, patchText) {
+  // Parse the N3 document into triples
+  const patchGraph = $rdf.graph()
+  try {
+    $rdf.parse(patchText, patchGraph, patchURI, 'text/n3')
+  } catch (err) {
+    throw error(400, `Patch document syntax error: ${err}`)
+  }
+
+  // Query the N3 document for insertions and deletions
+  let firstResult
+  try { // solid/protocol v0.9.0
+    firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
+    SELECT ?insert ?delete ?where WHERE {
+      ?patch a solid:InsertDeletePatch.
+      OPTIONAL { ?patch solid:inserts ?insert. }
+      OPTIONAL { ?patch solid:deletes ?delete. }
+      OPTIONAL { ?patch solid:where   ?where.  }
+    }`)
+  } catch (err) {
+    try { // deprecated, kept for compatibility
+      firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
+      SELECT ?insert ?delete ?where WHERE {
+        ?patch solid:patches <${targetURI}>.
+        OPTIONAL { ?patch solid:inserts ?insert. }
+        OPTIONAL { ?patch solid:deletes ?delete. }
+        OPTIONAL { ?patch solid:where   ?where.  }
+      }`)
+    } catch (err) {
+      throw error(400, 'No n3-patch found.', err)
+    }
+  }
+
+  // Return the insertions and deletions as an rdflib patch document
+  const { '?insert': insert, '?delete': deleted, '?where': where } = firstResult
+  if (!insert && !deleted) {
+    throw error(400, 'Patch should at least contain inserts or deletes.')
+  }
+  return { insert, delete: deleted, where }
+}
+
+// Queries the store with the given SPARQL query and returns the first result
+function queryForFirstResult (store, sparql) {
+  return new Promise((resolve, reject) => {
+    const query = $rdf.SPARQLToQuery(sparql, false, store)
+    store.query(query, resolve, null, () => reject(new Error('No results.')))
+  })
+}

package/lib/handlers/patch/{sparql-update-parser.js → sparql-update-parser.mjs}

@@ -1,16 +1,14 @@
-// Parses an application/sparql-update patch
-
-module.exports = parsePatchDocument
-
-const $rdf = require('rdflib')
-const error = require('../../http-error')
-
-// Parses the given SPARQL UPDATE document
-async function parsePatchDocument (targetURI, patchURI, patchText) {
-  const baseURI = patchURI.replace(/#.*/, '')
-  try {
-    return $rdf.sparqlUpdateParser(patchText, $rdf.graph(), baseURI)
-  } catch (err) {
-    throw error(400, `Patch document syntax error: ${err}`)
-  }
-}
+// Parses an application/sparql-update patch
+
+import $rdf from 'rdflib'
+import error from '../../http-error.mjs'
+
+// Parses the given SPARQL UPDATE document
+export default async function parsePatchDocument (targetURI, patchURI, patchText) {
+  const baseURI = patchURI.replace(/#.*/, '')
+  try {
+    return $rdf.sparqlUpdateParser(patchText, $rdf.graph(), baseURI)
+  } catch (err) {
+    throw error(400, `Patch document syntax error: ${err}`)
+  }
+}