rdflib 2.3.7 → 2.3.9

package/esm/factories/canonical-data-factory.js

@@ -7,6 +7,7 @@ import { EmptyTermType, DefaultGraphTermType, VariableTermType, BlankNodeTermTyp
 import DefaultGraph from '../default-graph';
 import { Feature } from './factory-types';
 import { isQuad, isTerm } from '../utils/terms';
+import Collection from "../collection";
 export { defaultGraphURI } from '../utils/default-graph-uri';
 
 /**
@@ -69,6 +70,10 @@ const CanonicalDataFactory = {
     switch (term.termType) {
       case DefaultGraphTermType:
         return 'defaultGraph';
+      case CollectionTermType:
+        // Collections are mutable (elements can change), so ID must be stable.
+        // Use the collection's blank-node-like identifier, not element content.
+        return Collection.toNT(term);
       case VariableTermType:
         return Variable.toString(term);
       default:

package/esm/factories/extended-term-factory.js

@@ -29,9 +29,7 @@ const ExtendedTermFactory = {
   },
   id(term) {
     if (isCollection(term)) {
-      return `( ${term.elements.map(e => {
-        return this.id(e);
-      }).join(', ')} )`;
+      return Collection.toNT(term);
     }
     if (isVariable(term)) {
       return Variable.toString(term);

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/factories/canonical-data-factory.js

@@ -20,6 +20,7 @@ var _types = require("../types");
 var _defaultGraph = _interopRequireDefault(require("../default-graph"));
 var _factoryTypes = require("./factory-types");
 var _terms = require("../utils/terms");
+var _collection = _interopRequireDefault(require("../collection"));
 var _defaultGraphUri = require("../utils/default-graph-uri");
 /**
  * Gets the default graph
@@ -81,6 +82,10 @@ const CanonicalDataFactory = {
     switch (term.termType) {
       case _types.DefaultGraphTermType:
         return 'defaultGraph';
+      case _types.CollectionTermType:
+        // Collections are mutable (elements can change), so ID must be stable.
+        // Use the collection's blank-node-like identifier, not element content.
+        return _collection.default.toNT(term);
       case _types.VariableTermType:
         return _variable.default.toString(term);
       default:

package/lib/factories/extended-term-factory.js

@@ -36,9 +36,7 @@ const ExtendedTermFactory = {
   },
   id(term) {
     if ((0, _terms.isCollection)(term)) {
-      return `( ${term.elements.map(e => {
-        return this.id(e);
-      }).join(', ')} )`;
+      return _collection.default.toNT(term);
     }
     if ((0, _terms.isVariable)(term)) {
       return _variable.default.toString(term);

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.7",
+  "version": "2.3.9",
   "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/factories/canonical-data-factory.ts

@@ -106,6 +106,10 @@ const CanonicalDataFactory: DataFactory = {
     switch (term.termType) {
       case DefaultGraphTermType:
         return 'defaultGraph'
+      case CollectionTermType:
+        // Collections are mutable (elements can change), so ID must be stable.
+        // Use the collection's blank-node-like identifier, not element content.
+        return Collection.toNT(term as Collection)
       case VariableTermType:
         return Variable.toString(term)
       default:

package/src/factories/extended-term-factory.ts

@@ -38,8 +38,7 @@ const ExtendedTermFactory: CollectionFactory = {
 
   id (term: Term | DefaultFactoryTypes): Indexable {
     if (isCollection(term)) {
-      return `( ${term.elements.map((e) => {
-        return this.id(e) }).join(', ')} )`
+      return Collection.toNT(term)
     }
 
     if (isVariable(term)) {

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