Function term rewrite with 'termType'

Function parse rewrite based on function term

Author: ddvlanck

lib/ParserStream.js

@@ -2,19 +2,21 @@ const concat = require('concat-stream')
 const jsonld = require('jsonld')
 const rdf = require('rdf-data-model')
 const Readable = require('readable-stream')
+const dataModel = require('@rdfjs/data-model')
+const terms = require('rdf-terms')
 
 class ParserStream extends Readable {
   constructor (input, options) {
     super({
       objectMode: true,
-      read: () => {}
+      read: () => {
+      }
     })
 
     options = options || {}
 
     this.baseIRI = options.baseIRI || ''
     this.context = options.context
-    this.factory = options.factory || rdf
     this.blankNodes = {}
 
     const concatStream = concat({encoding: 'string'}, (data) => {
@@ -30,59 +32,49 @@ class ParserStream extends Readable {
         this.emit('error', err)
       })
     })
-
     input.pipe(concatStream)
 
     input.on('error', (err) => {
       this.emit('error', err)
     })
   }
 
-  term (options) {
-    if (options.type === 'IRI') {
-      return this.factory.namedNode(options.value)
-    }
-
-    if (options.type === 'blank node') {
-      if (!(options.value in this.blankNodes)) {
-        this.blankNodes[options.value] = this.factory.blankNode()
-      }
-
-      return this.blankNodes[options.value]
+  term (term) {
+    switch (term.termType) {
+      case 'NamedNode':
+        return dataModel.namedNode(term.value)
+      case 'BlankNode':
+        return dataModel.blankNode(term.value.substr(2)) // Remove the '_:' prefix.
+      case 'Literal':
+        return dataModel.literal(term.value, term.language || term.datatype)
+      case 'DefaultGraph':
+        return dataModel.defaultGraph()
     }
-
-    return this.factory.literal(options.value, options.language || options.datatype)
   }
 
   parse (data) {
     return ParserStream.toJson(data).then((json) => {
-      // forward context as prefixes if available
+            // forward context as prefixes if available
       if ('@context' in json) {
         Object.keys(json['@context']).forEach((prefix) => {
-          this.emit('prefix', prefix, this.factory.namedNode(json['@context'][prefix]))
+          this.emit('prefix', prefix, dataModel.namedNode(json['@context'][prefix]))
         })
       }
 
       const toRdfOptions = {base: this.baseIRI}
 
-      // use context from options if given
+            // use context from options if given
       if (this.context) {
         toRdfOptions.expandContext = this.context
       }
 
       return jsonld.promises().toRDF(json, toRdfOptions)
     }).then((rawGraph) => {
-      Object.keys(rawGraph).forEach((graphIri) => {
-        const graph = graphIri !== '@default' ? this.factory.namedNode(graphIri) : null
-
-        rawGraph[graphIri].forEach((triple) => {
-          this.push(this.factory.quad(
-            this.term(triple.subject),
-            this.term(triple.predicate),
-            this.term(triple.object),
-            graph))
-        })
-      })
+      for (let index in rawGraph) {
+        this.push(terms.mapTerms(rawGraph[index], this.term))
+      }
+    }).catch((error) => {
+      this.emit('error', error)
     })
   }