rdflib 2.2.22-4e175603 → 2.2.22-53d65d90

package/esm/serialize.js

@@ -1,7 +1,5 @@
 import Serializer from './serializer';
 import { JSONLDContentType, N3ContentType, N3LegacyContentType, NQuadsAltContentType, NQuadsContentType, NTriplesContentType, RDFXMLContentType, TurtleContentType, TurtleLegacyContentType } from './types';
-import * as jsonld from 'jsonld';
-
 /**
  * Serialize to the appropriate format
  */
@@ -14,14 +12,13 @@ kb, base,
  */
 contentType, callback, options) {
   base = base || (target === null || target === void 0 ? void 0 : target.value);
-  const opts = options || {};
+  var opts = options || {};
   contentType = contentType || TurtleContentType; // text/n3 if complex?
   var documentString = undefined;
   try {
     var sz = Serializer(kb);
     if (opts.flags) sz.setFlags(opts.flags);
     var newSts = kb.statementsMatching(undefined, undefined, undefined, target);
-    var n3String;
 
     // If an IndexedFormula, use the namespaces from the given graph as suggestions
     if ('namespaces' in kb) {
@@ -51,10 +48,9 @@ contentType, callback, options) {
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
       case JSONLDContentType:
-        sz.setFlags('deinprstux'); // Use adapters to connect to incmpatible parser
-        n3String = sz.statementsToNTriples(newSts);
-        // n3String = sz.statementsToN3(newSts)
-        return toJsonld(n3String);
+        sz.setFlags('si'); // use turtle parameters
+        documentString = sz.statementsToJsonld(newSts); // convert via turtle
+        return executeCallback(null, documentString);
       case NQuadsContentType:
       case NQuadsAltContentType:
         // @@@ just outpout the quads? Does not work for collections
@@ -80,16 +76,4 @@ contentType, callback, options) {
       return result;
     }
   }
-  function toJsonld(item) {
-    try {
-      return jsonld.fromRDF(item, {
-        format: 'application/n-quads'
-      }).then(docJsonld => {
-        return JSON.stringify(docJsonld);
-      });
-      // return JSON.stringify(await jsonld.fromRDF(item, {format: 'application/n-quads'}))
-    } catch (e) {
-      throw e;
-    }
-  }
 }