rdflib 2.2.22-2cea0982 → 2.2.22-4e175603

package/esm/jsonldparser.js

@@ -65,7 +65,7 @@ export default function jsonldParser(str, kb, base, callback) {
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node. Pass the id without the `_:` prefix
+    // This object is a Blank Node.. pass the id without the preceding _:
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
   } else {
     // This object is a Named Node

package/esm/serialize.js

@@ -1,5 +1,7 @@
 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
  */
@@ -19,6 +21,7 @@ contentType, callback, options) {
     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) {
@@ -48,9 +51,10 @@ contentType, callback, options) {
         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)
+        return toJsonld(n3String);
       case NQuadsContentType:
       case NQuadsAltContentType:
         // @@@ just outpout the quads? Does not work for collections
@@ -76,4 +80,16 @@ 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;
+    }
+  }
 }

package/esm/serializer.js

@@ -13,8 +13,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) {
   return new Serializer(store);
 }
@@ -964,27 +962,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

package/lib/formula.d.ts

@@ -270,7 +270,7 @@ export default class Formula extends Node {
      * @param provenance - The provenance URI
      * @param options  - options to pass to the serializer, as defined in serialize method
      */
-    serialize(base: any, contentType: any, provenance: any, options?: any): string | Promise<string> | undefined;
+    serialize(base: any, contentType: any, provenance: any, options?: any): string | undefined;
     /**
      * Creates a new formula with the substituting bindings applied
      * @param bindings - The bindings to substitute

package/lib/jsonldparser.js

@@ -72,7 +72,7 @@ function jsonldParser(str, kb, base, callback) {
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node. Pass the id without the `_:` prefix
+    // This object is a Blank Node.. pass the id without the preceding _:
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
   } else {
     // This object is a Named Node

package/lib/serialize.d.ts

@@ -23,4 +23,4 @@ contentType?: string | ContentType, callback?: (err: Error | undefined | null, r
      * A set of [prefix, uri] pairs that define namespace prefixes
      */
     namespaces?: Record<string, string>;
-}): string | undefined | Promise<string>;
+}): string | undefined;

package/lib/serialize.js

@@ -7,6 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = serialize;
 var _serializer = _interopRequireDefault(require("./serializer"));
 var _types = require("./types");
+var jsonld = _interopRequireWildcard(require("jsonld"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Serialize to the appropriate format
  */
@@ -26,6 +29,7 @@ contentType, callback, options) {
     var sz = (0, _serializer.default)(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) {
@@ -55,9 +59,10 @@ contentType, callback, options) {
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
       case _types.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)
+        return toJsonld(n3String);
       case _types.NQuadsContentType:
       case _types.NQuadsAltContentType:
         // @@@ just outpout the quads? Does not work for collections
@@ -83,4 +88,16 @@ 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;
+    }
+  }
 }

package/lib/serializer.d.ts

@@ -63,6 +63,5 @@ export class Serializer {
     symbolToN3(x: any): any;
     writeStore(write: any): void;
     statementsToXML(sts: any): string;
-    statementsToJsonld(sts: any): string;
 }
 import NamedNode from "./named-node";

package/lib/serializer.js

@@ -14,7 +14,6 @@ var Util = _interopRequireWildcard(require("./utils-js"));
 var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
 var _xsd = require("./xsd");
 var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
-var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /*      Serialization of RDF Graphs
@@ -25,8 +24,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 ** Licence: MIT
 */
 
-// import * as jsonld from 'jsonld'
-
 function createSerializer(store) {
   return new Serializer(store);
 }
@@ -976,27 +973,6 @@ 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

package/lib/store.d.ts

@@ -299,5 +299,5 @@ export default class IndexedFormula extends Formula {
      * @param term
      */
     uris(term: Quad_Subject): string[];
-    serialize(base: any, contentType: any, provenance: any, options?: any): string | Promise<string> | undefined;
+    serialize(base: any, contentType: any, provenance: any, options?: any): string | undefined;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.22-2cea0982",
+  "version": "2.2.22-4e175603",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -45,7 +45,6 @@
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
     "@babel/runtime": "^7.20.1",
-    "@frogcat/ttl2jsonld": "^0.0.9",
     "@xmldom/xmldom": "^0.8.6",
     "cross-fetch": "^3.1.5",
     "jsonld": "^8.1.0",
@@ -85,7 +84,7 @@
     "typescript": "^4.9.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0",
-    "webpack-dev-server": "^4.11.1"
+    "webpack-dev-server": "4.11"
   },
   "scripts": {
     "build": "babel src --extensions \".ts,.js\" -d lib",
@@ -100,7 +99,7 @@
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",
     "test:clean": "rimraf tests/serialize/,*",
     "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
-    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14  && npm run test:serialize:15",
+    "test:serialize:all": "npm run test:serialize:8 && npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:9 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15 && npm run test:serialize:16",
     "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
     "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml  -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
     "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml  -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -109,6 +108,7 @@
     "test:serialize:6": "cd ./tests/serialize && node ./data.js -in=t5.n3 -format=text/n3 -out=,t6.n3 && node diff ,t6.n3 t6-ref.n3",
     "test:serialize:7": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/n-triples -out=,t7.nt && node diff ,t7.nt t7-ref.nt",
     "test:serialize:8": "cd ./tests/serialize && node ./data.js -in=t5.n3  -format=application/n-quads -out=,t8.nq && node diff ,t8.nq t8-ref.nq",
+    "test:serialize:9": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/ld+json -out=,t9.jsonld && node diff ,t9.jsonld t9-ref.jsonld",
     "test:serialize:10": "cd ./tests/serialize && node ./data.js -in=details.ttl -format=text/turtle -out=,t10.ttl && node diff ,t10.ttl t10-ref.ttl",
     "test:serialize:11": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/rdf+xml  -out=,structures.xml && node diff ,structures.xml t11-ref.xml",
     "test:serialize:12": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=text/turtle -out=,structures.ttl && node diff ,structures.ttl t12-ref.ttl",

package/src/jsonldparser.js

@@ -84,7 +84,7 @@ export default function jsonldParser (str, kb, base, callback) {
 
 function nodeType (kb, obj) {
   if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node. Pass the id without the `_:` prefix
+    // This object is a Blank Node.. pass the id without the preceding _:
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
   } else {
     // This object is a Named Node

package/src/serialize.ts

@@ -14,6 +14,7 @@ import {
 } from './types'
 import IndexedFormula from './store'
 import { BlankNode, NamedNode } from './tf-types'
+import * as jsonld from 'jsonld'
 
 /**
  * Serialize to the appropriate format
@@ -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,9 +82,10 @@ 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)
+        return toJsonld(n3String) as any
       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
@@ -107,4 +110,11 @@ export default function serialize (
       return result as string
     }
   }
+
+  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 }
+  }
 }

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