diff --git a/packages/dataset/example/extendedDatasetExample.ts b/packages/dataset/example/extendedDatasetExample.ts index cd28a9d..35c2244 100644 --- a/packages/dataset/example/extendedDatasetExample.ts +++ b/packages/dataset/example/extendedDatasetExample.ts @@ -2,13 +2,13 @@ import { createDataset } from "../src"; // Required for advanced features: import { dataset as initializeDatasetCore } from "@rdfjs/dataset"; import { ExtendedDatasetFactory } from "../src"; -import { quad, namedNode, literal } from "@ldo/rdf-utils"; +import { quad, namedNode, literal } from "@rdfjs/data-model"; import type { Dataset, Quad, DatasetCoreFactory, DatasetCore, -} from "@ldo/rdf-utils"; +} from "@rdfjs/types"; /** * Create a dataset with default settings diff --git a/packages/dataset/package.json b/packages/dataset/package.json index 1062276..b9ec5bb 100644 --- a/packages/dataset/package.json +++ b/packages/dataset/package.json @@ -23,6 +23,8 @@ }, "homepage": "https://github.com/o-development/o-dataset-pack#readme", "devDependencies": { + "@rdfjs/data-model": "^1.2.0", + "@rdfjs/types": "^1.0.1", "@types/jest": "^27.0.3", "@types/jsonld": "^1.5.6", "@types/rdfjs__dataset": "^1.0.4", diff --git a/packages/dataset/src/ExtendedDataset.ts b/packages/dataset/src/ExtendedDataset.ts index b0b413b..46156a2 100644 --- a/packages/dataset/src/ExtendedDataset.ts +++ b/packages/dataset/src/ExtendedDataset.ts @@ -6,8 +6,8 @@ import { type Term, type DatasetCoreFactory, type Quad, - datasetToString, -} from "@ldo/rdf-utils"; +} from "@rdfjs/types"; +import { datasetToString } from "@ldo/rdf-utils"; import { Readable } from "readable-stream"; /** diff --git a/packages/dataset/src/ExtendedDatasetFactory.ts b/packages/dataset/src/ExtendedDatasetFactory.ts index e7c8526..7b0bd66 100644 --- a/packages/dataset/src/ExtendedDatasetFactory.ts +++ b/packages/dataset/src/ExtendedDatasetFactory.ts @@ -3,7 +3,7 @@ import type { BaseQuad, Dataset, DatasetCoreFactory, -} from "@ldo/rdf-utils"; +} from "@rdfjs/types"; import ExtendedDataset from "./ExtendedDataset"; /** diff --git a/packages/dataset/src/createDatasetFromSerializedInput.ts b/packages/dataset/src/createDatasetFromSerializedInput.ts index dc547c1..29c6ad6 100644 --- a/packages/dataset/src/createDatasetFromSerializedInput.ts +++ b/packages/dataset/src/createDatasetFromSerializedInput.ts @@ -1,4 +1,4 @@ -import type { Dataset, DatasetFactory, Quad } from "@ldo/rdf-utils"; +import type { Dataset, DatasetFactory, Quad } from "@rdfjs/types"; import type { ParserOptions } from "@ldo/rdf-utils"; import { serializedToQuads } from "@ldo/rdf-utils"; diff --git a/packages/dataset/src/createExtendedDataset.ts b/packages/dataset/src/createExtendedDataset.ts index 636a459..e8686fe 100644 --- a/packages/dataset/src/createExtendedDataset.ts +++ b/packages/dataset/src/createExtendedDataset.ts @@ -3,7 +3,7 @@ import type { DatasetCoreFactory, DatasetCore, Quad, -} from "@ldo/rdf-utils"; +} from "@rdfjs/types"; import ExtendedDatasetFactory from "./ExtendedDatasetFactory"; import { dataset as initializeDatasetCore } from "@rdfjs/dataset"; import type ExtendedDataset from "./ExtendedDataset"; diff --git a/packages/dataset/src/createExtendedDatasetFromSerializedInput.ts b/packages/dataset/src/createExtendedDatasetFromSerializedInput.ts index 212b877..f58c0e1 100644 --- a/packages/dataset/src/createExtendedDatasetFromSerializedInput.ts +++ b/packages/dataset/src/createExtendedDatasetFromSerializedInput.ts @@ -1,4 +1,5 @@ -import type { ParserOptions, Quad } from "@ldo/rdf-utils"; +import type { Quad } from "@rdfjs/types"; +import type { ParserOptions } from "@ldo/rdf-utils"; import createDatasetFromSerializedInput from "./createDatasetFromSerializedInput"; import { createExtendedDatasetFactory } from "./createExtendedDataset"; import type ExtendedDataset from "./ExtendedDataset"; diff --git a/packages/dataset/test/createExtendedDataset.test.ts b/packages/dataset/test/createExtendedDataset.test.ts index a3db8bc..63994dd 100644 --- a/packages/dataset/test/createExtendedDataset.test.ts +++ b/packages/dataset/test/createExtendedDataset.test.ts @@ -1,5 +1,5 @@ import { createDataset } from "../src"; -import { quad, namedNode } from "@ldo/rdf-utils"; +import { quad, namedNode } from "@rdfjs/data-model"; describe("createExtendedDataset", () => { it("creates a dataset when give another datset", () => { diff --git a/packages/dataset/test/dataset.testHelper.ts b/packages/dataset/test/dataset.testHelper.ts index 957340d..a6f2323 100644 --- a/packages/dataset/test/dataset.testHelper.ts +++ b/packages/dataset/test/dataset.testHelper.ts @@ -1,13 +1,6 @@ -import { namedNode, literal, quad } from "@ldo/rdf-utils"; -import type { - SubjectNode, - ObjectNode, - PredicateNode, - BaseQuad, - Dataset, - DatasetFactory, - Quad, -} from "@ldo/rdf-utils"; +import { namedNode, literal, quad } from "@rdfjs/data-model"; +import type { BaseQuad, Dataset, DatasetFactory, Quad } from "@rdfjs/types"; +import type { SubjectNode, ObjectNode, PredicateNode } from "@ldo/rdf-utils"; import { Readable } from "stream"; export default function testDataset( diff --git a/packages/rdf-utils/package.json b/packages/rdf-utils/package.json index d481504..bca551c 100644 --- a/packages/rdf-utils/package.json +++ b/packages/rdf-utils/package.json @@ -22,11 +22,11 @@ }, "homepage": "https://github.com/o-development/devtool-boilerplate#readme", "devDependencies": { + "@rdfjs/types": "^1.0.1", "@types/jsonld": "^1.5.9" }, "dependencies": { "@rdfjs/data-model": "^1.2.0", - "@rdfjs/types": "^1.0.1", "n3": "^1.17.1", "rdf-string": "^1.6.3" } diff --git a/packages/rdf-utils/src/index.ts b/packages/rdf-utils/src/index.ts index f990b7c..b6b8411 100644 --- a/packages/rdf-utils/src/index.ts +++ b/packages/rdf-utils/src/index.ts @@ -1,6 +1,4 @@ export * from "./nodeSerialization"; -export * from "@rdfjs/types"; -export * from "@rdfjs/data-model"; export * from "./datasetChanges"; export * from "./datasetConverters"; export * from "./serializedToQuads";