rdflib 2.3.8 → 2.4.0

package/esm/fetcher.js

@@ -977,27 +977,27 @@ export default class Fetcher {
   linkData(originalUri, rel, uri, why, reverse) {
     if (!uri) return;
     let kb = this.store;
-    let predicate;
     // See http://www.w3.org/TR/powder-dr/#httplink for describedby 2008-12-10
     let obj = kb.rdfFactory.namedNode(Uri.join(uri, originalUri.value));
+    let predicates;
     if (rel === 'alternate' || rel === 'seeAlso' || rel === 'meta' || rel === 'describedby') {
       if (obj.value === originalUri.value) {
         return;
       }
-      predicate = this.ns.rdfs('seeAlso');
+      // Also emit the IANA relation predicate triple (issue #741)
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel)), this.ns.rdfs('seeAlso')];
     } else if (rel === 'type') {
-      predicate = kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
+      predicates = [kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')];
     } else {
       // See https://www.iana.org/assignments/link-relations/link-relations.xml
       // Alas not yet in RDF yet for each predicate
       // encode space in e.g. rel="shortcut icon"
-      predicate = kb.rdfFactory.namedNode(Uri.join(encodeURIComponent(rel), 'http://www.iana.org/assignments/link-relations/'));
-    }
-    if (reverse) {
-      kb.add(obj, predicate, originalUri, why);
-    } else {
-      kb.add(originalUri, predicate, obj, why);
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel))];
     }
+    kb.addAll(predicates.map(predicate => reverse ? kb.rdfFactory.quad(obj, predicate, originalUri, why) : kb.rdfFactory.quad(originalUri, predicate, obj, why)));
+  }
+  ianaLinkRelation(rel) {
+    return Uri.join(encodeURIComponent(rel), 'http://www.iana.org/assignments/link-relations/');
   }
   parseLinkHeader(linkHeader, originalUri, reqNode) {
     if (!linkHeader) {

package/esm/jsonldparser.js

@@ -58,7 +58,11 @@ export default async function jsonldParser(str, kb, base) {
   const jsonld = await import('jsonld');
   // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
   // just calling `jsonld.flatten`, so please do not remove `default`
-  const flattened = await jsonld.default.flatten(JSON.parse(str), null, {
+  // Handle both ESM (browser) and CommonJS (Node.js) module formats
+  // Browser ESM: jsonld.default.flatten
+  // Node.js CommonJS: jsonld.flatten
+  const jsonldLib = jsonld.default || jsonld;
+  const flattened = await jsonldLib.flatten(JSON.parse(str), null, {
     base: baseString
   });
   return flattened.reduce((store, flatResource) => processResource(store, base, flatResource), kb);

package/esm/store.js

@@ -33,7 +33,6 @@ import Variable from './variable';
 import { Query, indexedFormulaQuery } from './query';
 import { BlankNodeTermType, CollectionTermType, DefaultGraphTermType, EmptyTermType, GraphTermType, LiteralTermType, NamedNodeTermType, VariableTermType } from './types';
 import NamedNode from './named-node';
-import { namedNode } from './index';
 import serialize from "./serialize";
 import BlankNode from './blank-node';
 import DefaultGraph from './default-graph';
@@ -247,7 +246,7 @@ export default class IndexedFormula extends Formula {
       var query = new Query('patch');
       query.pat = patch.where;
       query.pat.statements.map(function (st) {
-        st.graph = namedNode(target.value);
+        st.graph = new NamedNode(target.value);
       });
       //@ts-ignore TODO: add sync property to Query when converting Query to typescript
       query.sync = true;

package/lib/fetcher.d.ts

@@ -340,6 +340,7 @@ export default class Fetcher implements CallbackifyInterface {
         original: Quad_Subject;
     } & Options, errorMessage: string, statusCode: StatusValues, response?: ExtendedResponse): Promise<FetchError>;
     linkData(originalUri: NamedNode, rel: string, uri: string, why: Quad_Graph, reverse?: boolean): void;
+    private ianaLinkRelation;
     parseLinkHeader(linkHeader: string, originalUri: NamedNode, reqNode: Quad_Graph): void;
     doneFetch(options: {
         req: Quad_Subject;

package/lib/fetcher.js

@@ -986,27 +986,27 @@ class Fetcher {
   linkData(originalUri, rel, uri, why, reverse) {
     if (!uri) return;
     let kb = this.store;
-    let predicate;
     // See http://www.w3.org/TR/powder-dr/#httplink for describedby 2008-12-10
     let obj = kb.rdfFactory.namedNode(Uri.join(uri, originalUri.value));
+    let predicates;
     if (rel === 'alternate' || rel === 'seeAlso' || rel === 'meta' || rel === 'describedby') {
       if (obj.value === originalUri.value) {
         return;
       }
-      predicate = this.ns.rdfs('seeAlso');
+      // Also emit the IANA relation predicate triple (issue #741)
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel)), this.ns.rdfs('seeAlso')];
     } else if (rel === 'type') {
-      predicate = kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
+      predicates = [kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')];
     } else {
       // See https://www.iana.org/assignments/link-relations/link-relations.xml
       // Alas not yet in RDF yet for each predicate
       // encode space in e.g. rel="shortcut icon"
-      predicate = kb.rdfFactory.namedNode(Uri.join(encodeURIComponent(rel), 'http://www.iana.org/assignments/link-relations/'));
-    }
-    if (reverse) {
-      kb.add(obj, predicate, originalUri, why);
-    } else {
-      kb.add(originalUri, predicate, obj, why);
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel))];
     }
+    kb.addAll(predicates.map(predicate => reverse ? kb.rdfFactory.quad(obj, predicate, originalUri, why) : kb.rdfFactory.quad(originalUri, predicate, obj, why)));
+  }
+  ianaLinkRelation(rel) {
+    return Uri.join(encodeURIComponent(rel), 'http://www.iana.org/assignments/link-relations/');
   }
   parseLinkHeader(linkHeader, originalUri, reqNode) {
     if (!linkHeader) {

package/lib/jsonldparser.js

@@ -65,7 +65,11 @@ async function jsonldParser(str, kb, base) {
   const jsonld = await Promise.resolve().then(() => _interopRequireWildcard(require('jsonld')));
   // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
   // just calling `jsonld.flatten`, so please do not remove `default`
-  const flattened = await jsonld.default.flatten(JSON.parse(str), null, {
+  // Handle both ESM (browser) and CommonJS (Node.js) module formats
+  // Browser ESM: jsonld.default.flatten
+  // Node.js CommonJS: jsonld.flatten
+  const jsonldLib = jsonld.default || jsonld;
+  const flattened = await jsonldLib.flatten(JSON.parse(str), null, {
     base: baseString
   });
   return flattened.reduce((store, flatResource) => processResource(store, base, flatResource), kb);

package/lib/store.js

@@ -23,7 +23,6 @@ var _variable = _interopRequireDefault(require("./variable"));
 var _query = require("./query");
 var _types = require("./types");
 var _namedNode = _interopRequireDefault(require("./named-node"));
-var _index = require("./index");
 var _serialize = _interopRequireDefault(require("./serialize"));
 var _blankNode = _interopRequireDefault(require("./blank-node"));
 var _defaultGraph = _interopRequireDefault(require("./default-graph"));
@@ -255,7 +254,7 @@ class IndexedFormula extends _formula.default {
       var query = new _query.Query('patch');
       query.pat = patch.where;
       query.pat.statements.map(function (st) {
-        st.graph = (0, _index.namedNode)(target.value);
+        st.graph = new _namedNode.default(target.value);
       });
       //@ts-ignore TODO: add sync property to Query when converting Query to typescript
       query.sync = true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -68,27 +68,27 @@
     "@types/express": "^5.0.6",
     "@types/jsonld": "^1.5.15",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.8.0",
+    "@types/node": "^25.9.1",
     "@types/sinon-chai": "^4.0.0",
     "babel-loader": "^10.1.1",
     "chai": "^6.2.2",
     "colors": "^1.4.0",
-    "diff": "^8.0.4",
-    "eslint": "^10.3.0",
+    "diff": "^9.0.0",
+    "eslint": "^10.4.0",
     "globals": "^17.6.0",
     "locate-path": "^8.0.0",
-    "mocha": "^11.7.5",
+    "mocha": "^11.7.6",
     "nock": "^14.0.15",
     "node-fetch": "^3.3.2",
     "node-polyfill-webpack-plugin": "^4.1.0",
     "rimraf": "^6.1.3",
-    "sinon": "^21.1.2",
+    "sinon": "^22.0.0",
     "sinon-chai": "^4.0.1",
     "source-map-loader": "^5.0.0",
     "ts-node": "^10.9.2",
     "typedoc": "^0.28.19",
     "typescript": "^5.9.3",
-    "webpack": "^5.106.2",
+    "webpack": "^5.107.1",
     "webpack-cli": "^7.0.2",
     "webpack-dev-server": "^5.2.4"
   },

package/src/fetcher.ts

@@ -1346,30 +1346,40 @@ export default class Fetcher implements CallbackifyInterface {
   ) {
     if (!uri) return
     let kb = this.store
-    let predicate
     // See http://www.w3.org/TR/powder-dr/#httplink for describedby 2008-12-10
     let obj = kb.rdfFactory.namedNode(Uri.join(uri, originalUri.value))
 
+    let predicates: Quad_Predicate[]
     if (rel === 'alternate' || rel === 'seeAlso' || rel === 'meta' ||
         rel === 'describedby') {
       if (obj.value === originalUri.value) { return }
-      predicate = this.ns.rdfs('seeAlso')
+      // Also emit the IANA relation predicate triple (issue #741)
+      predicates = [
+        kb.rdfFactory.namedNode(this.ianaLinkRelation(rel)),
+        this.ns.rdfs('seeAlso')
+      ]
     } else if (rel === 'type') {
-      predicate = kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
+      predicates = [kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')]
     } else {
       // See https://www.iana.org/assignments/link-relations/link-relations.xml
       // Alas not yet in RDF yet for each predicate
       // encode space in e.g. rel="shortcut icon"
-      predicate = kb.rdfFactory.namedNode(
-        Uri.join(encodeURIComponent(rel),
-          'http://www.iana.org/assignments/link-relations/')
+      predicates = [kb.rdfFactory.namedNode(
+        this.ianaLinkRelation(rel)
+      )]
+    }
+    kb.addAll(
+      predicates.map(predicate =>
+        reverse
+          ? kb.rdfFactory.quad(obj, predicate, originalUri, why)
+          : kb.rdfFactory.quad(originalUri, predicate, obj, why)
       )
-    }
-    if (reverse) {
-      kb.add(obj, predicate, originalUri, why)
-    } else {
-      kb.add(originalUri, predicate, obj, why)
-    }
+    )
+  }
+
+  private ianaLinkRelation(rel: string) {
+    return Uri.join(encodeURIComponent(rel),
+      'http://www.iana.org/assignments/link-relations/');
   }
 
   parseLinkHeader (

package/src/jsonldparser.js

@@ -71,7 +71,11 @@ export default async function jsonldParser(str, kb, base) {
   const jsonld = await import('jsonld')
   // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
   // just calling `jsonld.flatten`, so please do not remove `default`
-  const flattened = await jsonld.default.flatten(JSON.parse(str), null, {base: baseString})
+  // Handle both ESM (browser) and CommonJS (Node.js) module formats
+  // Browser ESM: jsonld.default.flatten
+  // Node.js CommonJS: jsonld.flatten
+  const jsonldLib = jsonld.default || jsonld
+  const flattened = await jsonldLib.flatten(JSON.parse(str), null, {base: baseString})
   return flattened.reduce((store, flatResource) => processResource(store, base, flatResource), kb)
 }
 

package/src/store.ts

@@ -53,7 +53,6 @@ import {
   Quad_Subject,
   Term,
 } from './tf-types'
-import { namedNode } from './index'
 import serialize from "./serialize";
 import BlankNode from './blank-node'
 import DefaultGraph from './default-graph'
@@ -315,7 +314,7 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
       var query = new Query('patch')
       query.pat = patch.where
       query.pat.statements.map(function (st) {
-        st.graph = namedNode(target.value)
+        st.graph = new NamedNode(target.value)
       })
       //@ts-ignore TODO: add sync property to Query when converting Query to typescript
       query.sync = true