rdflib 2.2.22-2cea0982 → 2.2.22-2f49e8ef

package/src/jsonldparser.js

@@ -22,7 +22,7 @@ export function jsonldObjectToTerm (kb, obj) {
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return nodeType(kb, obj)
+    return kb.rdfFactory.namedNode(obj['@id'])
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
@@ -44,7 +44,7 @@ export function jsonldObjectToTerm (kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements (kb, obj) {
-  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode()
+  const listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode()
 
   const items = obj['@list'].map((listItem => jsonldObjectToTerm(kb, listItem)))
   const statements = arrayToStatements(kb.rdfFactory, listId, items)
@@ -82,19 +82,10 @@ export default function jsonldParser (str, kb, base, callback) {
     .catch(callback)
 }
 
-function nodeType (kb, obj) {
-  if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node. Pass the id without the `_:` prefix
-    return kb.rdfFactory.blankNode(obj['@id'].substring(2));
-  } else {
-    // This object is a Named Node
-    return kb.rdfFactory.namedNode(obj['@id']);
-  }
-}
 
 function processResource(kb, base, flatResource) {
   const id = flatResource['@id']
-    ? nodeType(kb, flatResource)
+    ? kb.rdfFactory.namedNode(flatResource['@id'])
     : kb.rdfFactory.blankNode()
 
   for (const property of Object.keys(flatResource)) {
@@ -145,4 +136,4 @@ function createStatement(kb, id, property, value, base) {
     object = jsonldObjectToTerm(kb, value)
   }
   return kb.rdfFactory.quad(id, predicate, object, kb.rdfFactory.namedNode(base))
-}
+}

package/src/serialize.ts

@@ -1,3 +1,4 @@
+import * as convert from './convert'
 import Formula from './formula'
 import Serializer from './serializer'
 import {
@@ -41,7 +42,7 @@ export default function serialize (
      */
     namespaces?: Record<string, string>
   }
-): string | undefined | Promise<string> {
+): string | undefined {
   base = base || target?.value
   const opts = options || {}
   contentType = contentType || TurtleContentType // text/n3 if complex?
@@ -50,6 +51,7 @@ export default function serialize (
     var sz = Serializer(kb)
     if ((opts as any).flags) sz.setFlags((opts as any).flags)
     var newSts = kb!.statementsMatching(undefined, undefined, undefined, target as NamedNode)
+    var n3String: string
 
     // If an IndexedFormula, use the namespaces from the given graph as suggestions
     if ('namespaces' in kb) {
@@ -80,14 +82,19 @@ export default function serialize (
         documentString = sz.statementsToNTriples(newSts)
         return executeCallback(null, documentString)
       case JSONLDContentType:
-        sz.setFlags('si') // use turtle parameters
-        documentString = sz.statementsToJsonld(newSts) // convert via turtle
-        return executeCallback(null, documentString)
+        sz.setFlags('deinprstux') // Use adapters to connect to incmpatible parser
+        n3String = sz.statementsToNTriples(newSts)
+        // n3String = sz.statementsToN3(newSts)
+        convert.convertToJson(n3String, callback)
+        break
       case NQuadsContentType:
       case NQuadsAltContentType: // @@@ just outpout the quads? Does not work for collections
         sz.setFlags('deinprstux q') // Suppress nice parts of N3 to make ntriples
         documentString = sz.statementsToNTriples(newSts) // q in flag means actually quads
         return executeCallback(null, documentString)
+        // n3String = sz.statementsToN3(newSts)
+        // documentString = convert.convertToNQuads(n3String, callback)
+        // break
       default:
         throw new Error('Serialize: Content-type ' + contentType + ' not supported for data write.')
     }

package/src/serializer.js

@@ -12,8 +12,6 @@ import * as Util from './utils-js'
 import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
 import solidNs from 'solid-namespace'
-// import * as jsonld from 'jsonld'
-import * as ttl2jsonld from '@frogcat/ttl2jsonld'
 
 
 export default function createSerializer(store) {
@@ -1013,28 +1011,6 @@ export class Serializer {
     var tree2 = [str, tree, '</rdf:RDF>'] // @@ namespace declrations
     return XMLtreeToString(tree2, -1)
   } // End @@ body
-
-  statementsToJsonld (sts) {
-    // ttl2jsonld creates context keys for all ttl prefix
-    // context keys must be full IRI
-    function findId (itemObj) {
-      if (itemObj['@id']) {
-        const item = itemObj['@id'].split(':')
-        if (keys[item[0]]) itemObj['@id'] = jsonldObj['@context'][item[0]] + item[1]
-      }
-      const itemValues = Object.values(itemObj)
-      for (const i in itemValues) {
-        if (typeof itemValues[i] !== 'string') { // @list contains array
-          findId(itemValues[i])
-        }
-      }
-    }
-    const turtleDoc = this.statementsToN3(sts)
-    const jsonldObj = ttl2jsonld.parse(turtleDoc)
-
-    return JSON.stringify(jsonldObj, null, 2)
-  }
-
 }
 
 // String escaping utilities