From 0c332239824823023f0d6ae3074db353a3c768a9 Mon Sep 17 00:00:00 2001 From: jaxoncreed Date: Sat, 2 Sep 2023 21:31:52 -0400 Subject: [PATCH] Reverted jsonld-dataset-proxy back to rdfjs/types --- packages/jsonld-dataset-proxy/package.json | 4 +++- .../src/JsonldDatasetProxyBuilder.ts | 10 +++------- packages/jsonld-dataset-proxy/src/ProxyContext.ts | 9 ++------- .../jsonld-dataset-proxy/src/arrayProxy/ArrayProxy.ts | 3 ++- .../src/arrayProxy/arrayMethods.ts | 3 +++ .../src/arrayProxy/createArrayHandler.ts | 10 +++------- .../src/arrayProxy/modifyArray.ts | 5 +++-- packages/jsonld-dataset-proxy/src/graphOf.ts | 2 +- .../jsonld-dataset-proxy/src/jsonldDatasetProxy.ts | 4 ++-- .../src/language/languageMapProxy.ts | 2 +- .../jsonld-dataset-proxy/src/language/languageSet.ts | 10 +++------- .../src/language/languageUtils.ts | 11 ++--------- .../jsonld-dataset-proxy/src/language/languagesOf.ts | 2 +- .../src/subjectProxy/SubjectProxy.ts | 3 ++- .../src/subjectProxy/createSubjectHandler.ts | 4 ++-- .../src/subjectProxy/deleteFromDataset.ts | 4 ++-- .../src/subjectProxy/getValueForKey.ts | 2 +- packages/jsonld-dataset-proxy/src/util/NodeSet.ts | 9 ++------- packages/jsonld-dataset-proxy/src/util/RawObject.ts | 2 +- .../src/util/addObjectToDataset.ts | 4 ++-- .../jsonld-dataset-proxy/src/util/getNodeFromRaw.ts | 4 ++-- .../src/util/nodeToJsonldRepresentation.ts | 2 +- packages/jsonld-dataset-proxy/src/write.ts | 4 ++-- .../test/jsonldDatasetProxy.test.ts | 4 ++-- .../test/nodeToJsonRepresentation.test.ts | 2 +- .../jsonld-dataset-proxy/test/nodeToString.test.ts | 2 +- 26 files changed, 50 insertions(+), 71 deletions(-) diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index 0246444..fdbd59b 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/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" } } diff --git a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts index f8fe8c9..0bd5e5a 100644 --- a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts +++ b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts @@ -1,10 +1,6 @@ -import { blankNode, namedNode } from "@ldo/rdf-utils"; -import type { - BlankNode, - NamedNode, - GraphNode, - QuadMatch, -} from "@ldo/rdf-utils"; +import { blankNode, namedNode } from "@rdfjs/data-model"; +import type { BlankNode, NamedNode } from "@rdfjs/types"; +import type { GraphNode, QuadMatch } from "@ldo/rdf-utils"; import type { LanguageOrdering } from "./language/languageTypes"; import type { ProxyContext } from "./ProxyContext"; import type { ObjectLike } from "./types"; diff --git a/packages/jsonld-dataset-proxy/src/ProxyContext.ts b/packages/jsonld-dataset-proxy/src/ProxyContext.ts index 39ee048..ab89bcb 100644 --- a/packages/jsonld-dataset-proxy/src/ProxyContext.ts +++ b/packages/jsonld-dataset-proxy/src/ProxyContext.ts @@ -1,10 +1,5 @@ -import type { - BlankNode, - Dataset, - NamedNode, - GraphNode, - QuadMatch, -} from "@ldo/rdf-utils"; +import type { GraphNode, QuadMatch } from "@ldo/rdf-utils"; +import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types"; import type { ArrayProxyTarget } from "./arrayProxy/createArrayHandler"; import { createArrayHandler } from "./arrayProxy/createArrayHandler"; import { createSubjectHandler } from "./subjectProxy/createSubjectHandler"; diff --git a/packages/jsonld-dataset-proxy/src/arrayProxy/ArrayProxy.ts b/packages/jsonld-dataset-proxy/src/arrayProxy/ArrayProxy.ts index a4bd96d..789d7df 100644 --- a/packages/jsonld-dataset-proxy/src/arrayProxy/ArrayProxy.ts +++ b/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, diff --git a/packages/jsonld-dataset-proxy/src/arrayProxy/arrayMethods.ts b/packages/jsonld-dataset-proxy/src/arrayProxy/arrayMethods.ts index c474e15..677d1a5 100644 --- a/packages/jsonld-dataset-proxy/src/arrayProxy/arrayMethods.ts +++ b/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)); }, diff --git a/packages/jsonld-dataset-proxy/src/arrayProxy/createArrayHandler.ts b/packages/jsonld-dataset-proxy/src/arrayProxy/createArrayHandler.ts index 5b307b7..07e3afc 100644 --- a/packages/jsonld-dataset-proxy/src/arrayProxy/createArrayHandler.ts +++ b/packages/jsonld-dataset-proxy/src/arrayProxy/createArrayHandler.ts @@ -1,10 +1,6 @@ -import { quad } from "@ldo/rdf-utils"; -import type { - NamedNode, - ObjectNode, - QuadMatch, - SubjectNode, -} from "@ldo/rdf-utils"; +import { quad } from "@rdfjs/data-model"; +import type { NamedNode } from "@rdfjs/types"; +import type { ObjectNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils"; import type { ObjectJsonRepresentation } from "../util/nodeToJsonldRepresentation"; import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation"; import type { ArrayMethodBuildersType } from "./arrayMethods"; diff --git a/packages/jsonld-dataset-proxy/src/arrayProxy/modifyArray.ts b/packages/jsonld-dataset-proxy/src/arrayProxy/modifyArray.ts index 00e3126..54cd5df 100644 --- a/packages/jsonld-dataset-proxy/src/arrayProxy/modifyArray.ts +++ b/packages/jsonld-dataset-proxy/src/arrayProxy/modifyArray.ts @@ -1,5 +1,6 @@ -import { defaultGraph } from "@ldo/rdf-utils"; -import type { Quad, ObjectNode } from "@ldo/rdf-utils"; +import { defaultGraph } from "@rdfjs/data-model"; +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"; diff --git a/packages/jsonld-dataset-proxy/src/graphOf.ts b/packages/jsonld-dataset-proxy/src/graphOf.ts index 33e15db..982c09f 100644 --- a/packages/jsonld-dataset-proxy/src/graphOf.ts +++ b/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, diff --git a/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts b/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts index e4eb108..9c49be3 100644 --- a/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts +++ b/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts @@ -1,5 +1,5 @@ -import { defaultGraph } from "@ldo/rdf-utils"; -import type { Dataset } from "@ldo/rdf-utils"; +import { defaultGraph } from "@rdfjs/data-model"; +import type { Dataset } from "@rdfjs/types"; import type { ContextDefinition } from "jsonld"; import { ContextUtil } from "./ContextUtil"; import { JsonldDatasetProxyBuilder } from "./JsonldDatasetProxyBuilder"; diff --git a/packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts b/packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts index dc40f32..1f53f08 100644 --- a/packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts +++ b/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, diff --git a/packages/jsonld-dataset-proxy/src/language/languageSet.ts b/packages/jsonld-dataset-proxy/src/language/languageSet.ts index 9795db3..80ec478 100644 --- a/packages/jsonld-dataset-proxy/src/language/languageSet.ts +++ b/packages/jsonld-dataset-proxy/src/language/languageSet.ts @@ -1,10 +1,6 @@ -import { literal, quad } from "@ldo/rdf-utils"; -import type { - Dataset, - Literal, - PredicateNode, - SubjectNode, -} from "@ldo/rdf-utils"; +import { literal, quad } from "@rdfjs/data-model"; +import type { PredicateNode, SubjectNode } from "@ldo/rdf-utils"; +import type { Dataset, Literal } from "@rdfjs/types"; import type { LanguageKey } from "./languageTypes"; import type { LiteralObjectQuad } from "./languageUtils"; import { languageDeleteMatch, languageMatch } from "./languageUtils"; diff --git a/packages/jsonld-dataset-proxy/src/language/languageUtils.ts b/packages/jsonld-dataset-proxy/src/language/languageUtils.ts index fa2cb80..3c6c093 100644 --- a/packages/jsonld-dataset-proxy/src/language/languageUtils.ts +++ b/packages/jsonld-dataset-proxy/src/language/languageUtils.ts @@ -1,12 +1,5 @@ -import type { - Dataset, - Literal, - Quad, - ObjectNode, - PredicateNode, - SubjectNode, - Quad_Object, -} from "@ldo/rdf-utils"; +import type { Dataset, Literal, Quad, Quad_Object } from "@rdfjs/types"; +import type { ObjectNode, PredicateNode, SubjectNode } from "@ldo/rdf-utils"; import { createDataset } from "@ldo/dataset"; import type { LanguageKey, LanguageOrdering } from "./languageTypes"; diff --git a/packages/jsonld-dataset-proxy/src/language/languagesOf.ts b/packages/jsonld-dataset-proxy/src/language/languagesOf.ts index efba8d0..0a111b2 100644 --- a/packages/jsonld-dataset-proxy/src/language/languagesOf.ts +++ b/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"; diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/SubjectProxy.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/SubjectProxy.ts index be3f6d5..6f44e4c 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/SubjectProxy.ts +++ b/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 { diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts index 0547b46..02b2cb4 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts @@ -1,5 +1,5 @@ -import { namedNode, quad } from "@ldo/rdf-utils"; -import type { BlankNode, NamedNode } from "@ldo/rdf-utils"; +import { namedNode, quad } from "@rdfjs/data-model"; +import type { BlankNode, NamedNode } from "@rdfjs/types"; import { addObjectToDataset } from "../util/addObjectToDataset"; import { deleteValueFromDataset } from "./deleteFromDataset"; import { diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/deleteFromDataset.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/deleteFromDataset.ts index 098a459..604b29e 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/deleteFromDataset.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/deleteFromDataset.ts @@ -1,5 +1,5 @@ -import { namedNode, quad } from "@ldo/rdf-utils"; -import type { Term } from "@ldo/rdf-utils"; +import { namedNode, quad } from "@rdfjs/data-model"; +import type { Term } from "@rdfjs/types"; import type { SubjectProxyTarget } from "./createSubjectHandler"; import type { ProxyContext } from "../ProxyContext"; diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts index 6113188..37f5141 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts +++ b/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"; diff --git a/packages/jsonld-dataset-proxy/src/util/NodeSet.ts b/packages/jsonld-dataset-proxy/src/util/NodeSet.ts index 4d99ae4..fd00f0a 100644 --- a/packages/jsonld-dataset-proxy/src/util/NodeSet.ts +++ b/packages/jsonld-dataset-proxy/src/util/NodeSet.ts @@ -1,10 +1,5 @@ -import type { - BlankNode, - DefaultGraph, - Literal, - NamedNode, - ObjectNode, -} from "@ldo/rdf-utils"; +import type { BlankNode, DefaultGraph, Literal, NamedNode } from "@rdfjs/types"; +import type { ObjectNode } from "@ldo/rdf-utils"; export function nodeToString( node: NamedNode | BlankNode | DefaultGraph | Literal | null | undefined, diff --git a/packages/jsonld-dataset-proxy/src/util/RawObject.ts b/packages/jsonld-dataset-proxy/src/util/RawObject.ts index 2097e5d..2d710b4 100644 --- a/packages/jsonld-dataset-proxy/src/util/RawObject.ts +++ b/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"; diff --git a/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts b/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts index 13793b7..7252503 100644 --- a/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts +++ b/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts @@ -1,5 +1,5 @@ -import type { BlankNode, NamedNode } from "@ldo/rdf-utils"; -import { literal, namedNode, quad } from "@ldo/rdf-utils"; +import type { BlankNode, NamedNode } from "@rdfjs/types"; +import { literal, namedNode, quad } from "@rdfjs/data-model"; import { _getUnderlyingNode } from "../types"; import type { SubjectProxy } from "../subjectProxy/SubjectProxy"; import { getNodeFromRawObject, getNodeFromRawValue } from "./getNodeFromRaw"; diff --git a/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts b/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts index f9b285b..4ea9a73 100644 --- a/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts +++ b/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts @@ -1,5 +1,5 @@ -import type { BlankNode, Literal, NamedNode } from "@ldo/rdf-utils"; -import { namedNode, literal, blankNode } from "@ldo/rdf-utils"; +import type { BlankNode, Literal, NamedNode } from "@rdfjs/types"; +import { namedNode, literal, blankNode } from "@rdfjs/data-model"; import type { ContextUtil } from "../ContextUtil"; import { _getUnderlyingNode } from "../types"; import type { RawObject, RawValue } from "./RawObject"; diff --git a/packages/jsonld-dataset-proxy/src/util/nodeToJsonldRepresentation.ts b/packages/jsonld-dataset-proxy/src/util/nodeToJsonldRepresentation.ts index 00f38b5..d1dcd08 100644 --- a/packages/jsonld-dataset-proxy/src/util/nodeToJsonldRepresentation.ts +++ b/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"; diff --git a/packages/jsonld-dataset-proxy/src/write.ts b/packages/jsonld-dataset-proxy/src/write.ts index b0d90d4..59209de 100644 --- a/packages/jsonld-dataset-proxy/src/write.ts +++ b/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); } diff --git a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts b/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts index a45c98c..3698f77 100644 --- a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts +++ b/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 type { Dataset, NamedNode } from "@ldo/rdf-utils"; +import { namedNode, quad, literal, defaultGraph } from "@rdfjs/data-model"; +import type { Dataset, NamedNode } from "@rdfjs/types"; import type { ContextDefinition } from "jsonld"; describe("jsonldDatasetProxy", () => { diff --git a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts index 942f0b9..3ab4cc2 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts +++ b/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", () => { diff --git a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts index cb1afcf..1d05021 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts +++ b/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", () => {