Reverted jsonld-dataset-proxy back to rdfjs/types

packages/jsonld-dataset-proxy/package.json

@@ -23,6 +23,7 @@
   },
   "homepage": "https://github.com/o-development/jsonld-dataset-proxy#readme",
   "devDependencies": {
+    "@rdfjs/types": "^1.1.0",
     "@types/jest": "^27.0.3",
     "@types/jsonld": "^1.5.6",
     "@types/n3": "^1.10.4",
@@ -38,9 +39,10 @@
     "dist"
   ],
   "dependencies": {
-    "@ldo/dataset": "^0.0.0",
+    "@rdfjs/data-model": "^2.0.1",
     "@ldo/rdf-utils": "^0.0.0",
     "@ldo/subscribable-dataset": "^0.0.0",
+    "@rdfjs/dataset": "^1.1.0",
     "jsonld2graphobject": "^0.0.4"
   }
 }

packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts

@@ -1,10 +1,6 @@
-import { blankNode, namedNode } from "@ldo/rdf-utils";
+import { blankNode, namedNode } from "@rdfjs/data-model";
-import type {
+import type { BlankNode, NamedNode } from "@rdfjs/types";
-  BlankNode,
+import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
-  NamedNode,
-  GraphNode,
-  QuadMatch,
-} from "@ldo/rdf-utils";
 import type { LanguageOrdering } from "./language/languageTypes";
 import type { ProxyContext } from "./ProxyContext";
 import type { ObjectLike } from "./types";

packages/jsonld-dataset-proxy/src/ProxyContext.ts

@@ -1,10 +1,5 @@
-import type {
+import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
-  BlankNode,
+import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
-  Dataset,
-  NamedNode,
-  GraphNode,
-  QuadMatch,
-} from "@ldo/rdf-utils";
 import type { ArrayProxyTarget } from "./arrayProxy/createArrayHandler";
 import { createArrayHandler } from "./arrayProxy/createArrayHandler";
 import { createSubjectHandler } from "./subjectProxy/createSubjectHandler";

packages/jsonld-dataset-proxy/src/arrayProxy/ArrayProxy.ts

@@ -1,4 +1,5 @@
-import type { Dataset, ObjectNode } from "@ldo/rdf-utils";
+import type { Dataset } from "@rdfjs/types";
+import type { ObjectNode } from "@ldo/rdf-utils";
 import type { ArrayProxyTarget } from "./createArrayHandler";
 import type {
   _getNodeAtIndex,

packages/jsonld-dataset-proxy/src/arrayProxy/arrayMethods.ts

@@ -42,6 +42,9 @@ export const arrayMethodsBuilders: ArrayMethodBuildersType = {
           target,
           key,
           quadsToDelete: (quads) => {
+            if (!start) {
+              return [];
+            }
             const realEnd = end || quads.length;
             return quads.slice(targetIndex, targetIndex + (realEnd - start));
           },

packages/jsonld-dataset-proxy/src/arrayProxy/createArrayHandler.ts

@@ -1,10 +1,6 @@
-import { quad } from "@ldo/rdf-utils";
+import { quad } from "@rdfjs/data-model";
-import type {
+import type { NamedNode } from "@rdfjs/types";
-  NamedNode,
+import type { ObjectNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils";
-  ObjectNode,
-  QuadMatch,
-  SubjectNode,
-} from "@ldo/rdf-utils";
 import type { ObjectJsonRepresentation } from "../util/nodeToJsonldRepresentation";
 import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation";
 import type { ArrayMethodBuildersType } from "./arrayMethods";

packages/jsonld-dataset-proxy/src/arrayProxy/modifyArray.ts

@@ -1,5 +1,6 @@
-import { defaultGraph } from "@ldo/rdf-utils";
+import { defaultGraph } from "@rdfjs/data-model";
-import type { Quad, ObjectNode } from "@ldo/rdf-utils";
+import type { Quad } from "@rdfjs/types";
+import type { ObjectNode } from "@ldo/rdf-utils";
 import { ProxyTransactionalDataset } from "@ldo/subscribable-dataset";
 import { createDatasetFactory } from "@ldo/dataset";
 import type { ProxyContext } from "../ProxyContext";

packages/jsonld-dataset-proxy/src/graphOf.ts

@@ -1,5 +1,5 @@
 import type { ObjectNode, GraphNode } from "@ldo/rdf-utils";
-import { namedNode } from "@ldo/rdf-utils";
+import { namedNode } from "@rdfjs/data-model";
 import {
   getSubjectProxyFromObject,
   isSubjectProxy,

packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts

@@ -1,5 +1,5 @@
-import { defaultGraph } from "@ldo/rdf-utils";
+import { defaultGraph } from "@rdfjs/data-model";
-import type { Dataset } from "@ldo/rdf-utils";
+import type { Dataset } from "@rdfjs/types";
 import type { ContextDefinition } from "jsonld";
 import { ContextUtil } from "./ContextUtil";
 import { JsonldDatasetProxyBuilder } from "./JsonldDatasetProxyBuilder";

packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts

@@ -1,5 +1,5 @@
 import type { PredicateNode, SubjectNode } from "@ldo/rdf-utils";
-import { literal, quad } from "@ldo/rdf-utils";
+import { literal, quad } from "@rdfjs/data-model";
 import type { ProxyContext } from "../ProxyContext";
 import {
   languageKeyToLiteralLanguage,

packages/jsonld-dataset-proxy/src/language/languageSet.ts

@@ -1,10 +1,6 @@
-import { literal, quad } from "@ldo/rdf-utils";
+import { literal, quad } from "@rdfjs/data-model";
-import type {
+import type { PredicateNode, SubjectNode } from "@ldo/rdf-utils";
-  Dataset,
+import type { Dataset, Literal } from "@rdfjs/types";
-  Literal,
-  PredicateNode,
-  SubjectNode,
-} from "@ldo/rdf-utils";
 import type { LanguageKey } from "./languageTypes";
 import type { LiteralObjectQuad } from "./languageUtils";
 import { languageDeleteMatch, languageMatch } from "./languageUtils";

packages/jsonld-dataset-proxy/src/language/languageUtils.ts

@@ -1,12 +1,5 @@
-import type {
+import type { Dataset, Literal, Quad, Quad_Object } from "@rdfjs/types";
-  Dataset,
+import type { ObjectNode, PredicateNode, SubjectNode } from "@ldo/rdf-utils";
-  Literal,
-  Quad,
-  ObjectNode,
-  PredicateNode,
-  SubjectNode,
-  Quad_Object,
-} from "@ldo/rdf-utils";
 import { createDataset } from "@ldo/dataset";
 import type { LanguageKey, LanguageOrdering } from "./languageTypes";
 

packages/jsonld-dataset-proxy/src/language/languagesOf.ts

@@ -1,4 +1,4 @@
-import { namedNode } from "@ldo/rdf-utils";
+import { namedNode } from "@rdfjs/data-model";
 import { getSubjectProxyFromObject } from "../subjectProxy/isSubjectProxy";
 import type { ObjectLike } from "../types";
 import { _getUnderlyingNode, _proxyContext } from "../types";

packages/jsonld-dataset-proxy/src/subjectProxy/SubjectProxy.ts

@@ -1,4 +1,5 @@
-import type { BlankNode, Dataset, NamedNode, GraphNode } from "@ldo/rdf-utils";
+import type { GraphNode } from "@ldo/rdf-utils";
+import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
 import type { ContextDefinition } from "jsonld";
 import type { ProxyContext } from "../ProxyContext";
 import type {

packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts

@@ -1,5 +1,5 @@
-import { namedNode, quad } from "@ldo/rdf-utils";
+import { namedNode, quad } from "@rdfjs/data-model";
-import type { BlankNode, NamedNode } from "@ldo/rdf-utils";
+import type { BlankNode, NamedNode } from "@rdfjs/types";
 import { addObjectToDataset } from "../util/addObjectToDataset";
 import { deleteValueFromDataset } from "./deleteFromDataset";
 import {

packages/jsonld-dataset-proxy/src/subjectProxy/deleteFromDataset.ts

@@ -1,5 +1,5 @@
-import { namedNode, quad } from "@ldo/rdf-utils";
+import { namedNode, quad } from "@rdfjs/data-model";
-import type { Term } from "@ldo/rdf-utils";
+import type { Term } from "@rdfjs/types";
 import type { SubjectProxyTarget } from "./createSubjectHandler";
 import type { ProxyContext } from "../ProxyContext";
 

packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts

@@ -1,5 +1,5 @@
 import type { SubjectProxyTarget } from "./createSubjectHandler";
-import { namedNode } from "@ldo/rdf-utils";
+import { namedNode } from "@rdfjs/data-model";
 import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation";
 import type { SubjectProxy } from "./SubjectProxy";
 import type { ArrayProxy } from "../arrayProxy/ArrayProxy";

packages/jsonld-dataset-proxy/src/util/NodeSet.ts

@@ -1,10 +1,5 @@
-import type {
+import type { BlankNode, DefaultGraph, Literal, NamedNode } from "@rdfjs/types";
-  BlankNode,
+import type { ObjectNode } from "@ldo/rdf-utils";
-  DefaultGraph,
-  Literal,
-  NamedNode,
-  ObjectNode,
-} from "@ldo/rdf-utils";
 
 export function nodeToString(
   node: NamedNode | BlankNode | DefaultGraph | Literal | null | undefined,

packages/jsonld-dataset-proxy/src/util/RawObject.ts

@@ -1,4 +1,4 @@
-import type { BlankNode, NamedNode } from "@ldo/rdf-utils";
+import type { BlankNode, NamedNode } from "@rdfjs/types";
 import { _getUnderlyingNode } from "../types";
 import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
 

packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts

@@ -1,5 +1,5 @@
-import type { BlankNode, NamedNode } from "@ldo/rdf-utils";
+import type { BlankNode, NamedNode } from "@rdfjs/types";
-import { literal, namedNode, quad } from "@ldo/rdf-utils";
+import { literal, namedNode, quad } from "@rdfjs/data-model";
 import { _getUnderlyingNode } from "../types";
 import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
 import { getNodeFromRawObject, getNodeFromRawValue } from "./getNodeFromRaw";

packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts

@@ -1,5 +1,5 @@
-import type { BlankNode, Literal, NamedNode } from "@ldo/rdf-utils";
+import type { BlankNode, Literal, NamedNode } from "@rdfjs/types";
-import { namedNode, literal, blankNode } from "@ldo/rdf-utils";
+import { namedNode, literal, blankNode } from "@rdfjs/data-model";
 import type { ContextUtil } from "../ContextUtil";
 import { _getUnderlyingNode } from "../types";
 import type { RawObject, RawValue } from "./RawObject";

packages/jsonld-dataset-proxy/src/util/nodeToJsonldRepresentation.ts

@@ -1,4 +1,4 @@
-import type { Literal, Quad_Object } from "@ldo/rdf-utils";
+import type { Literal, Quad_Object } from "@rdfjs/types";
 import type { ProxyContext } from "../ProxyContext";
 import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
 

packages/jsonld-dataset-proxy/src/write.ts

@@ -1,4 +1,4 @@
-import type { GraphType } from "./types";
+import type { GraphNode } from "@ldo/rdf-utils";
 import type { InteractOptions } from "./util/createInteractOptions";
 import { createInteractOptions } from "./util/createInteractOptions";
 
@@ -7,6 +7,6 @@ import { createInteractOptions } from "./util/createInteractOptions";
  * @param graphs The graphs that should be written to
  * @returns a write builder
  */
-export function write(...graphs: GraphType[]): InteractOptions {
+export function write(...graphs: GraphNode[]): InteractOptions {
   return createInteractOptions("writeGraphs", graphs);
 }

packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts

@@ -25,8 +25,8 @@ import {
   tinyPatientDataWithBlankNodes,
   tinyPatientDataWithLanguageTags,
 } from "./patientExampleData";
-import { namedNode, quad, literal, defaultGraph } from "@ldo/rdf-utils";
+import { namedNode, quad, literal, defaultGraph } from "@rdfjs/data-model";
-import type { Dataset, NamedNode } from "@ldo/rdf-utils";
+import type { Dataset, NamedNode } from "@rdfjs/types";
 import type { ContextDefinition } from "jsonld";
 
 describe("jsonldDatasetProxy", () => {

packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts

@@ -1,7 +1,7 @@
 import { createDataset } from "@ldo/dataset";
 import { ContextUtil } from "../src/ContextUtil";
 import { nodeToJsonldRepresentation } from "../src/util/nodeToJsonldRepresentation";
-import { literal, defaultGraph } from "@ldo/rdf-utils";
+import { literal, defaultGraph } from "@rdfjs/data-model";
 import { ProxyContext } from "../src";
 
 describe("objectToJsonRepresentation", () => {

packages/jsonld-dataset-proxy/test/nodeToString.test.ts

@@ -1,4 +1,4 @@
-import { blankNode, defaultGraph, literal, namedNode } from "@ldo/rdf-utils";
+import { blankNode, defaultGraph, literal, namedNode } from "@rdfjs/data-model";
 import { nodeToString } from "../src";
 
 describe("nodeToString", () => {