diff --git a/package.json b/package.json index 8a8c930954..5fa89131e2 100644 --- a/package.json +++ b/package.json @@ -95,8 +95,8 @@ }, "dependencies": { "@rdfjs/dataset": "^1.1.0", + "@rdfjs/types": "^1.0.1", "@types/n3": "^1.10.0", - "@types/rdf-js": "^4.0.0", "@types/rdfjs__dataset": "^1.0.4", "cross-fetch": "^3.0.4", "http-link-header": "^1.0.2", diff --git a/src/acl/acl.internal.ts b/src/acl/acl.internal.ts index 8f1bcc09c0..e888dc4990 100644 --- a/src/acl/acl.internal.ts +++ b/src/acl/acl.internal.ts @@ -32,7 +32,7 @@ import { getResourceInfo, } from "../resource/resource"; import { acl, rdf } from "../constants"; -import { Quad } from "rdf-js"; +import { Quad } from "@rdfjs/types"; import { DataFactory } from "../rdfjs"; import { createThing, diff --git a/src/acp/rule.test.ts b/src/acp/rule.test.ts index 9d9566cdce..df81935521 100644 --- a/src/acp/rule.test.ts +++ b/src/acp/rule.test.ts @@ -20,7 +20,7 @@ */ import { describe, it, expect } from "@jest/globals"; -import { NamedNode } from "rdf-js"; +import { NamedNode } from "@rdfjs/types"; import { DataFactory } from "n3"; import { createThing, getThing, getThingAll, setThing } from "../thing/thing"; diff --git a/src/datatypes.ts b/src/datatypes.ts index d8480331ac..c314cb522e 100644 --- a/src/datatypes.ts +++ b/src/datatypes.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { NamedNode, Literal, Quad, Term, Quad_Subject } from "rdf-js"; +import { NamedNode, Literal, Term, Quad_Subject } from "@rdfjs/types"; import { DataFactory } from "./rdfjs"; import { IriString, Iri, SolidClientError, LocalNode } from "./interfaces"; import { internal_toIriString } from "./interfaces.internal"; diff --git a/src/formats/turtle.ts b/src/formats/turtle.ts index 9b2d91c63d..01696c694e 100644 --- a/src/formats/turtle.ts +++ b/src/formats/turtle.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Quad } from "rdf-js"; +import { Quad } from "@rdfjs/types"; import { IriString } from "../interfaces"; import { DataFactory } from "../rdfjs"; import { getSourceUrl } from "../resource/resource"; diff --git a/src/interfaces.ts b/src/interfaces.ts index 06c7d50f2c..c491f2db19 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Quad, NamedNode } from "rdf-js"; +import { Quad, NamedNode } from "@rdfjs/types"; import { Access } from "./acl/acl"; import { ImmutableDataset, LocalNodeIri, Subject } from "./rdf.internal"; diff --git a/src/rdf.internal.ts b/src/rdf.internal.ts index cfafa01e28..d8cc31fe7a 100644 --- a/src/rdf.internal.ts +++ b/src/rdf.internal.ts @@ -24,7 +24,7 @@ import rdfJsDatasetModule from "@rdfjs/dataset"; export const rdfJsDataset = rdfJsDatasetModule.dataset; import RdfJsDataFactory from "@rdfjs/data-model"; -import * as RdfJs from "rdf-js"; +import * as RdfJs from "@rdfjs/types"; import { IriString } from "./interfaces"; import { XmlSchemaTypeIri, xmlSchemaTypes } from "./datatypes"; diff --git a/src/rdf.test.ts b/src/rdf.test.ts index 06e2a6c34f..67023490b5 100644 --- a/src/rdf.test.ts +++ b/src/rdf.test.ts @@ -23,7 +23,7 @@ import { jest, describe, it, expect } from "@jest/globals"; import { dataset } from "@rdfjs/dataset"; import * as fc from "fast-check"; import { DataFactory } from "n3"; -import * as RdfJs from "rdf-js"; +import * as RdfJs from "@rdfjs/types"; import { serializeBoolean, serializeDatetime, diff --git a/src/rdfjs.internal.ts b/src/rdfjs.internal.ts index 7c679c6fb4..60d089932c 100644 --- a/src/rdfjs.internal.ts +++ b/src/rdfjs.internal.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { DatasetCore } from "rdf-js"; +import { DatasetCore } from "@rdfjs/types"; /** * Verify whether a given value has the required DatasetCore properties. diff --git a/src/resource/solidDataset.ts b/src/resource/solidDataset.ts index c80a820159..788d72ab32 100644 --- a/src/resource/solidDataset.ts +++ b/src/resource/solidDataset.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Quad, NamedNode, Quad_Object } from "rdf-js"; +import { Quad, NamedNode, Quad_Object } from "@rdfjs/types"; import { DataFactory } from "../rdfjs"; import { ldp } from "../constants"; import { triplesToTurtle, getTurtleParser } from "../formats/turtle"; diff --git a/src/thing/add.ts b/src/thing/add.ts index 50ddf6be8e..e0be4a3f58 100644 --- a/src/thing/add.ts +++ b/src/thing/add.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Literal, NamedNode, Quad_Object } from "rdf-js"; +import { Literal, NamedNode, Quad_Object } from "@rdfjs/types"; import { UrlString, Url, Thing, IriString } from "../interfaces"; import { internal_throwIfNotThing } from "./thing.internal"; import { diff --git a/src/thing/get.test.ts b/src/thing/get.test.ts index 85486c4aa0..8ccadd6eb8 100644 --- a/src/thing/get.test.ts +++ b/src/thing/get.test.ts @@ -21,7 +21,7 @@ import { describe, it, expect } from "@jest/globals"; -import { NamedNode, Literal, BlankNode } from "rdf-js"; +import { NamedNode, Literal, BlankNode } from "@rdfjs/types"; import { DataFactory } from "n3"; import { IriString, Thing, UrlString } from "../interfaces"; import { diff --git a/src/thing/get.ts b/src/thing/get.ts index b65596af76..5490882c02 100644 --- a/src/thing/get.ts +++ b/src/thing/get.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Quad_Object, NamedNode, Literal } from "rdf-js"; +import { Quad_Object, NamedNode, Literal } from "@rdfjs/types"; import { Thing, Url, UrlString } from "../interfaces"; import { deserializeBoolean, diff --git a/src/thing/remove.ts b/src/thing/remove.ts index 74fb5453ea..13ee455df7 100644 --- a/src/thing/remove.ts +++ b/src/thing/remove.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Literal, NamedNode } from "rdf-js"; +import { Literal, NamedNode } from "@rdfjs/types"; import { Url, UrlString, Thing, ThingPersisted } from "../interfaces"; import { isNamedNode, diff --git a/src/thing/set.test.ts b/src/thing/set.test.ts index 59118f6430..b18ce37cb1 100644 --- a/src/thing/set.test.ts +++ b/src/thing/set.test.ts @@ -21,7 +21,7 @@ import { describe, it, expect } from "@jest/globals"; -import { Quad } from "rdf-js"; +import { Quad } from "@rdfjs/types"; import { dataset } from "@rdfjs/dataset"; import { DataFactory } from "n3"; import { IriString, Thing } from "../interfaces"; diff --git a/src/thing/set.ts b/src/thing/set.ts index 48ae2325a8..8fe08383b7 100644 --- a/src/thing/set.ts +++ b/src/thing/set.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Literal, NamedNode, Quad_Object } from "rdf-js"; +import { Literal, NamedNode, Quad_Object } from "@rdfjs/types"; import { Thing, Url, UrlString } from "../interfaces"; import { internal_isValidUrl } from "../datatypes"; import { internal_throwIfNotThing } from "./thing.internal"; diff --git a/src/thing/thing.internal.ts b/src/thing/thing.internal.ts index 89d23bc3aa..8bc09878bc 100644 --- a/src/thing/thing.internal.ts +++ b/src/thing/thing.internal.ts @@ -19,7 +19,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Quad, Quad_Object } from "rdf-js"; +import { Quad, Quad_Object } from "@rdfjs/types"; import { isNamedNode, isLiteral,