dataset tests work now

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

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",

packages/dataset/src/ExtendedDataset.ts

@@ -6,8 +6,8 @@ import {
   type Term,
   type DatasetCoreFactory,
   type Quad,
-  datasetToString,
+} from "@rdfjs/types";
-} from "@ldo/rdf-utils";
+import { datasetToString } from "@ldo/rdf-utils";
 import { Readable } from "readable-stream";
 
 /**

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";
 
 /**

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";
 

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";

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";

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", () => {

packages/dataset/test/dataset.testHelper.ts

@@ -1,13 +1,6 @@
-import { namedNode, literal, quad } from "@ldo/rdf-utils";
+import { namedNode, literal, quad } from "@rdfjs/data-model";
-import type {
+import type { BaseQuad, Dataset, DatasetFactory, Quad } from "@rdfjs/types";
-  SubjectNode,
+import type { SubjectNode, ObjectNode, PredicateNode } from "@ldo/rdf-utils";
-  ObjectNode,
-  PredicateNode,
-  BaseQuad,
-  Dataset,
-  DatasetFactory,
-  Quad,
-} from "@ldo/rdf-utils";
 import { Readable } from "stream";
 
 export default function testDataset(

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"
   }

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";