From e67edc16aba92b9f60a970bace2598b74d6deed7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2026 07:18:55 +0000 Subject: [PATCH 1/2] Bump @rdfjs/dataset and @types/rdfjs__dataset Bumps [@rdfjs/dataset](https://github.com/rdfjs-base/dataset) and [@types/rdfjs__dataset](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/rdfjs__dataset). These dependencies needed to be updated together. Updates `@rdfjs/dataset` from 1.1.1 to 2.0.3 - [Commits](https://github.com/rdfjs-base/dataset/compare/v1.1.1...v2.0.3) Updates `@types/rdfjs__dataset` from 1.0.5 to 2.0.7 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/rdfjs__dataset) --- updated-dependencies: - dependency-name: "@rdfjs/dataset" dependency-version: 2.0.3 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: "@types/rdfjs__dataset" dependency-version: 2.0.7 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 48 ++++++++++++++++++++++++++--------------------- package.json | 4 ++-- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57f10a50af..a9e6c4ec54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@inrupt/solid-client-errors": "^0.0.4", - "@rdfjs/dataset": "^1.1.1", + "@rdfjs/dataset": "^2.0.3", "buffer": "^6.0.3", "http-link-header": "^1.1.1", "jsonld-context-parser": "^3.0.0", @@ -31,7 +31,7 @@ "@types/http-link-header": "^1.0.5", "@types/jest": "^30.0.0", "@types/n3": "^1.16.4", - "@types/rdfjs__dataset": "^1.0.5", + "@types/rdfjs__dataset": "^2.0.7", "@types/uuid": "^11.0.0", "eslint": "^9.28.0", "eslint-config-prettier": "^10.1.8", @@ -1264,6 +1264,19 @@ "node": "^18.0.0 || ^20.0.0 || ^22.0.0" } }, + "node_modules/@inrupt/solid-client/node_modules/@rdfjs/dataset": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz", + "integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rdfjs/data-model": "^1.2.0" + }, + "bin": { + "rdfjs-dataset-test": "bin/test.js" + } + }, "node_modules/@inrupt/solid-client/node_modules/n3": { "version": "1.26.0", "resolved": "https://registry.npmjs.org/n3/-/n3-1.26.0.tgz", @@ -2048,6 +2061,8 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz", "integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==", + "dev": true, + "license": "MIT", "dependencies": { "@rdfjs/types": ">=1.0.1" }, @@ -2056,12 +2071,10 @@ } }, "node_modules/@rdfjs/dataset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz", - "integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==", - "dependencies": { - "@rdfjs/data-model": "^1.2.0" - }, + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-2.0.3.tgz", + "integrity": "sha512-Ur6M0nDFXMJWNYe1IBDBaQV/nIwRbe3+I58syOHnzZNbe7ZHumUOS/0XQ1+9WYF31tmQU7w741MRn6W3J+OTeg==", + "license": "MIT", "bin": { "rdfjs-dataset-test": "bin/test.js" } @@ -2070,6 +2083,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@rdfjs/types/-/types-1.1.2.tgz", "integrity": "sha512-wqpOJK1QCbmsGNtyzYnojPU8gRDPid2JO0Q0kMtb4j65xhCK880cnKAfEOwC+dX85VJcCByQx5zOwyyfCjDJsg==", + "dev": true, "dependencies": { "@types/node": "*" } @@ -2823,12 +2837,13 @@ "integrity": "sha512-LFmUbFunqmBn26wJZgZPYZPrDR1RwGOu2v79Mgcka1ndO6V0/cwjivPTc4yoK6n9kmw4/ls1r8cLrvh2iMibFA==" }, "node_modules/@types/rdfjs__dataset": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/rdfjs__dataset/-/rdfjs__dataset-1.0.5.tgz", - "integrity": "sha512-8OBC9Kr/ZSgNoUTe5mHTDPHaPt8Xen4XbYfqcbYv56d+4WdKliHXaFmFc0L4I5vsynE5JGu21Hvg2zWgX1Az6Q==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/rdfjs__dataset/-/rdfjs__dataset-2.0.7.tgz", + "integrity": "sha512-+GaYIL9C7N1N0HyH+obU4IXuL7DX+fXuf827aUQ2Vx2UghO47+OTxo2v3seEQj/1YHoHBfQFk5Y4P6Q7Ht4Hqw==", "dev": true, + "license": "MIT", "dependencies": { - "rdf-js": "^4.0.2" + "@rdfjs/types": "*" } }, "node_modules/@types/readable-stream": { @@ -10257,15 +10272,6 @@ "rdf-terms": "^1.7.0" } }, - "node_modules/rdf-js": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz", - "integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==", - "dev": true, - "dependencies": { - "@rdfjs/types": "*" - } - }, "node_modules/rdf-namespaces": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/rdf-namespaces/-/rdf-namespaces-1.17.0.tgz", diff --git a/package.json b/package.json index 3ca76eac71..9870fe4bf7 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "@types/http-link-header": "^1.0.5", "@types/jest": "^30.0.0", "@types/n3": "^1.16.4", - "@types/rdfjs__dataset": "^1.0.5", + "@types/rdfjs__dataset": "^2.0.7", "@types/uuid": "^11.0.0", "eslint": "^9.28.0", "eslint-config-prettier": "^10.1.8", @@ -200,7 +200,7 @@ }, "dependencies": { "@inrupt/solid-client-errors": "^0.0.4", - "@rdfjs/dataset": "^1.1.1", + "@rdfjs/dataset": "^2.0.3", "buffer": "^6.0.3", "http-link-header": "^1.1.1", "jsonld-context-parser": "^3.0.0", From 523608c4be38ad92f24ad9ea1c1a951ffcb2e4bc Mon Sep 17 00:00:00 2001 From: Nicolas Ayral Seydoux Date: Mon, 24 Aug 2026 09:41:10 +0200 Subject: [PATCH 2/2] Adjust jest config and imports --- jest.config.ts | 12 +++++------- src/rdf.test.ts | 4 +++- src/thing/remove.test.ts | 4 +++- src/thing/thing.test.ts | 4 +++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index e2cbda8d9f..1fb0129b4c 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -34,18 +34,16 @@ const baseConfig: ArrayElement> = { transform: { ...defaultPreset.transform, // [\\\\/] expands to [\\/], which makes the regex Windows-compatible. - // jose v6 ships as ESM only, and may be nested in a dependency's own - // node_modules (e.g. @inrupt/internal-test-env), so match it anywhere. - "node_modules[\\\\/](uuid|.*jose).+\\.js$": [ + // Some packages are ESM only, and may be nested in a dependency's own + // node_modules (e.g. @inrupt/internal-test-env), so match them anywhere. + "node_modules[\\\\/](uuid|.*jose|@rdfjs).+\\.js$": [ "ts-jest", { tsconfig: { allowJs: true } }, ], }, - // Ignore everything under node_modules except uuid and jose (the latter - // possibly nested in another package's node_modules), which ship ESM that - // must be transpiled before Jest can parse it. + // Ignore everything under node_modules except native ESM packages. transformIgnorePatterns: [ - "node_modules[\\\\/](?!(.*[\\\\/])?(uuid|jose)[\\\\/])", + "node_modules[\\\\/](?!(.*[\\\\/])?(uuid|jose|@rdfjs)[\\\\/])", ], }; diff --git a/src/rdf.test.ts b/src/rdf.test.ts index 3543dea9c2..da32f658a4 100644 --- a/src/rdf.test.ts +++ b/src/rdf.test.ts @@ -19,7 +19,7 @@ // import { jest, describe, it, expect } from "@jest/globals"; -import { dataset } from "@rdfjs/dataset"; +import rdfjs from "@rdfjs/dataset"; import * as fc from "fast-check"; import { DataFactory as DF, Store } from "n3"; import type { @@ -43,6 +43,8 @@ import { fromRdfJsDataset, toRdfJsDataset } from "./rdfjs"; import { asUrl, getThing, getThingAll } from "./thing/thing"; import { getTermAll } from "./thing/get"; +const dataset = rdfjs.dataset; + describe("fromRdfJsDataset", () => { const fcNamedNode = fc .webUrl({ withFragments: true, withQueryParameters: true }) diff --git a/src/thing/remove.test.ts b/src/thing/remove.test.ts index 7069ede6bc..b2ea2b506e 100644 --- a/src/thing/remove.test.ts +++ b/src/thing/remove.test.ts @@ -20,7 +20,7 @@ import { describe, it, expect } from "@jest/globals"; -import { dataset } from "@rdfjs/dataset"; +import rdfjs from "@rdfjs/dataset"; import { DataFactory } from "n3"; import type { IriString, @@ -50,6 +50,8 @@ import { } from "./thing"; import { localNodeSkolemPrefix } from "../rdf.internal"; +const dataset = rdfjs.dataset; + function getMockThingWithLiteralFor( predicate: IriString, literalValue: string, diff --git a/src/thing/thing.test.ts b/src/thing/thing.test.ts index 2ac6a8fc54..1e5b648a8e 100644 --- a/src/thing/thing.test.ts +++ b/src/thing/thing.test.ts @@ -21,7 +21,7 @@ import { describe, it, expect } from "@jest/globals"; import { DataFactory } from "n3"; -import { dataset } from "@rdfjs/dataset"; +import rdfjs from "@rdfjs/dataset"; import { getThing, getThingAll, @@ -62,6 +62,8 @@ import { internal_setAcl } from "../acl/acl.internal"; import type { BlankNodeId, LocalNodeIri } from "../rdf.internal"; import { localNodeSkolemPrefix } from "../rdf.internal"; +const dataset = rdfjs.dataset; + describe("createThing", () => { it("automatically generates a unique name for the Thing", () => { const thing1: ThingLocal = createThing();