rdflib 2.3.1-c71dde13 → 2.3.2-075b5109

package/esm/fetcher.js

@@ -475,10 +475,19 @@ export default class Fetcher {
     this.timeout = options.timeout || 30000;
 
     // solidFetcher is deprecated
-    this._fetch = options.fetch || typeof global !== 'undefined' && (global.solidFetcher || global.solidFetch) || typeof window !== 'undefined' && (window.solidFetcher || window.solidFetch) || crossFetch;
-    if (!this._fetch) {
+    let fetchFunc = options.fetch || typeof global !== 'undefined' && (global.solidFetcher || global.solidFetch) || typeof window !== 'undefined' && (window.solidFetcher || window.solidFetch) || crossFetch;
+    if (!fetchFunc) {
       throw new Error('No _fetch function available for Fetcher');
     }
+    // Bind fetch to its context to avoid "Illegal invocation" errors
+    // Check if it's the native browser fetch or global fetch that needs binding
+    if (typeof window !== 'undefined' && fetchFunc === window.fetch) {
+      this._fetch = fetchFunc.bind(window);
+    } else if (typeof global !== 'undefined' && fetchFunc === global.fetch) {
+      this._fetch = fetchFunc.bind(global);
+    } else {
+      this._fetch = fetchFunc;
+    }
     // This is the name of the graph we store all the HTTP metadata in
     this.appNode = this.store.sym('chrome://TheCurrentSession');
     // this.appNode = this.store.rdfFactory.blankNode() // Needs to have a URI in tests

package/esm/n3parser.js

@@ -588,8 +588,7 @@ export class SinkParser {
     while ("!^.".indexOf(str.slice(j, j + 1)) >= 0) {
       var ch = str.slice(j, j + 1);
       if (ch == ".") {
-        var ahead = str.slice(j + 1, j + 2);
-        if (!ahead || _notNameChars.indexOf(ahead) >= 0 && ":?<[{(".indexOf(ahead) < 0) {
+        if (dotTerminatesName(str, j)) {
           break;
         }
       }

package/lib/collection.d.ts

@@ -49,7 +49,7 @@ export default class Collection<T extends Node = Node | RdflibBlankNode | Collec
      * Creates a new Collection with the substituting bindings applied
      * @param bindings - The bindings to substitute
      */
-    substitute(bindings: Bindings): any;
+    substitute(bindings: Bindings): Collection<Node | Collection<any> | Literal | Variable>;
     toNT(): string;
     static toNT(collection: any): string;
     /**

package/lib/fetcher.js

@@ -484,10 +484,19 @@ class Fetcher {
     this.timeout = options.timeout || 30000;
 
     // solidFetcher is deprecated
-    this._fetch = options.fetch || typeof global !== 'undefined' && (global.solidFetcher || global.solidFetch) || typeof window !== 'undefined' && (window.solidFetcher || window.solidFetch) || _crossFetch.default;
-    if (!this._fetch) {
+    let fetchFunc = options.fetch || typeof global !== 'undefined' && (global.solidFetcher || global.solidFetch) || typeof window !== 'undefined' && (window.solidFetcher || window.solidFetch) || _crossFetch.default;
+    if (!fetchFunc) {
       throw new Error('No _fetch function available for Fetcher');
     }
+    // Bind fetch to its context to avoid "Illegal invocation" errors
+    // Check if it's the native browser fetch or global fetch that needs binding
+    if (typeof window !== 'undefined' && fetchFunc === window.fetch) {
+      this._fetch = fetchFunc.bind(window);
+    } else if (typeof global !== 'undefined' && fetchFunc === global.fetch) {
+      this._fetch = fetchFunc.bind(global);
+    } else {
+      this._fetch = fetchFunc;
+    }
     // This is the name of the graph we store all the HTTP metadata in
     this.appNode = this.store.sym('chrome://TheCurrentSession');
     // this.appNode = this.store.rdfFactory.blankNode() // Needs to have a URI in tests

package/lib/index.d.ts

@@ -28,7 +28,7 @@ import * as uri from './uri';
 import * as Util from './utils-js';
 import Variable from './variable';
 import DataFactory from './factories/rdflib-data-factory';
-declare const fetcher: (store: Store, options: any) => Fetcher, graph: (features?: any, opts?: any) => Store, lit: (val: string, lang?: string | undefined, dt?: import("./tf-types").NamedNode | undefined) => Literal, st: (subject: import("./tf-types").Quad_Subject, predicate: import("./tf-types").Quad_Predicate, object: import("./tf-types").Quad_Object, graph?: import("./tf-types").Quad_Graph | undefined) => Statement<import("./types").SubjectType, import("./types").PredicateType, import("./types").ObjectType, import("./types").GraphType>, namedNode: (value: string) => NamedNode, variable: (value: string) => Variable, blankNode: (value?: string | undefined) => BlankNode, defaultGraph: () => import("./default-graph").default, literal: (value: string, languageOrDatatype?: string | import("./tf-types").NamedNode | undefined) => Literal, quad: (subject: import("./tf-types").Term, predicate: import("./tf-types").Term, object: import("./tf-types").Term, graph?: import("./tf-types").Term | undefined) => Statement<import("./types").SubjectType, import("./types").PredicateType, import("./types").ObjectType, import("./types").GraphType>, triple: (subject: import("./tf-types").Term, predicate: import("./tf-types").Term, object: import("./tf-types").Term, graph?: import("./tf-types").Term | undefined) => import("./tf-types").Quad<any, any, any, any>;
+declare const fetcher: (store: Store, options: any) => Fetcher, graph: (features?: any, opts?: any) => Store, lit: (val: string, lang?: string, dt?: import("./tf-types").NamedNode) => Literal, st: (subject: import("./tf-types").Quad_Subject, predicate: import("./tf-types").Quad_Predicate, object: import("./tf-types").Quad_Object, graph?: import("./tf-types").Quad_Graph) => Statement, namedNode: (value: string) => NamedNode, variable: (value: string) => Variable, blankNode: (value?: string) => BlankNode, defaultGraph: () => import("./default-graph").default, literal: (value: string, languageOrDatatype?: string | import("./tf-types").NamedNode) => Literal, quad: (subject: import("./tf-types").Term, predicate: import("./tf-types").Term, object: import("./tf-types").Term, graph?: import("./tf-types").Term) => Statement, triple: (subject: import("./tf-types").Term, predicate: import("./tf-types").Term, object: import("./tf-types").Term, graph?: import("./tf-types").Term) => import("./tf-types").Quad<any, any, any, any>;
 declare const fromNT: (str: any) => any;
 declare const term: <T extends import("./types").FromValueReturns>(value: import("./types").ValueType) => T;
 declare const NextId: number;

package/lib/n3parser.js

@@ -596,8 +596,7 @@ class SinkParser {
     while ("!^.".indexOf(str.slice(j, j + 1)) >= 0) {
       var ch = str.slice(j, j + 1);
       if (ch == ".") {
-        var ahead = str.slice(j + 1, j + 2);
-        if (!ahead || _notNameChars.indexOf(ahead) >= 0 && ":?<[{(".indexOf(ahead) < 0) {
+        if (dotTerminatesName(str, j)) {
           break;
         }
       }

package/lib/rdfaparser.d.ts

@@ -61,15 +61,15 @@ declare class RDFaProcessor {
     trim(str: any): any;
 }
 declare namespace RDFaProcessor {
-    const XMLLiteralURI: string;
-    const HTMLLiteralURI: string;
-    const PlainLiteralURI: string;
-    const objectURI: string;
-    const typeURI: string;
-    const nameChar: string;
-    const nameStartChar: string;
-    const NCNAME: RegExp;
-    const dateTimeTypes: {
+    let XMLLiteralURI: string;
+    let HTMLLiteralURI: string;
+    let PlainLiteralURI: string;
+    let objectURI: string;
+    let typeURI: string;
+    let nameChar: string;
+    let nameStartChar: string;
+    let NCNAME: RegExp;
+    let dateTimeTypes: {
         pattern: RegExp;
         type: string;
     }[];

package/lib/rdfxmlparser.d.ts

@@ -25,7 +25,7 @@ export default class RDFParser {
     };
     constructor(store: any);
     /** Our triple store reference @private */
-    store: any; /** Our identified blank nodes @private */
+    private store; /** Our identified blank nodes @private */
     bnodes: {}; /** A context for context-aware stores @private */
     why: any; /** Reification flag */
     reify: boolean;

package/lib/serializer.d.ts

@@ -21,14 +21,14 @@ export class Serializer {
         langString: import("./named-node").default;
         string: import("./named-node").default;
     };
-    setBase(base: any): Serializer;
+    setBase(base: any): this;
     /**
      * Set serializer behavior flags. Letters can be combined with spaces.
      * Examples: 'si', 'deinprstux', 'si dr', 'o'.
      * Notable flags:
      *  - 'o': do not abbreviate to a prefixed name when the local part contains a dot
      */
-    setFlags(flags: any): Serializer;
+    setFlags(flags: any): this;
     toStr(x: any): any;
     fromStr(s: any): any;
     /**
@@ -45,7 +45,7 @@ export class Serializer {
      */
     setPrefix(prefix: any, uri: any): void;
     suggestPrefix(prefix: any, uri: any): void;
-    suggestNamespaces(namespaces: any): Serializer;
+    suggestNamespaces(namespaces: any): this;
     checkIntegrity(): void;
     makeUpPrefix(uri: any): any;
     rootSubjects(sts: any): {

package/lib/xsd-internal.d.ts

@@ -1,11 +1,11 @@
 declare namespace _default {
-    const boolean: NamedNode;
-    const dateTime: NamedNode;
-    const decimal: NamedNode;
-    const double: NamedNode;
-    const integer: NamedNode;
-    const langString: NamedNode;
-    const string: NamedNode;
+    let boolean: NamedNode;
+    let dateTime: NamedNode;
+    let decimal: NamedNode;
+    let double: NamedNode;
+    let integer: NamedNode;
+    let langString: NamedNode;
+    let string: NamedNode;
 }
 export default _default;
 import NamedNode from './named-node';

package/lib/xsd.d.ts

@@ -9,11 +9,11 @@ export function createXSD(localFactory?: import("./factories/factory-types").Dat
 };
 export default defaultXSD;
 declare namespace defaultXSD {
-    const boolean: import("./named-node").default;
-    const dateTime: import("./named-node").default;
-    const decimal: import("./named-node").default;
-    const double: import("./named-node").default;
-    const integer: import("./named-node").default;
-    const langString: import("./named-node").default;
-    const string: import("./named-node").default;
+    let boolean: import("./named-node").default;
+    let dateTime: import("./named-node").default;
+    let decimal: import("./named-node").default;
+    let double: import("./named-node").default;
+    let integer: import("./named-node").default;
+    let langString: import("./named-node").default;
+    let string: import("./named-node").default;
 }

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.1-c71dde13",
+  "version": "2.3.2-075b5109",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -47,7 +47,7 @@
     "@babel/runtime": "^7.28.4",
     "@frogcat/ttl2jsonld": "^0.0.10",
     "@rdfjs/types": "^2.0.1",
-    "@xmldom/xmldom": "^0.8.10",
+    "@xmldom/xmldom": "^0.8.11",
     "cross-fetch": "^4.1.0",
     "jsonld": "^9.0.0",
     "n3": "^1.26.0",
@@ -61,30 +61,31 @@
     "@babel/preset-env": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "@babel/register": "^7.28.3",
-    "@types/chai": "^4.3.20",
+    "@types/chai": "^5.2.3",
     "@types/dirty-chai": "^2.0.5",
-    "@types/express": "^4.17.25",
+    "@types/express": "^5.0.6",
     "@types/jsonld": "^1.5.15",
     "@types/mocha": "^10.0.10",
-    "@types/sinon-chai": "^3.2.12",
-    "babel-loader": "^9.2.1",
-    "chai": "^4.5.0",
+    "@types/node": "^25.0.1",
+    "@types/sinon-chai": "^4.0.0",
+    "babel-loader": "^10.0.0",
+    "chai": "^6.2.1",
+    "colors": "^1.4.0",
     "diff": "^8.0.2",
-    "dirty-chai": "^2.0.1",
-    "eslint": "^9.39.1",
-    "fs-grep": "0.0.5",
+    "eslint": "^9.39.2",
+    "globals": "^16.5.0",
     "locate-path": "^8.0.0",
-    "mocha": "^10.8.2",
-    "nock": "^13.5.6",
+    "mocha": "^11.7.5",
+    "nock": "^14.0.10",
     "node-fetch": "^3.3.2",
-    "node-polyfill-webpack-plugin": "^2.0.1",
+    "node-polyfill-webpack-plugin": "^4.1.0",
     "rimraf": "^6.1.2",
-    "sinon": "^15.2.0",
-    "sinon-chai": "^3.7.0",
-    "source-map-loader": "^4.0.2",
+    "sinon": "^21.0.0",
+    "sinon-chai": "^4.0.1",
+    "source-map-loader": "^5.0.0",
     "ts-node": "^10.9.2",
     "typedoc": "^0.28.15",
-    "typescript": "^5.0.4",
+    "typescript": "^5.9.3",
     "webpack": "^5.103.0",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.2"
@@ -96,6 +97,8 @@
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
     "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
+    "lint": "eslint src tests",
+    "lint:fix": "eslint src tests --fix",
     "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
@@ -103,7 +106,7 @@
     "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 && npm run test:serialize:16 && npm run test:serialize:17 && npm run test:serialize:18",
-    "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:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && node diff ,t1.xml t1-ref.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",
     "test:serialize:4": "cd ./tests/serialize && node ./data.js -in=t3.ttl -out=,t4.ttl && node diff ,t4.ttl t4-ref.ttl",

package/src/fetcher.ts

@@ -756,13 +756,22 @@ export default class Fetcher implements CallbackifyInterface {
     this.timeout = options.timeout || 30000
 
     // solidFetcher is deprecated
-    this._fetch = options.fetch
+    let fetchFunc = options.fetch
                || (typeof global !== 'undefined' && (global.solidFetcher || global.solidFetch))
                || (typeof window !== 'undefined' && (window.solidFetcher || window.solidFetch))
                || crossFetch
-    if (!this._fetch) {
+    if (!fetchFunc) {
       throw new Error('No _fetch function available for Fetcher')
     }
+    // Bind fetch to its context to avoid "Illegal invocation" errors
+    // Check if it's the native browser fetch or global fetch that needs binding
+    if (typeof window !== 'undefined' && fetchFunc === window.fetch) {
+      this._fetch = fetchFunc.bind(window)
+    } else if (typeof global !== 'undefined' && fetchFunc === global.fetch) {
+      this._fetch = fetchFunc.bind(global)
+    } else {
+      this._fetch = fetchFunc
+    }
     // This is the name of the graph we store all the HTTP metadata in
     this.appNode = this.store.sym('chrome://TheCurrentSession')
     // this.appNode = this.store.rdfFactory.blankNode() // Needs to have a URI in tests

package/src/jsonldparser.js

@@ -78,10 +78,10 @@ export default async function jsonldParser(str, kb, base) {
 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));
+    return kb.rdfFactory.blankNode(obj['@id'].substring(2))
   } else {
     // This object is a Named Node
-    return kb.rdfFactory.namedNode(obj['@id']);
+    return kb.rdfFactory.namedNode(obj['@id'])
   }
 }