refactor: do not rely on rdf-ext interface

zazuko · Aug 24, 2023 · abf6b48 · abf6b48
1 parent a207bad
commit abf6b48
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/packages/formats/csvw.js b/packages/formats/csvw.js
@@ -1,15 +1,7 @@
 import sinkToDuplex from '@rdfjs/sink-to-duplex'
-import rdf from '@zazuko/env'
 import CsvwParser from 'rdf-parser-csvw'
 import tracer from './lib/tracer.js'
-
-function toDataset(streamOrDataset) {
-  if (!streamOrDataset.readable) {
-    return Promise.resolve(streamOrDataset)
-  }
-
-  return rdf.dataset().import(streamOrDataset)
-}
+import { toDataset } from './lib/stream.js'
 
 function parse(args) {
   let metadata

diff --git a/packages/formats/lib/stream.js b/packages/formats/lib/stream.js
@@ -0,0 +1,10 @@
+import fromStream from 'rdf-dataset-ext/fromStream.js'
+import rdf from '@zazuko/env'
+
+export function toDataset(streamOrDataset) {
+  if (!streamOrDataset.readable) {
+    return Promise.resolve(streamOrDataset)
+  }
+
+  return fromStream(rdf.dataset(), streamOrDataset)
+}
diff --git a/packages/formats/package.json b/packages/formats/package.json
@@ -28,13 +28,13 @@
     "@rdfjs/sink-to-duplex": "^1.0.0",
     "@zazuko/env": "^1.1.0",
     "barnard59-base": "^1.0.0",
+    "rdf-dataset-ext": "^1.0.1",
     "rdf-parser-csvw": "^0.15.0",
     "rdf-parser-csvw-xlsx": "^0.1.0",
     "rdfxml-streaming-parser": "^1.2.0"
   },
   "devDependencies": {
-    "chai": "^4.3.7",
-    "rdf-dataset-ext": "^1.0.1"
+    "chai": "^4.3.7"
   },
   "engines": {
     "node": ">= 14.0.0"

diff --git a/packages/formats/xlsx.js b/packages/formats/xlsx.js
@@ -1,15 +1,7 @@
 import sinkToDuplex from '@rdfjs/sink-to-duplex'
-import rdf from '@zazuko/env'
 import CsvwXlsxParser from 'rdf-parser-csvw-xlsx'
 import tracer from './lib/tracer.js'
-
-function toDataset(streamOrDataset) {
-  if (!streamOrDataset.readable) {
-    return Promise.resolve(streamOrDataset)
-  }
-
-  return rdf.dataset().import(streamOrDataset)
-}
+import { toDataset } from './lib/stream.js'
 
 function parse(args) {
   let metadata